[med-svn] [fis-gtm] 01/03: Imported Upstream version 6.3-002

Amul Shah tuskentower-guest at moszumanska.debian.org
Mon Sep 11 09:58:32 UTC 2017


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

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

commit 78093e70f0989c79b2046c6db1f0636f33c98863
Author: Amul Shah <amul.shah at fisglobal.com>
Date:   Fri Aug 25 11:04:13 2017 -0400

    Imported Upstream version 6.3-002
---
 CMakeLists.txt                                   |   17 +-
 README                                           |   14 +-
 sr_i386/GTMDefinedTypesInitDebug.m               | 7717 +++++++++++----------
 sr_i386/GTMDefinedTypesInitRelease.m             | 7717 +++++++++++----------
 sr_i386/merrors_ansi.h                           |   23 +-
 sr_i386/merrors_ctl.c                            |   70 +-
 sr_i386/ttt.c                                    |   20 +-
 sr_linux/release_name.h                          |   14 +-
 sr_port/aio_shim.h                               |   10 +-
 sr_port/alloc_reg.c                              |    5 +-
 sr_port/anticipatory_freeze.h                    |    2 +-
 sr_port/bool_expr.c                              |   96 +-
 sr_port/bx_boollit.c                             |  226 +-
 sr_port/bx_boolop.c                              |   32 +-
 sr_port/bx_relop.c                               |   15 +-
 sr_port/bx_tail.c                                |  164 +-
 sr_port/cdb_sc_table.h                           |    4 +-
 sr_port/ceprep_file.c                            |    6 +-
 sr_port/cmd.c                                    |    2 +-
 sr_port/coerce.c                                 |   14 +-
 sr_port/comp_init.c                              |    2 +-
 sr_port/compiler.h                               |   75 +-
 sr_port/cre_jnl_file.c                           |   92 +-
 sr_port/cre_jnl_file_intrpt_rename.c             |   39 +-
 sr_port/desired_db_format_set.c                  |    4 +-
 sr_port/dpgbldir.c                               |   11 +-
 sr_port/dse_dmp_fhead.c                          |   20 +-
 sr_port/emit_code.c                              |   16 +-
 sr_port/eval_expr.c                              |    4 +-
 sr_port/ex_tail.c                                |  141 +-
 sr_port/expr.c                                   |    7 +-
 sr_port/f_select.c                               |   74 +-
 sr_port/gbldefs.c                                |    5 +-
 sr_port/gde.m                                    |   11 +-
 sr_port/gdeexit.m                                |    7 +-
 sr_port/gdeinit.m                                |    2 +-
 sr_i386/GDEINITSZ.m => sr_port/gdeinitsz.m       |   12 +-
 sr_port/gdsbml.h                                 |   13 +-
 sr_port/gdsbt.h                                  |   12 +-
 sr_port/gdscc.h                                  |   14 +-
 sr_port/gdsfhead.h                               |  181 +-
 sr_port/getjobname.c                             |   35 +-
 sr_port/gtm_env_init.c                           |   52 +-
 sr_port/gtm_env_xlate_init.c                     |   44 +-
 sr_port/gtm_libaio.h                             |   20 +-
 sr_port/gtm_threadgbl_defs.h                     |   16 +-
 sr_port/gtm_threadgbl_deftypes.c                 |    3 +-
 sr_port/gtm_threadgbl_init.c                     |   38 +-
 sr_port/gv_rundown.c                             |    2 +-
 sr_port/gv_select.c                              |    6 +-
 sr_port/gvcst_bmp_mark_free.c                    |    7 +-
 sr_port/gvcst_init.c                             |  119 +-
 sr_port/gvcst_kill.c                             |    3 -
 sr_port/gvcst_reservedDB_funcs.c                 |   48 +-
 sr_port/gvcst_root_search.c                      |    8 +-
 sr_port/gvcst_tp_init.c                          |    6 +-
 sr_port/gvn.c                                    |    2 +-
 sr_port/indirection.c                            |    2 +-
 sr_port/init_secshr_addrs.c                      |   99 -
 sr_port/init_secshr_addrs.h                      |   51 -
 sr_port/ins_errtriple.c                          |   16 +-
 sr_port/io.h                                     |   68 +-
 sr_port/io_dev_dispatch.h                        |   33 +-
 sr_port/io_init.c                                |   11 +-
 sr_port/iosocket_bind.c                          |   18 +-
 sr_port/iosocket_connect.c                       |  150 +-
 sr_port/iosocket_iocontrol.c                     |   84 +-
 sr_port/iosocket_poolinit.c                      |   15 +-
 sr_port/iosocket_rdone.c                         |   13 +-
 sr_port/iosocket_read.c                          |    7 +-
 sr_port/iosocket_readfl.c                        |  104 +-
 sr_port/iosocket_wait.c                          |   47 +-
 sr_port/jnl.h                                    |  574 +-
 sr_port/jnl2ext.c                                |   18 +-
 sr_port/jnl_file_close.c                         |   48 +-
 sr_port/jnl_file_lost.c                          |    2 +-
 sr_port/jnl_file_open_common.c                   |   31 +-
 sr_port/jnl_flush.c                              |   22 +-
 sr_port/jnl_format.c                             |   15 +-
 sr_port/jnl_get_checksum.h                       |   30 +-
 sr_port/jnl_phase2_cleanup.c                     |  163 +
 sr_port/jnl_phase2_salvage.c                     |  182 +
 sr_port/jnl_pool_write.c                         |  163 +
 sr_port/jnl_send_oper.c                          |   16 +-
 sr_port/jnl_set_cur_prior.c                      |    7 +-
 sr_port/jnl_typedef.h                            |    4 +-
 sr_port/jnl_write.c                              |  700 +-
 sr_port/jnl_write.h                              |    9 +-
 sr_port/jnl_write_aimg_rec.c                     |   36 +-
 sr_port/jnl_write_align_rec.c                    |   50 +
 sr_port/jnl_write_attempt.c                      |  117 +-
 sr_port/jnl_write_eof_rec.c                      |    9 +-
 sr_port/jnl_write_epoch_rec.c                    |   30 +-
 sr_port/jnl_write_extend_if_needed.c             |  100 +
 sr_port/jnl_write_inctn_rec.c                    |   14 +-
 sr_port/jnl_write_logical.c                      |   21 +-
 sr_port/jnl_write_multi_align_rec.c              |   63 +
 sr_port/jnl_write_pblk.c                         |   66 +-
 sr_port/jnl_write_pblk.h                         |    5 +-
 sr_port/{jnl_put_jrt_pfin.c => jnl_write_pfin.c} |    8 +-
 sr_port/jnl_write_phase2.c                       |  179 +
 sr_port/{jnl_put_jrt_pini.c => jnl_write_pini.c} |   19 +-
 sr_port/jnl_write_poolonly.c                     |  122 -
 sr_port/jnl_write_reserve.c                      |  118 +
 sr_port/jnl_write_trunc_rec.c                    |    8 +-
 sr_port/jnl_write_ztp_logical.c                  |   26 +-
 sr_port/jnlpool_hasnt_overflowed.c               |    9 +-
 sr_port/jobexam_process.c                        |    6 +-
 sr_port/jobinterrupt_init.c                      |   27 +-
 sr_port/line.c                                   |   45 +-
 sr_port/linetail.c                               |    8 +-
 sr_port/lkglvn.c                                 |   67 +-
 sr_port/localvarmonitor.h                        |   69 +
 sr_port/lvmon_compare_value_slots.c              |   91 +
 sr_port/lvmon_pull_values.c                      |  124 +
 sr_port/m_do.c                                   |    4 +-
 sr_port/m_goto.c                                 |    4 +-
 sr_port/m_job.c                                  |   11 +-
 sr_port/m_lock.c                                 |   43 +-
 sr_port/m_new.c                                  |    7 +-
 sr_port/m_open.c                                 |   12 +-
 sr_port/m_quit.c                                 |    5 +-
 sr_port/m_read.c                                 |    8 +-
 sr_port/m_set.c                                  |   22 +-
 sr_port/m_xecute.c                               |   95 +-
 sr_port/m_zallocate.c                            |    9 +-
 sr_port/m_zdeallocate.c                          |    7 +-
 sr_port/m_zwrite.c                               |   10 +-
 sr_port/mdb_condition_handler.c                  |    7 +-
 sr_port/mdef.h                                   |   24 +-
 sr_port/mdq.h                                    |   30 +-
 sr_port/merrors.msg                              |   60 +-
 sr_port/mlk_lock.c                               |    6 +-
 sr_port/mlk_unlock.c                             |    2 +-
 sr_port/mtables.c                                |    4 +-
 sr_port/mupip_backup.c                           |    2 +-
 sr_port/mupip_io_dev_dispatch.h                  |   22 +-
 sr_port/mupip_recover.c                          |   12 +-
 sr_port/mupip_set_journal.c                      |    2 +-
 sr_port/muprec.h                                 |   29 +-
 sr_port/mur_back_process.c                       |   44 +-
 sr_port/mur_close_files.c                        |   68 +-
 sr_port/mur_forward.c                            |    7 +-
 sr_port/mur_forward_play_cur_jrec.c              |   26 +-
 sr_port/mur_get_pini.c                           |    6 +-
 sr_port/mur_jnl_ext.c                            |   10 +-
 sr_port/mur_open_files.c                         |   20 +-
 sr_port/mur_output_record.c                      |    5 +-
 sr_port/mur_output_show.c                        |    4 +-
 sr_port/mur_process_intrpt_recov.c               |   40 +-
 sr_port/mur_read_file.c                          |   44 +-
 sr_port/mur_report_error.c                       |    3 +-
 sr_port/mur_select_rec.c                         |    7 +-
 sr_port/mur_validate_checksum.c                  |   39 +-
 sr_port/nref.c                                   |   11 +-
 sr_port/objlabel.h                               |    2 +-
 sr_port/op.h                                     |   67 +-
 sr_port/op_break.c                               |   22 +-
 sr_port/op_close.c                               |   15 +-
 sr_port/op_decrlock.c                            |   14 +-
 sr_port/op_dmode.c                               |   37 +-
 sr_port/op_fntranslate.c                         |   26 +-
 sr_port/op_fnview.c                              |   47 +
 sr_port/op_fnztrigger.c                          |   12 +-
 sr_port/op_gvnaked.c                             |    7 +-
 sr_port/op_hang.c                                |   14 +-
 sr_port/op_incrlock.c                            |    2 +-
 sr_port/op_lkinit.c                              |   11 +-
 sr_port/op_lock.c                                |    2 +-
 sr_port/op_lock2.c                               |   74 +-
 sr_port/op_open.c                                |   29 +-
 sr_port/op_open_dummy.c                          |    6 +-
 sr_port/op_rdone.c                               |   53 +-
 sr_port/op_read.c                                |   30 +-
 sr_port/op_readfl.c                              |   51 +-
 sr_port/op_setzbrk.c                             |    7 +-
 sr_port/op_unlock.c                              |    9 +-
 sr_port/op_view.c                                |  141 +-
 sr_port/op_zallocate.c                           |    5 +-
 sr_port/op_zdealloc2.c                           |   22 +-
 sr_port/op_zdeallocate.c                         |    5 +-
 sr_port/op_zprint.c                              |    4 +-
 sr_port/op_zsystem.c                             |   47 +-
 sr_port/op_ztcommit.c                            |   10 +-
 sr_port/opcode_def.h                             |    8 +-
 sr_port/pattab.c                                 |    6 +-
 sr_port/performcaslatchcheck.c                   |   33 +-
 sr_port/performcaslatchcheck.h                   |    5 +-
 sr_port/preemptive_db_clnup.c                    |    5 +-
 sr_port/probe.h                                  |   44 -
 sr_port/region_freeze.c                          |    9 +-
 sr_port/repl_filter.c                            |  131 +-
 sr_port/repl_filter.h                            |   52 +-
 sr_port/repl_phase2_cleanup.c                    |  166 +
 sr_port/repl_phase2_salvage.c                    |   99 +
 sr_port/repl_sort_tr_buff.c                      |   23 +-
 sr_port/repl_tr_good.c                           |    5 +-
 sr_port/resolve_ref.c                            |   15 +-
 sr_port/restrict.c                               |  187 +
 sr_port/restrict.h                               |   33 +
 sr_port/sec_shr_blk_build.c                      |   93 +-
 sr_port/sec_shr_map_build.c                      |   29 +-
 sr_port/secshr_db_clnup.c                        | 1549 ++---
 sr_port/secshr_db_clnup.h                        |   14 +-
 sr_port/shmpool.c                                |   11 +-
 sr_port/sleep_cnt.h                              |   17 +-
 sr_port/stp_gcol_src.h                           |   50 +-
 sr_port/stx_error.c                              |    6 +
 sr_port/symbinit.c                               |    6 +-
 sr_port/t_begin.c                                |    6 +-
 sr_port/t_begin_crit.c                           |    2 +-
 sr_port/t_commit_cleanup.c                       |  173 +-
 sr_port/t_end.c                                  |  568 +-
 sr_port/t_end_sysops.c                           |   22 +
 sr_port/t_qread.c                                |   27 +-
 sr_port/t_retry.c                                |    9 +
 sr_port/tab_bg_trc_rec.h                         |   11 +-
 sr_port/tab_jpl_trc_rec.h                        |   17 +
 sr_port/time_calc.c                              |   19 +-
 sr_port/timeout2msec.c                           |   25 +-
 sr_port/tp.h                                     |   58 +-
 sr_port/tp_clean_up.c                            |   16 +-
 sr_port/tp_get_cw.c                              |   12 +-
 sr_port/tp_incr_clean_up.c                       |    6 +-
 sr_port/tp_restart.c                             |    8 +-
 sr_port/tp_tend.c                                |  483 +-
 sr_port/tripinit.c                               |    8 +-
 sr_port/unary_tail.c                             |   41 +-
 sr_port/unw_mv_ent.c                             |   14 +-
 sr_port/updhelper_reader.c                       |   28 +-
 sr_port/updhelper_writer.c                       |    1 +
 sr_port/updproc.c                                |  145 +-
 sr_port/updproc_end.c                            |   59 +-
 sr_port/viewtab.h                                |   19 +-
 sr_port/wbox_test_init.h                         |    8 +-
 sr_port/wcs_phase2_commit_wait.c                 |  203 +-
 sr_port/wcs_recover.c                            |  102 +-
 sr_port/wcs_verify.c                             |  113 +-
 sr_port/zco_init.c                               |   29 +-
 sr_port/zdate_form_init.c                        |   29 +-
 sr_port/zr_unlink_rtn.c                          |    6 +-
 sr_port/zro_init.c                               |   18 +-
 sr_port/ztrap_form_init.c                        |   43 +-
 sr_port/zyerror_init.c                           |   37 +-
 sr_port_cm/gtcmd_rundown.c                       |    6 +-
 sr_port_cm/gtcmtr_increment.c                    |   17 +-
 sr_port_cm/gtcmtr_kill.c                         |   11 +-
 sr_port_cm/gtcmtr_put.c                          |   21 +-
 sr_port_cm/gvcmz_neterr.c                        |   13 +-
 sr_unix/Makefile.mk                              |   34 +-
 sr_unix/anticipatory_freeze.c                    |   14 +-
 sr_unix/backup_buffer_flush.c                    |    9 +-
 sr_unix/check_encrypt_support.sh                 |    2 +-
 sr_unix/cms_load.csh                             |   12 +
 sr_unix/comlist.csh                              |   17 +
 sr_unix/comque.csh                               |    4 +-
 sr_unix/configure.gtc                            |   18 +-
 sr_unix/dse.c                                    |   11 +-
 sr_unix/dse_open.c                               |    9 +-
 sr_unix/dsk_write_nocache.c                      |    5 +-
 sr_unix/errorsp.h                                |    2 +
 sr_unix/fake_enospc.c                            |    7 +-
 sr_unix/file_input.c                             |   14 +-
 sr_unix/filestruct.h                             |    3 +-
 sr_unix/ftok_sem_get_common.c                    |  206 +
 sr_unix/ftok_sems.c                              |  272 +-
 sr_unix/ftok_sems.h                              |    2 +
 sr_unix/gdeverif.m                               |    3 +-
 sr_unix/gds_rundown.c                            |   84 +-
 sr_unix/gdsfilext.c                              |   63 +-
 sr_unix/get_command_line.c                       |   10 +-
 sr_unix/go_load.c                                |    7 +-
 sr_unix/grab_latch.c                             |   31 +-
 sr_unix/gtm_env_init_sp.c                        |   19 +-
 sr_unix/gtm_exit_handler.c                       |   18 +-
 sr_unix/gtm_getpwuid.c                           |   32 +-
 sr_unix/gtm_icu.c                                |    9 +-
 sr_unix/gtm_ipc.h                                |   23 +-
 sr_unix/gtm_main.c                               |   10 +
 sr_unix/gtm_multi_proc.c                         |   28 +-
 sr_unix/gtm_permissions.c                        |   74 +-
 sr_unix/gtm_permissions.h                        |   18 +-
 sr_unix/gtm_rel_quant.h                          |   17 +-
 sr_unix/gtm_semutils.c                           |    7 +-
 sr_unix/gtm_semutils.h                           |   53 +-
 sr_unix/gtm_startup.c                            |   15 +-
 sr_unix/gtm_system.c                             |   12 +-
 sr_unix/gtm_test_install.csh                     |   14 +-
 sr_unix/gtm_text_alloc.c                         |   23 +-
 sr_unix/gtmcrypt_util.c                          |    5 +-
 sr_unix/gtmcrypt_util.h                          |    5 +-
 sr_unix/gtmhelp.m                                |  214 +-
 sr_unix/gtminstall.sh                            |   56 +-
 sr_unix/gtmio.h                                  |    4 +-
 sr_unix/gtmlink.c                                |    5 +-
 sr_unix/{versions.csh => gtmpcat_sh.txt}         |   19 +-
 sr_unix/gtmprofile.gtc                           |    8 +-
 sr_unix/gtmrecv.c                                |    5 +-
 sr_unix/gtmrecv_end.c                            |   11 +-
 sr_unix/gtmrecv_process.c                        |   38 +-
 sr_unix/gtmrecv_shutdown.c                       |    4 +-
 sr_unix/gtmsecshr.c                              |   12 +-
 sr_unix/gtmsecshr.h                              |    4 +-
 sr_unix/gtmsecshr_wrapper.c                      |    4 +-
 sr_unix/gtmshr_symbols.exp                       |    4 +
 sr_unix/gtmsource.c                              |    8 +-
 sr_unix/gtmsource.h                              |  284 +-
 sr_unix/gtmsource_end.c                          |   10 +-
 sr_unix/gtmsource_onln_rlbk_clnup.c              |   12 +-
 sr_unix/gtmsource_process.c                      |   45 +-
 sr_unix/gtmsource_process_ops.c                  |   97 +-
 sr_unix/gtmsource_readfiles.c                    |   62 +-
 sr_unix/gtmsource_readpool.c                     |  344 +-
 sr_unix/gvcst_init_sysops.c                      |   64 +-
 sr_unix/incr_link.c                              |    5 +-
 sr_unix/init_gtm.c                               |    2 +-
 sr_unix/install_gtmpcat_sh.txt                   |   88 +
 sr_unix/interlock.h                              |    9 +-
 sr_unix/io_open_try.c                            |   90 +-
 sr_unix/ioff_open.c                              |    7 +-
 sr_unix/iopi_iocontrol.c                         |    6 +-
 sr_unix/iopi_open.c                              |   12 +-
 sr_unix/iorm_close.c                             |    6 +-
 sr_unix/iorm_get.c                               |   10 +-
 sr_unix/iorm_open.c                              |   14 +-
 sr_unix/iorm_rdone.c                             |   11 +-
 sr_unix/iorm_read.c                              |    7 +-
 sr_unix/iorm_readfl.c                            |  151 +-
 sr_unix/iorm_use.c                               |   14 +-
 sr_unix/iorm_write.c                             |   12 +-
 sr_unix/iorm_wteol.c                             |    4 +-
 sr_unix/iormdef.h                                |    4 +-
 sr_unix/iosocket_pass_local.c                    |   80 +-
 sr_unix/iosocket_tls.c                           |   42 +-
 sr_unix/iott_rdone.c                             |   60 +-
 sr_unix/iott_read.c                              |    7 +-
 sr_unix/iott_readfl.c                            |   60 +-
 sr_unix/iott_use.c                               |    7 +-
 sr_unix/iottdef.h                                |    5 +-
 sr_unix/is_fstype_nfs.c                          |    4 +-
 sr_unix/jnl_output_sp.c                          |   79 +-
 sr_unix/jnlpool_init.c                           |   63 +-
 sr_unix/kitstart.csh                             |   46 +-
 sr_unix/list_file.c                              |   11 +-
 sr_unix/lke.c                                    |    9 +-
 sr_unix/mu_cre_file.c                            |  179 +-
 sr_unix/mu_extract.c                             |    5 +-
 sr_unix/mu_op_open.c                             |    6 +-
 sr_unix/mu_op_open.h                             |    5 +-
 sr_unix/mu_rndwn_all.c                           |   11 +-
 sr_unix/mu_rndwn_file.c                          |    7 +-
 sr_unix/mu_rndwn_replpool.c                      |   30 +-
 sr_unix/mu_truncate.c                            |    4 +-
 sr_unix/mubfilcpy.c                              |    9 +-
 sr_unix/mubinccpy.c                              |    9 +-
 sr_unix/mupip.c                                  |    3 +-
 sr_unix/mupip_rundown.c                          |   14 +-
 sr_unix/mupip_set_file.c                         |   25 +-
 sr_unix/mupip_trigger.c                          |   12 +
 sr_unix/mur_cre_file_extfmt.c                    |    6 +-
 sr_unix/mutex.c                                  |  252 +-
 sr_unix/ojstartchild.c                           |   73 +-
 sr_unix/op_fnzconvert.c                          |   96 +-
 sr_unix/op_fnztrnlnm.c                           |   12 +-
 sr_unix/op_job.c                                 |   37 +-
 sr_unix/op_zedit.c                               |    7 +-
 sr_unix/peekbyname.mpt                           |    5 +
 sr_unix/pinentry-gtm.sh                          |    2 +-
 sr_unix/pinentry.m                               |   25 +-
 sr_unix/probe.c                                  |   35 -
 sr_unix/relinkctl.c                              |   25 +-
 sr_unix/relinkctl.h                              |   11 +-
 sr_unix/remove_rms.c                             |    6 +-
 sr_unix/repl_inst_create.c                       |    2 +-
 sr_unix/repl_inst_dump.c                         |   42 +-
 sr_unix/repl_ipc_cleanup.c                       |   19 +-
 sr_unix/rtnobj.c                                 |    5 +-
 sr_unix/rts_error.c                              |    2 +-
 sr_unix/secshr_client.c                          |    8 +-
 sr_unix/set_jnl_file_close.c                     |    4 +-
 sr_unix/source_file.c                            |   30 +-
 sr_unix/trigger_select.c                         |    4 +-
 sr_unix/trigger_source_read_andor_verify.c       |    8 +-
 sr_unix/ttt.txt                                  |   20 +-
 sr_unix/util_output.c                            |   11 +-
 sr_unix/versions.csh                             |    4 +-
 sr_unix/wcs_flu.c                                |  166 +-
 sr_unix/wcs_wterror.c                            |    4 +-
 sr_unix/wcs_wtfini.c                             |    7 +-
 sr_unix/wcs_wtstart.c                            |   12 +-
 sr_unix/wcs_wtstart_fini.c                       |    6 +-
 sr_unix/zro_load.c                               |   24 +-
 sr_unix/zshow_devices.c                          |    5 +-
 sr_unix_cm/gtcm_exit.c                           |    3 +-
 sr_unix_cm/gtcm_init.c                           |    4 +-
 sr_unix_gnp/gtcm_gnp_server.c                    |    4 +-
 sr_unix_nsb/ttt.txt                              |   20 +-
 sr_x86_64/GDEINITSZ.m                            |   24 -
 sr_x86_64/GTMDefinedTypesInitDebug.m             | 7726 ++++++++++++----------
 sr_x86_64/GTMDefinedTypesInitRelease.m           | 7726 ++++++++++++----------
 sr_x86_64/merrors_ansi.h                         |   23 +-
 sr_x86_64/merrors_ctl.c                          |   70 +-
 sr_x86_64/ttt.c                                  | 1414 ++--
 403 files changed, 28089 insertions(+), 21708 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 287514e..60aff43 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -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	#
@@ -27,7 +27,7 @@ foreach(lang ${languages})
 endforeach()
 
 # Defaults
-set(version V6.3-001A)
+set(version V6.3-002)
 if("${version}" STREQUAL "")
         set(version V9.9-0)
 endif()
@@ -37,6 +37,10 @@ if(NOT CMAKE_CONFIGURATION_TYPES AND NOT CMAKE_BUILD_TYPE)
   set(CMAKE_BUILD_TYPE Release CACHE STRING "Build type" FORCE)
 endif()
 
+if(GTM_RELEASE_NAME)
+  add_definitions(-DGTM_RELEASE_NAME="${GTM_RELEASE_NAME}")
+endif()
+
 # Enable GT.M debug options unless directed not to enable them. Added to build without whitebox tests.
 set(GTM_ENABLE_DEBUG 1 CACHE BOOL "Enable GT.M debug options")
 if(GTM_ENABLE_DEBUG)
@@ -612,6 +616,7 @@ set(m_files_sr_port
   gdeexit.m
   gdehelp.m
   gdeinit.m
+  gdeinitsz.m
   gdelocks.m
   gdelog.m
   gdemap.m
@@ -688,6 +693,7 @@ foreach(f
   gtm_stdlib.h
   gtm_string.h
   gtm_strings.h
+  gtmgblstat.xc
   gtmxc_types.h
   main_pragma.h
   arch.gtc
@@ -707,6 +713,13 @@ foreach(f
   custom_errors_sample.txt
   )
   select_file(src ${f})
+  get_filename_component(srcfname "${src}" NAME)
+  add_custom_command(
+    OUTPUT "${GTM_BINARY_DIR}/${srcfname}"
+    DEPENDS "${src}"
+    COMMAND ${CMAKE_COMMAND} -E copy "${src}" "${GTM_BINARY_DIR}/${srcfname}"
+    )
+  list(APPEND files_to_place "${GTM_BINARY_DIR}/${srcfname}")
   list(APPEND files ${src})
 endforeach()
 install(FILES ${files} DESTINATION ${GTM_INSTALL_DIR})
diff --git a/README b/README
index c964308..f674fe3 100644
--- a/README
+++ b/README
@@ -25,16 +25,16 @@ To build GT.M for Linux, do the following steps:
 
 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-001A
-   $ tar xfz fis-gtm-V6.3-001A.tar.gz
-   $ cd fis-gtm-V6.3-001A
+   the name, fis-gtm-V6.3-002
+   $ tar xfz fis-gtm-V6.3-002.tar.gz
+   $ cd fis-gtm-V6.3-002
 
    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-001A, or any other valid path.
+   fis-gtm-V6.3-002, or any other valid path.
 
    $ mkdir <fis-gtm-build>
    $ cd <fis-gtm-build>
@@ -53,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-001A
+   $ cmake -D CMAKE_INSTALL_PREFIX:PATH=${PWD}/package <path to>/fis-gtm-V6.3-002
 
    $ make
 
    $ make install
 
-   $ cd package/lib/fis-gtm/V6.3-001A_x86_64
+   $ cd package/lib/fis-gtm/V6.3-002_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-001A_x86_64
+   # The recommended installation path is /opt/fis-gtm/V6.3-002_x86_64
 
    $ sudo ./configure
 
diff --git a/sr_i386/GTMDefinedTypesInitDebug.m b/sr_i386/GTMDefinedTypesInitDebug.m
index 18b8d61..aaddfc6 100644
--- a/sr_i386/GTMDefinedTypesInitDebug.m
+++ b/sr_i386/GTMDefinedTypesInitDebug.m
@@ -11,14 +11,14 @@
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
 ;
-; 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
+; Generated by scantypedefs.m at 16:03:28 on 2017-08-16
+; Build done with GT.M version: GT.M V6.3-001A 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
+;   $gtm_dist: /usr/library/V63001A/dbg
+;   $gtm_exe: /usr/library/V63002/dbg
+;   $gtm_src: /usr/library/V63002/src
+;   $gtm_inc: /usr/library/V63002/inc
 ;
 ; Note this file should not be manually invoked
 ;
@@ -1085,11 +1085,11 @@ Init
 	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,"name")="cache_que_heads.cache_array[0].needs_first_write"
 	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 gtmtypfldindx("cache_que_heads","cache_array[0].needs_first_write")=52
 	;
 	Set gtmtypes("cache_rec")="struct"
 	Set gtmtypes("cache_rec",0)=38
@@ -1279,11 +1279,11 @@ Init
 	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,"name")="cache_rec.needs_first_write"
 	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 gtmtypfldindx("cache_rec","needs_first_write")=38
 	;
 	Set gtmtypes("cache_state_rec")="struct"
 	Set gtmtypes("cache_state_rec",0)=35
@@ -1458,11 +1458,11 @@ Init
 	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,"name")="cache_state_rec.needs_first_write"
 	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 gtmtypfldindx("cache_state_rec","needs_first_write")=35
 	;
 	Set gtmtypes("callin_entry_list")="struct"
 	Set gtmtypes("callin_entry_list",0)=14
@@ -2784,11 +2784,11 @@ Init
 	Set gtmtypes("d_rm_struct",5,"len")=4
 	Set gtmtypes("d_rm_struct",5,"type")="boolean_t"
 	Set gtmtypfldindx("d_rm_struct","fifo")=5
-	Set gtmtypes("d_rm_struct",6,"name")="d_rm_struct.gtm_pipe1"
+	Set gtmtypes("d_rm_struct",6,"name")="d_rm_struct.is_pipe"
 	Set gtmtypes("d_rm_struct",6,"off")=20
 	Set gtmtypes("d_rm_struct",6,"len")=4
 	Set gtmtypes("d_rm_struct",6,"type")="boolean_t"
-	Set gtmtypfldindx("d_rm_struct","gtm_pipe1")=6
+	Set gtmtypfldindx("d_rm_struct","is_pipe")=6
 	Set gtmtypes("d_rm_struct",7,"name")="d_rm_struct.independent"
 	Set gtmtypes("d_rm_struct",7,"off")=24
 	Set gtmtypes("d_rm_struct",7,"len")=4
@@ -6915,11 +6915,11 @@ Init
 	Set gtmtypes("gtmsource_local_struct",53,"len")=4
 	Set gtmtypes("gtmsource_local_struct",53,"type")="int"
 	Set gtmtypfldindx("gtmsource_local_struct","num_renegotiations")=53
-	Set gtmtypes("gtmsource_local_struct",54,"name")="gtmsource_local_struct.padding"
+	Set gtmtypes("gtmsource_local_struct",54,"name")="gtmsource_local_struct.filler_8byte_align"
 	Set gtmtypes("gtmsource_local_struct",54,"off")=1540
 	Set gtmtypes("gtmsource_local_struct",54,"len")=4
 	Set gtmtypes("gtmsource_local_struct",54,"type")="int"
-	Set gtmtypfldindx("gtmsource_local_struct","padding")=54
+	Set gtmtypfldindx("gtmsource_local_struct","filler_8byte_align")=54
 	;
 	Set gtmtypes("gtmsource_options_t")="struct"
 	Set gtmtypes("gtmsource_options_t",0)=34
@@ -9653,6 +9653,99 @@ Init
 	Set gtmtypes("ipcs_mesg",7,"type")="char"
 	Set gtmtypfldindx("ipcs_mesg","fn")=7
 	;
+	Set gtmtypes("jbuf_phase2_in_prog_t")="struct"
+	Set gtmtypes("jbuf_phase2_in_prog_t",0)=12
+	Set gtmtypes("jbuf_phase2_in_prog_t","len")=48
+	Set gtmtypes("jbuf_phase2_in_prog_t",1,"name")="jbuf_phase2_in_prog_t.curr_tn"
+	Set gtmtypes("jbuf_phase2_in_prog_t",1,"off")=0
+	Set gtmtypes("jbuf_phase2_in_prog_t",1,"len")=8
+	Set gtmtypes("jbuf_phase2_in_prog_t",1,"type")="uint64_t"
+	Set gtmtypfldindx("jbuf_phase2_in_prog_t","curr_tn")=1
+	Set gtmtypes("jbuf_phase2_in_prog_t",2,"name")="jbuf_phase2_in_prog_t.jnl_seqno"
+	Set gtmtypes("jbuf_phase2_in_prog_t",2,"off")=8
+	Set gtmtypes("jbuf_phase2_in_prog_t",2,"len")=8
+	Set gtmtypes("jbuf_phase2_in_prog_t",2,"type")="uint64_t"
+	Set gtmtypfldindx("jbuf_phase2_in_prog_t","jnl_seqno")=2
+	Set gtmtypes("jbuf_phase2_in_prog_t",3,"name")="jbuf_phase2_in_prog_t.strm_seqno"
+	Set gtmtypes("jbuf_phase2_in_prog_t",3,"off")=16
+	Set gtmtypes("jbuf_phase2_in_prog_t",3,"len")=8
+	Set gtmtypes("jbuf_phase2_in_prog_t",3,"type")="uint64_t"
+	Set gtmtypfldindx("jbuf_phase2_in_prog_t","strm_seqno")=3
+	Set gtmtypes("jbuf_phase2_in_prog_t",4,"name")="jbuf_phase2_in_prog_t.process_id"
+	Set gtmtypes("jbuf_phase2_in_prog_t",4,"off")=24
+	Set gtmtypes("jbuf_phase2_in_prog_t",4,"len")=4
+	Set gtmtypes("jbuf_phase2_in_prog_t",4,"type")="unsigned-int"
+	Set gtmtypfldindx("jbuf_phase2_in_prog_t","process_id")=4
+	Set gtmtypes("jbuf_phase2_in_prog_t",5,"name")="jbuf_phase2_in_prog_t.start_freeaddr"
+	Set gtmtypes("jbuf_phase2_in_prog_t",5,"off")=28
+	Set gtmtypes("jbuf_phase2_in_prog_t",5,"len")=4
+	Set gtmtypes("jbuf_phase2_in_prog_t",5,"type")="unsigned-int"
+	Set gtmtypfldindx("jbuf_phase2_in_prog_t","start_freeaddr")=5
+	Set gtmtypes("jbuf_phase2_in_prog_t",6,"name")="jbuf_phase2_in_prog_t.tot_jrec_len"
+	Set gtmtypes("jbuf_phase2_in_prog_t",6,"off")=32
+	Set gtmtypes("jbuf_phase2_in_prog_t",6,"len")=4
+	Set gtmtypes("jbuf_phase2_in_prog_t",6,"type")="unsigned-int"
+	Set gtmtypfldindx("jbuf_phase2_in_prog_t","tot_jrec_len")=6
+	Set gtmtypes("jbuf_phase2_in_prog_t",7,"name")="jbuf_phase2_in_prog_t.pini_addr"
+	Set gtmtypes("jbuf_phase2_in_prog_t",7,"off")=36
+	Set gtmtypes("jbuf_phase2_in_prog_t",7,"len")=4
+	Set gtmtypes("jbuf_phase2_in_prog_t",7,"type")="unsigned-int"
+	Set gtmtypfldindx("jbuf_phase2_in_prog_t","pini_addr")=7
+	Set gtmtypes("jbuf_phase2_in_prog_t",8,"name")="jbuf_phase2_in_prog_t.jrec_time"
+	Set gtmtypes("jbuf_phase2_in_prog_t",8,"off")=40
+	Set gtmtypes("jbuf_phase2_in_prog_t",8,"len")=4
+	Set gtmtypes("jbuf_phase2_in_prog_t",8,"type")="unsigned-int"
+	Set gtmtypfldindx("jbuf_phase2_in_prog_t","jrec_time")=8
+	Set gtmtypes("jbuf_phase2_in_prog_t",9,"name")="jbuf_phase2_in_prog_t.in_phase2"
+	Set gtmtypes("jbuf_phase2_in_prog_t",9,"off")=44
+	Set gtmtypes("jbuf_phase2_in_prog_t",9,"len")=1
+	Set gtmtypes("jbuf_phase2_in_prog_t",9,"type")="char"
+	Set gtmtypfldindx("jbuf_phase2_in_prog_t","in_phase2")=9
+	Set gtmtypes("jbuf_phase2_in_prog_t",10,"name")="jbuf_phase2_in_prog_t.replication"
+	Set gtmtypes("jbuf_phase2_in_prog_t",10,"off")=45
+	Set gtmtypes("jbuf_phase2_in_prog_t",10,"len")=1
+	Set gtmtypes("jbuf_phase2_in_prog_t",10,"type")="char"
+	Set gtmtypfldindx("jbuf_phase2_in_prog_t","replication")=10
+	Set gtmtypes("jbuf_phase2_in_prog_t",11,"name")="jbuf_phase2_in_prog_t.write_complete"
+	Set gtmtypes("jbuf_phase2_in_prog_t",11,"off")=46
+	Set gtmtypes("jbuf_phase2_in_prog_t",11,"len")=1
+	Set gtmtypes("jbuf_phase2_in_prog_t",11,"type")="char"
+	Set gtmtypfldindx("jbuf_phase2_in_prog_t","write_complete")=11
+	Set gtmtypes("jbuf_phase2_in_prog_t",12,"name")="jbuf_phase2_in_prog_t.filler_8byte_align"
+	Set gtmtypes("jbuf_phase2_in_prog_t",12,"off")=47
+	Set gtmtypes("jbuf_phase2_in_prog_t",12,"len")=1
+	Set gtmtypes("jbuf_phase2_in_prog_t",12,"type")="char"
+	Set gtmtypfldindx("jbuf_phase2_in_prog_t","filler_8byte_align")=12
+	;
+	Set gtmtypes("jbuf_rsrv_struct_t")="struct"
+	Set gtmtypes("jbuf_rsrv_struct_t",0)=5
+	Set gtmtypes("jbuf_rsrv_struct_t","len")=20
+	Set gtmtypes("jbuf_rsrv_struct_t",1,"name")="jbuf_rsrv_struct_t.alloclen"
+	Set gtmtypes("jbuf_rsrv_struct_t",1,"off")=0
+	Set gtmtypes("jbuf_rsrv_struct_t",1,"len")=4
+	Set gtmtypes("jbuf_rsrv_struct_t",1,"type")="unsigned-int"
+	Set gtmtypfldindx("jbuf_rsrv_struct_t","alloclen")=1
+	Set gtmtypes("jbuf_rsrv_struct_t",2,"name")="jbuf_rsrv_struct_t.usedlen"
+	Set gtmtypes("jbuf_rsrv_struct_t",2,"off")=4
+	Set gtmtypes("jbuf_rsrv_struct_t",2,"len")=4
+	Set gtmtypes("jbuf_rsrv_struct_t",2,"type")="unsigned-int"
+	Set gtmtypfldindx("jbuf_rsrv_struct_t","usedlen")=2
+	Set gtmtypes("jbuf_rsrv_struct_t",3,"name")="jbuf_rsrv_struct_t.tot_jrec_len"
+	Set gtmtypes("jbuf_rsrv_struct_t",3,"off")=8
+	Set gtmtypes("jbuf_rsrv_struct_t",3,"len")=4
+	Set gtmtypes("jbuf_rsrv_struct_t",3,"type")="unsigned-int"
+	Set gtmtypfldindx("jbuf_rsrv_struct_t","tot_jrec_len")=3
+	Set gtmtypes("jbuf_rsrv_struct_t",4,"name")="jbuf_rsrv_struct_t.phase2_commit_index"
+	Set gtmtypes("jbuf_rsrv_struct_t",4,"off")=12
+	Set gtmtypes("jbuf_rsrv_struct_t",4,"len")=4
+	Set gtmtypes("jbuf_rsrv_struct_t",4,"type")="unsigned-int"
+	Set gtmtypfldindx("jbuf_rsrv_struct_t","phase2_commit_index")=4
+	Set gtmtypes("jbuf_rsrv_struct_t",5,"name")="jbuf_rsrv_struct_t.jrs_array"
+	Set gtmtypes("jbuf_rsrv_struct_t",5,"off")=16
+	Set gtmtypes("jbuf_rsrv_struct_t",5,"len")=4
+	Set gtmtypes("jbuf_rsrv_struct_t",5,"type")="addr"
+	Set gtmtypfldindx("jbuf_rsrv_struct_t","jrs_array")=5
+	;
 	Set gtmtypes("jext_heap_elem_t")="struct"
 	Set gtmtypes("jext_heap_elem_t",0)=2
 	Set gtmtypes("jext_heap_elem_t","len")=8
@@ -9682,8 +9775,8 @@ Init
 	Set gtmtypfldindx("jnl_action","nodeflags")=2
 	;
 	Set gtmtypes("jnl_buffer")="struct"
-	Set gtmtypes("jnl_buffer",0)=60
-	Set gtmtypes("jnl_buffer","len")=536
+	Set gtmtypes("jnl_buffer",0)=85
+	Set gtmtypes("jnl_buffer","len")=197216
 	Set gtmtypes("jnl_buffer",1,"name")="jnl_buffer.eov_tn"
 	Set gtmtypes("jnl_buffer",1,"off")=0
 	Set gtmtypes("jnl_buffer",1,"len")=8
@@ -9740,252 +9833,379 @@ Init
 	Set gtmtypes("jnl_buffer",11,"len")=4
 	Set gtmtypes("jnl_buffer",11,"type")="int"
 	Set gtmtypfldindx("jnl_buffer","gtm_free")=11
-	Set gtmtypes("jnl_buffer",12,"name")="jnl_buffer.freeaddr"
+	Set gtmtypes("jnl_buffer",12,"name")="jnl_buffer.rsrv_free"
 	Set gtmtypes("jnl_buffer",12,"off")=180
 	Set gtmtypes("jnl_buffer",12,"len")=4
-	Set gtmtypes("jnl_buffer",12,"type")="unsigned-int"
-	Set gtmtypfldindx("jnl_buffer","freeaddr")=12
-	Set gtmtypes("jnl_buffer",13,"name")="jnl_buffer.end_of_data"
+	Set gtmtypes("jnl_buffer",12,"type")="int"
+	Set gtmtypfldindx("jnl_buffer","rsrv_free")=12
+	Set gtmtypes("jnl_buffer",13,"name")="jnl_buffer.freeaddr"
 	Set gtmtypes("jnl_buffer",13,"off")=184
 	Set gtmtypes("jnl_buffer",13,"len")=4
 	Set gtmtypes("jnl_buffer",13,"type")="unsigned-int"
-	Set gtmtypfldindx("jnl_buffer","end_of_data")=13
-	Set gtmtypes("jnl_buffer",14,"name")="jnl_buffer.filesize"
+	Set gtmtypfldindx("jnl_buffer","freeaddr")=13
+	Set gtmtypes("jnl_buffer",14,"name")="jnl_buffer.rsrv_freeaddr"
 	Set gtmtypes("jnl_buffer",14,"off")=188
 	Set gtmtypes("jnl_buffer",14,"len")=4
 	Set gtmtypes("jnl_buffer",14,"type")="unsigned-int"
-	Set gtmtypfldindx("jnl_buffer","filesize")=14
-	Set gtmtypes("jnl_buffer",15,"name")="jnl_buffer.blocked"
+	Set gtmtypfldindx("jnl_buffer","rsrv_freeaddr")=14
+	Set gtmtypes("jnl_buffer",15,"name")="jnl_buffer.next_align_addr"
 	Set gtmtypes("jnl_buffer",15,"off")=192
 	Set gtmtypes("jnl_buffer",15,"len")=4
-	Set gtmtypes("jnl_buffer",15,"type")="int"
-	Set gtmtypfldindx("jnl_buffer","blocked")=15
-	Set gtmtypes("jnl_buffer",16,"name")="jnl_buffer.fsync_dskaddr"
+	Set gtmtypes("jnl_buffer",15,"type")="unsigned-int"
+	Set gtmtypfldindx("jnl_buffer","next_align_addr")=15
+	Set gtmtypes("jnl_buffer",16,"name")="jnl_buffer.end_of_data"
 	Set gtmtypes("jnl_buffer",16,"off")=196
 	Set gtmtypes("jnl_buffer",16,"len")=4
 	Set gtmtypes("jnl_buffer",16,"type")="unsigned-int"
-	Set gtmtypfldindx("jnl_buffer","fsync_dskaddr")=16
-	Set gtmtypes("jnl_buffer",17,"name")="jnl_buffer.dsk"
+	Set gtmtypfldindx("jnl_buffer","end_of_data")=16
+	Set gtmtypes("jnl_buffer",17,"name")="jnl_buffer.filesize"
 	Set gtmtypes("jnl_buffer",17,"off")=200
 	Set gtmtypes("jnl_buffer",17,"len")=4
-	Set gtmtypes("jnl_buffer",17,"type")="int"
-	Set gtmtypfldindx("jnl_buffer","dsk")=17
-	Set gtmtypes("jnl_buffer",18,"name")="jnl_buffer.wrtsize"
+	Set gtmtypes("jnl_buffer",17,"type")="unsigned-int"
+	Set gtmtypfldindx("jnl_buffer","filesize")=17
+	Set gtmtypes("jnl_buffer",18,"name")="jnl_buffer.phase2_commit_index1"
 	Set gtmtypes("jnl_buffer",18,"off")=204
 	Set gtmtypes("jnl_buffer",18,"len")=4
-	Set gtmtypes("jnl_buffer",18,"type")="int"
-	Set gtmtypfldindx("jnl_buffer","wrtsize")=18
-	Set gtmtypes("jnl_buffer",19,"name")="jnl_buffer.dskaddr"
+	Set gtmtypes("jnl_buffer",18,"type")="unsigned-int"
+	Set gtmtypfldindx("jnl_buffer","phase2_commit_index1")=18
+	Set gtmtypes("jnl_buffer",19,"name")="jnl_buffer.phase2_commit_index2"
 	Set gtmtypes("jnl_buffer",19,"off")=208
 	Set gtmtypes("jnl_buffer",19,"len")=4
 	Set gtmtypes("jnl_buffer",19,"type")="unsigned-int"
-	Set gtmtypfldindx("jnl_buffer","dskaddr")=19
-	Set gtmtypes("jnl_buffer",20,"name")="jnl_buffer.now_writer"
+	Set gtmtypfldindx("jnl_buffer","phase2_commit_index2")=19
+	Set gtmtypes("jnl_buffer",20,"name")="jnl_buffer.phase2_commit_array"
 	Set gtmtypes("jnl_buffer",20,"off")=212
-	Set gtmtypes("jnl_buffer",20,"len")=4
-	Set gtmtypes("jnl_buffer",20,"type")="unsigned-int"
-	Set gtmtypfldindx("jnl_buffer","now_writer")=20
-	Set gtmtypes("jnl_buffer",21,"name")="jnl_buffer.image_count"
-	Set gtmtypes("jnl_buffer",21,"off")=216
-	Set gtmtypes("jnl_buffer",21,"len")=4
-	Set gtmtypes("jnl_buffer",21,"type")="unsigned-int"
-	Set gtmtypfldindx("jnl_buffer","image_count")=21
-	Set gtmtypes("jnl_buffer",22,"name")="jnl_buffer.iosb"
+	Set gtmtypes("jnl_buffer",20,"len")=196608
+	Set gtmtypes("jnl_buffer",20,"type")="jbuf_phase2_in_prog_t"
+	Set gtmtypfldindx("jnl_buffer","phase2_commit_array")=20
+	Set gtmtypes("jnl_buffer",20,"dim")=4096
+	Set gtmtypes("jnl_buffer",21,"name")="jnl_buffer.phase2_commit_array[0].curr_tn"
+	Set gtmtypes("jnl_buffer",21,"off")=212
+	Set gtmtypes("jnl_buffer",21,"len")=8
+	Set gtmtypes("jnl_buffer",21,"type")="uint64_t"
+	Set gtmtypfldindx("jnl_buffer","phase2_commit_array[0].curr_tn")=21
+	Set gtmtypes("jnl_buffer",22,"name")="jnl_buffer.phase2_commit_array[0].jnl_seqno"
 	Set gtmtypes("jnl_buffer",22,"off")=220
 	Set gtmtypes("jnl_buffer",22,"len")=8
-	Set gtmtypes("jnl_buffer",22,"type")="struct"
-	Set gtmtypfldindx("jnl_buffer","iosb")=22
-	Set gtmtypes("jnl_buffer",23,"name")="jnl_buffer.iosb.cond"
-	Set gtmtypes("jnl_buffer",23,"off")=220
-	Set gtmtypes("jnl_buffer",23,"len")=2
-	Set gtmtypes("jnl_buffer",23,"type")="short"
-	Set gtmtypfldindx("jnl_buffer","iosb.cond")=23
-	Set gtmtypes("jnl_buffer",24,"name")="jnl_buffer.iosb.length"
-	Set gtmtypes("jnl_buffer",24,"off")=222
-	Set gtmtypes("jnl_buffer",24,"len")=2
-	Set gtmtypes("jnl_buffer",24,"type")="unsigned-short"
-	Set gtmtypfldindx("jnl_buffer","iosb.length")=24
-	Set gtmtypes("jnl_buffer",25,"name")="jnl_buffer.iosb.dev_specific"
-	Set gtmtypes("jnl_buffer",25,"off")=224
+	Set gtmtypes("jnl_buffer",22,"type")="uint64_t"
+	Set gtmtypfldindx("jnl_buffer","phase2_commit_array[0].jnl_seqno")=22
+	Set gtmtypes("jnl_buffer",23,"name")="jnl_buffer.phase2_commit_array[0].strm_seqno"
+	Set gtmtypes("jnl_buffer",23,"off")=228
+	Set gtmtypes("jnl_buffer",23,"len")=8
+	Set gtmtypes("jnl_buffer",23,"type")="uint64_t"
+	Set gtmtypfldindx("jnl_buffer","phase2_commit_array[0].strm_seqno")=23
+	Set gtmtypes("jnl_buffer",24,"name")="jnl_buffer.phase2_commit_array[0].process_id"
+	Set gtmtypes("jnl_buffer",24,"off")=236
+	Set gtmtypes("jnl_buffer",24,"len")=4
+	Set gtmtypes("jnl_buffer",24,"type")="unsigned-int"
+	Set gtmtypfldindx("jnl_buffer","phase2_commit_array[0].process_id")=24
+	Set gtmtypes("jnl_buffer",25,"name")="jnl_buffer.phase2_commit_array[0].start_freeaddr"
+	Set gtmtypes("jnl_buffer",25,"off")=240
 	Set gtmtypes("jnl_buffer",25,"len")=4
-	Set gtmtypes("jnl_buffer",25,"type")="int"
-	Set gtmtypfldindx("jnl_buffer","iosb.dev_specific")=25
-	Set gtmtypes("jnl_buffer",26,"name")="jnl_buffer.log2_of_alignsize"
-	Set gtmtypes("jnl_buffer",26,"off")=228
+	Set gtmtypes("jnl_buffer",25,"type")="unsigned-int"
+	Set gtmtypfldindx("jnl_buffer","phase2_commit_array[0].start_freeaddr")=25
+	Set gtmtypes("jnl_buffer",26,"name")="jnl_buffer.phase2_commit_array[0].tot_jrec_len"
+	Set gtmtypes("jnl_buffer",26,"off")=244
 	Set gtmtypes("jnl_buffer",26,"len")=4
 	Set gtmtypes("jnl_buffer",26,"type")="unsigned-int"
-	Set gtmtypfldindx("jnl_buffer","log2_of_alignsize")=26
-	Set gtmtypes("jnl_buffer",27,"name")="jnl_buffer.eov_timestamp"
-	Set gtmtypes("jnl_buffer",27,"off")=232
+	Set gtmtypfldindx("jnl_buffer","phase2_commit_array[0].tot_jrec_len")=26
+	Set gtmtypes("jnl_buffer",27,"name")="jnl_buffer.phase2_commit_array[0].pini_addr"
+	Set gtmtypes("jnl_buffer",27,"off")=248
 	Set gtmtypes("jnl_buffer",27,"len")=4
 	Set gtmtypes("jnl_buffer",27,"type")="unsigned-int"
-	Set gtmtypfldindx("jnl_buffer","eov_timestamp")=27
-	Set gtmtypes("jnl_buffer",28,"name")="jnl_buffer.cycle"
-	Set gtmtypes("jnl_buffer",28,"off")=236
+	Set gtmtypfldindx("jnl_buffer","phase2_commit_array[0].pini_addr")=27
+	Set gtmtypes("jnl_buffer",28,"name")="jnl_buffer.phase2_commit_array[0].jrec_time"
+	Set gtmtypes("jnl_buffer",28,"off")=252
 	Set gtmtypes("jnl_buffer",28,"len")=4
 	Set gtmtypes("jnl_buffer",28,"type")="unsigned-int"
-	Set gtmtypfldindx("jnl_buffer","cycle")=28
-	Set gtmtypes("jnl_buffer",29,"name")="jnl_buffer.qiocnt"
-	Set gtmtypes("jnl_buffer",29,"off")=240
-	Set gtmtypes("jnl_buffer",29,"len")=4
-	Set gtmtypes("jnl_buffer",29,"type")="int"
-	Set gtmtypfldindx("jnl_buffer","qiocnt")=29
-	Set gtmtypes("jnl_buffer",30,"name")="jnl_buffer.bytcnt"
-	Set gtmtypes("jnl_buffer",30,"off")=244
-	Set gtmtypes("jnl_buffer",30,"len")=4
-	Set gtmtypes("jnl_buffer",30,"type")="int"
-	Set gtmtypfldindx("jnl_buffer","bytcnt")=30
-	Set gtmtypes("jnl_buffer",31,"name")="jnl_buffer.errcnt"
-	Set gtmtypes("jnl_buffer",31,"off")=248
-	Set gtmtypes("jnl_buffer",31,"len")=4
-	Set gtmtypes("jnl_buffer",31,"type")="int"
-	Set gtmtypfldindx("jnl_buffer","errcnt")=31
-	Set gtmtypes("jnl_buffer",32,"name")="jnl_buffer.reccnt"
-	Set gtmtypes("jnl_buffer",32,"off")=252
-	Set gtmtypes("jnl_buffer",32,"len")=144
-	Set gtmtypes("jnl_buffer",32,"type")="int"
-	Set gtmtypfldindx("jnl_buffer","reccnt")=32
-	Set gtmtypes("jnl_buffer",32,"dim")=36
-	Set gtmtypes("jnl_buffer",33,"name")="jnl_buffer.filler_align"
-	Set gtmtypes("jnl_buffer",33,"off")=396
+	Set gtmtypfldindx("jnl_buffer","phase2_commit_array[0].jrec_time")=28
+	Set gtmtypes("jnl_buffer",29,"name")="jnl_buffer.phase2_commit_array[0].in_phase2"
+	Set gtmtypes("jnl_buffer",29,"off")=256
+	Set gtmtypes("jnl_buffer",29,"len")=1
+	Set gtmtypes("jnl_buffer",29,"type")="char"
+	Set gtmtypfldindx("jnl_buffer","phase2_commit_array[0].in_phase2")=29
+	Set gtmtypes("jnl_buffer",30,"name")="jnl_buffer.phase2_commit_array[0].replication"
+	Set gtmtypes("jnl_buffer",30,"off")=257
+	Set gtmtypes("jnl_buffer",30,"len")=1
+	Set gtmtypes("jnl_buffer",30,"type")="char"
+	Set gtmtypfldindx("jnl_buffer","phase2_commit_array[0].replication")=30
+	Set gtmtypes("jnl_buffer",31,"name")="jnl_buffer.phase2_commit_array[0].write_complete"
+	Set gtmtypes("jnl_buffer",31,"off")=258
+	Set gtmtypes("jnl_buffer",31,"len")=1
+	Set gtmtypes("jnl_buffer",31,"type")="char"
+	Set gtmtypfldindx("jnl_buffer","phase2_commit_array[0].write_complete")=31
+	Set gtmtypes("jnl_buffer",32,"name")="jnl_buffer.phase2_commit_array[0].filler_8byte_align"
+	Set gtmtypes("jnl_buffer",32,"off")=259
+	Set gtmtypes("jnl_buffer",32,"len")=1
+	Set gtmtypes("jnl_buffer",32,"type")="char"
+	Set gtmtypfldindx("jnl_buffer","phase2_commit_array[0].filler_8byte_align")=32
+	Set gtmtypes("jnl_buffer",33,"name")="jnl_buffer.blocked"
+	Set gtmtypes("jnl_buffer",33,"off")=196820
 	Set gtmtypes("jnl_buffer",33,"len")=4
 	Set gtmtypes("jnl_buffer",33,"type")="int"
-	Set gtmtypfldindx("jnl_buffer","filler_align")=33
-	Set gtmtypes("jnl_buffer",34,"name")="jnl_buffer.prev_jrec_time"
-	Set gtmtypes("jnl_buffer",34,"off")=400
+	Set gtmtypfldindx("jnl_buffer","blocked")=33
+	Set gtmtypes("jnl_buffer",34,"name")="jnl_buffer.fsync_dskaddr"
+	Set gtmtypes("jnl_buffer",34,"off")=196824
 	Set gtmtypes("jnl_buffer",34,"len")=4
 	Set gtmtypes("jnl_buffer",34,"type")="unsigned-int"
-	Set gtmtypfldindx("jnl_buffer","prev_jrec_time")=34
-	Set gtmtypes("jnl_buffer",35,"name")="jnl_buffer.free_update_pid"
-	Set gtmtypes("jnl_buffer",35,"off")=404
+	Set gtmtypfldindx("jnl_buffer","fsync_dskaddr")=34
+	Set gtmtypes("jnl_buffer",35,"name")="jnl_buffer.dsk"
+	Set gtmtypes("jnl_buffer",35,"off")=196828
 	Set gtmtypes("jnl_buffer",35,"len")=4
 	Set gtmtypes("jnl_buffer",35,"type")="int"
-	Set gtmtypfldindx("jnl_buffer","free_update_pid")=35
-	Set gtmtypes("jnl_buffer",36,"name")="jnl_buffer.next_epoch_time"
-	Set gtmtypes("jnl_buffer",36,"off")=408
+	Set gtmtypfldindx("jnl_buffer","dsk")=35
+	Set gtmtypes("jnl_buffer",36,"name")="jnl_buffer.wrtsize"
+	Set gtmtypes("jnl_buffer",36,"off")=196832
 	Set gtmtypes("jnl_buffer",36,"len")=4
-	Set gtmtypes("jnl_buffer",36,"type")="unsigned-int"
-	Set gtmtypfldindx("jnl_buffer","next_epoch_time")=36
-	Set gtmtypes("jnl_buffer",37,"name")="jnl_buffer.need_db_fsync"
-	Set gtmtypes("jnl_buffer",37,"off")=412
+	Set gtmtypes("jnl_buffer",36,"type")="int"
+	Set gtmtypfldindx("jnl_buffer","wrtsize")=36
+	Set gtmtypes("jnl_buffer",37,"name")="jnl_buffer.dskaddr"
+	Set gtmtypes("jnl_buffer",37,"off")=196836
 	Set gtmtypes("jnl_buffer",37,"len")=4
-	Set gtmtypes("jnl_buffer",37,"type")="boolean_t"
-	Set gtmtypfldindx("jnl_buffer","need_db_fsync")=37
-	Set gtmtypes("jnl_buffer",38,"name")="jnl_buffer.io_in_prog"
-	Set gtmtypes("jnl_buffer",38,"off")=416
+	Set gtmtypes("jnl_buffer",37,"type")="unsigned-int"
+	Set gtmtypfldindx("jnl_buffer","dskaddr")=37
+	Set gtmtypes("jnl_buffer",38,"name")="jnl_buffer.now_writer"
+	Set gtmtypes("jnl_buffer",38,"off")=196840
 	Set gtmtypes("jnl_buffer",38,"len")=4
-	Set gtmtypes("jnl_buffer",38,"type")="int"
-	Set gtmtypfldindx("jnl_buffer","io_in_prog")=38
-	Set gtmtypes("jnl_buffer",39,"name")="jnl_buffer.enospc_errcnt"
-	Set gtmtypes("jnl_buffer",39,"off")=420
+	Set gtmtypes("jnl_buffer",38,"type")="unsigned-int"
+	Set gtmtypfldindx("jnl_buffer","now_writer")=38
+	Set gtmtypes("jnl_buffer",39,"name")="jnl_buffer.image_count"
+	Set gtmtypes("jnl_buffer",39,"off")=196844
 	Set gtmtypes("jnl_buffer",39,"len")=4
 	Set gtmtypes("jnl_buffer",39,"type")="unsigned-int"
-	Set gtmtypfldindx("jnl_buffer","enospc_errcnt")=39
-	Set gtmtypes("jnl_buffer",40,"name")="jnl_buffer.max_jrec_len"
-	Set gtmtypes("jnl_buffer",40,"off")=424
-	Set gtmtypes("jnl_buffer",40,"len")=4
-	Set gtmtypes("jnl_buffer",40,"type")="unsigned-int"
-	Set gtmtypfldindx("jnl_buffer","max_jrec_len")=40
-	Set gtmtypes("jnl_buffer",41,"name")="jnl_buffer.fs_block_size"
-	Set gtmtypes("jnl_buffer",41,"off")=428
-	Set gtmtypes("jnl_buffer",41,"len")=4
-	Set gtmtypes("jnl_buffer",41,"type")="unsigned-int"
-	Set gtmtypfldindx("jnl_buffer","fs_block_size")=41
-	Set gtmtypes("jnl_buffer",42,"name")="jnl_buffer.post_epoch_freeaddr"
-	Set gtmtypes("jnl_buffer",42,"off")=432
-	Set gtmtypes("jnl_buffer",42,"len")=4
-	Set gtmtypes("jnl_buffer",42,"type")="unsigned-int"
-	Set gtmtypfldindx("jnl_buffer","post_epoch_freeaddr")=42
-	Set gtmtypes("jnl_buffer",43,"name")="jnl_buffer.last_eof_written"
-	Set gtmtypes("jnl_buffer",43,"off")=436
+	Set gtmtypfldindx("jnl_buffer","image_count")=39
+	Set gtmtypes("jnl_buffer",40,"name")="jnl_buffer.iosb"
+	Set gtmtypes("jnl_buffer",40,"off")=196848
+	Set gtmtypes("jnl_buffer",40,"len")=8
+	Set gtmtypes("jnl_buffer",40,"type")="struct"
+	Set gtmtypfldindx("jnl_buffer","iosb")=40
+	Set gtmtypes("jnl_buffer",41,"name")="jnl_buffer.iosb.cond"
+	Set gtmtypes("jnl_buffer",41,"off")=196848
+	Set gtmtypes("jnl_buffer",41,"len")=2
+	Set gtmtypes("jnl_buffer",41,"type")="short"
+	Set gtmtypfldindx("jnl_buffer","iosb.cond")=41
+	Set gtmtypes("jnl_buffer",42,"name")="jnl_buffer.iosb.length"
+	Set gtmtypes("jnl_buffer",42,"off")=196850
+	Set gtmtypes("jnl_buffer",42,"len")=2
+	Set gtmtypes("jnl_buffer",42,"type")="unsigned-short"
+	Set gtmtypfldindx("jnl_buffer","iosb.length")=42
+	Set gtmtypes("jnl_buffer",43,"name")="jnl_buffer.iosb.dev_specific"
+	Set gtmtypes("jnl_buffer",43,"off")=196852
 	Set gtmtypes("jnl_buffer",43,"len")=4
-	Set gtmtypes("jnl_buffer",43,"type")="boolean_t"
-	Set gtmtypfldindx("jnl_buffer","last_eof_written")=43
-	Set gtmtypes("jnl_buffer",44,"name")="jnl_buffer.end_of_data_at_open"
-	Set gtmtypes("jnl_buffer",44,"off")=440
+	Set gtmtypes("jnl_buffer",43,"type")="int"
+	Set gtmtypfldindx("jnl_buffer","iosb.dev_specific")=43
+	Set gtmtypes("jnl_buffer",44,"name")="jnl_buffer.alignsize"
+	Set gtmtypes("jnl_buffer",44,"off")=196856
 	Set gtmtypes("jnl_buffer",44,"len")=4
 	Set gtmtypes("jnl_buffer",44,"type")="unsigned-int"
-	Set gtmtypfldindx("jnl_buffer","end_of_data_at_open")=44
-	Set gtmtypes("jnl_buffer",45,"name")="jnl_buffer.fill_cacheline0"
-	Set gtmtypes("jnl_buffer",45,"off")=444
-	Set gtmtypes("jnl_buffer",45,"len")=24
-	Set gtmtypes("jnl_buffer",45,"type")="char"
-	Set gtmtypfldindx("jnl_buffer","fill_cacheline0")=45
-	Set gtmtypes("jnl_buffer",46,"name")="jnl_buffer.io_in_prog_latch"
-	Set gtmtypes("jnl_buffer",46,"off")=468
-	Set gtmtypes("jnl_buffer",46,"len")=8
-	Set gtmtypes("jnl_buffer",46,"type")="global_latch_t"
-	Set gtmtypfldindx("jnl_buffer","io_in_prog_latch")=46
-	Set gtmtypes("jnl_buffer",47,"name")="jnl_buffer.io_in_prog_latch.u"
-	Set gtmtypes("jnl_buffer",47,"off")=468
-	Set gtmtypes("jnl_buffer",47,"len")=8
-	Set gtmtypes("jnl_buffer",47,"type")="union"
-	Set gtmtypfldindx("jnl_buffer","io_in_prog_latch.u")=47
-	Set gtmtypes("jnl_buffer",48,"name")="jnl_buffer.io_in_prog_latch.u.pid_imgcnt"
-	Set gtmtypes("jnl_buffer",48,"off")=468
-	Set gtmtypes("jnl_buffer",48,"len")=8
-	Set gtmtypes("jnl_buffer",48,"type")="uint64_t"
-	Set gtmtypfldindx("jnl_buffer","io_in_prog_latch.u.pid_imgcnt")=48
-	Set gtmtypes("jnl_buffer",49,"name")="jnl_buffer.io_in_prog_latch.u.parts"
-	Set gtmtypes("jnl_buffer",49,"off")=468
-	Set gtmtypes("jnl_buffer",49,"len")=8
-	Set gtmtypes("jnl_buffer",49,"type")="struct"
-	Set gtmtypfldindx("jnl_buffer","io_in_prog_latch.u.parts")=49
-	Set gtmtypes("jnl_buffer",50,"name")="jnl_buffer.io_in_prog_latch.u.parts.latch_pid"
-	Set gtmtypes("jnl_buffer",50,"off")=468
-	Set gtmtypes("jnl_buffer",50,"len")=4
+	Set gtmtypfldindx("jnl_buffer","alignsize")=44
+	Set gtmtypes("jnl_buffer",45,"name")="jnl_buffer.eov_timestamp"
+	Set gtmtypes("jnl_buffer",45,"off")=196860
+	Set gtmtypes("jnl_buffer",45,"len")=4
+	Set gtmtypes("jnl_buffer",45,"type")="unsigned-int"
+	Set gtmtypfldindx("jnl_buffer","eov_timestamp")=45
+	Set gtmtypes("jnl_buffer",46,"name")="jnl_buffer.cycle"
+	Set gtmtypes("jnl_buffer",46,"off")=196864
+	Set gtmtypes("jnl_buffer",46,"len")=4
+	Set gtmtypes("jnl_buffer",46,"type")="unsigned-int"
+	Set gtmtypfldindx("jnl_buffer","cycle")=46
+	Set gtmtypes("jnl_buffer",47,"name")="jnl_buffer.qiocnt"
+	Set gtmtypes("jnl_buffer",47,"off")=196868
+	Set gtmtypes("jnl_buffer",47,"len")=4
+	Set gtmtypes("jnl_buffer",47,"type")="int"
+	Set gtmtypfldindx("jnl_buffer","qiocnt")=47
+	Set gtmtypes("jnl_buffer",48,"name")="jnl_buffer.bytcnt"
+	Set gtmtypes("jnl_buffer",48,"off")=196872
+	Set gtmtypes("jnl_buffer",48,"len")=4
+	Set gtmtypes("jnl_buffer",48,"type")="int"
+	Set gtmtypfldindx("jnl_buffer","bytcnt")=48
+	Set gtmtypes("jnl_buffer",49,"name")="jnl_buffer.errcnt"
+	Set gtmtypes("jnl_buffer",49,"off")=196876
+	Set gtmtypes("jnl_buffer",49,"len")=4
+	Set gtmtypes("jnl_buffer",49,"type")="int"
+	Set gtmtypfldindx("jnl_buffer","errcnt")=49
+	Set gtmtypes("jnl_buffer",50,"name")="jnl_buffer.reccnt"
+	Set gtmtypes("jnl_buffer",50,"off")=196880
+	Set gtmtypes("jnl_buffer",50,"len")=144
 	Set gtmtypes("jnl_buffer",50,"type")="int"
-	Set gtmtypfldindx("jnl_buffer","io_in_prog_latch.u.parts.latch_pid")=50
-	Set gtmtypes("jnl_buffer",51,"name")="jnl_buffer.io_in_prog_latch.u.parts.latch_word"
-	Set gtmtypes("jnl_buffer",51,"off")=472
-	Set gtmtypes("jnl_buffer",51,"len")=4
+	Set gtmtypfldindx("jnl_buffer","reccnt")=50
+	Set gtmtypes("jnl_buffer",50,"dim")=36
+	Set gtmtypes("jnl_buffer",51,"name")="jnl_buffer.filler_align"
+	Set gtmtypes("jnl_buffer",51,"off")=197024
+	Set gtmtypes("jnl_buffer",51,"len")=24
 	Set gtmtypes("jnl_buffer",51,"type")="int"
-	Set gtmtypfldindx("jnl_buffer","io_in_prog_latch.u.parts.latch_word")=51
-	Set gtmtypes("jnl_buffer",52,"name")="jnl_buffer.fill_cacheline1"
-	Set gtmtypes("jnl_buffer",52,"off")=476
-	Set gtmtypes("jnl_buffer",52,"len")=24
-	Set gtmtypes("jnl_buffer",52,"type")="char"
-	Set gtmtypfldindx("jnl_buffer","fill_cacheline1")=52
-	Set gtmtypes("jnl_buffer",53,"name")="jnl_buffer.fsync_in_prog_latch"
-	Set gtmtypes("jnl_buffer",53,"off")=500
-	Set gtmtypes("jnl_buffer",53,"len")=8
-	Set gtmtypes("jnl_buffer",53,"type")="global_latch_t"
-	Set gtmtypfldindx("jnl_buffer","fsync_in_prog_latch")=53
-	Set gtmtypes("jnl_buffer",54,"name")="jnl_buffer.fsync_in_prog_latch.u"
-	Set gtmtypes("jnl_buffer",54,"off")=500
-	Set gtmtypes("jnl_buffer",54,"len")=8
-	Set gtmtypes("jnl_buffer",54,"type")="union"
-	Set gtmtypfldindx("jnl_buffer","fsync_in_prog_latch.u")=54
-	Set gtmtypes("jnl_buffer",55,"name")="jnl_buffer.fsync_in_prog_latch.u.pid_imgcnt"
-	Set gtmtypes("jnl_buffer",55,"off")=500
-	Set gtmtypes("jnl_buffer",55,"len")=8
-	Set gtmtypes("jnl_buffer",55,"type")="uint64_t"
-	Set gtmtypfldindx("jnl_buffer","fsync_in_prog_latch.u.pid_imgcnt")=55
-	Set gtmtypes("jnl_buffer",56,"name")="jnl_buffer.fsync_in_prog_latch.u.parts"
-	Set gtmtypes("jnl_buffer",56,"off")=500
-	Set gtmtypes("jnl_buffer",56,"len")=8
-	Set gtmtypes("jnl_buffer",56,"type")="struct"
-	Set gtmtypfldindx("jnl_buffer","fsync_in_prog_latch.u.parts")=56
-	Set gtmtypes("jnl_buffer",57,"name")="jnl_buffer.fsync_in_prog_latch.u.parts.latch_pid"
-	Set gtmtypes("jnl_buffer",57,"off")=500
+	Set gtmtypfldindx("jnl_buffer","filler_align")=51
+	Set gtmtypes("jnl_buffer",51,"dim")=6
+	Set gtmtypes("jnl_buffer",52,"name")="jnl_buffer.prev_jrec_time"
+	Set gtmtypes("jnl_buffer",52,"off")=197048
+	Set gtmtypes("jnl_buffer",52,"len")=4
+	Set gtmtypes("jnl_buffer",52,"type")="unsigned-int"
+	Set gtmtypfldindx("jnl_buffer","prev_jrec_time")=52
+	Set gtmtypes("jnl_buffer",53,"name")="jnl_buffer.next_epoch_time"
+	Set gtmtypes("jnl_buffer",53,"off")=197052
+	Set gtmtypes("jnl_buffer",53,"len")=4
+	Set gtmtypes("jnl_buffer",53,"type")="unsigned-int"
+	Set gtmtypfldindx("jnl_buffer","next_epoch_time")=53
+	Set gtmtypes("jnl_buffer",54,"name")="jnl_buffer.need_db_fsync"
+	Set gtmtypes("jnl_buffer",54,"off")=197056
+	Set gtmtypes("jnl_buffer",54,"len")=4
+	Set gtmtypes("jnl_buffer",54,"type")="boolean_t"
+	Set gtmtypfldindx("jnl_buffer","need_db_fsync")=54
+	Set gtmtypes("jnl_buffer",55,"name")="jnl_buffer.io_in_prog"
+	Set gtmtypes("jnl_buffer",55,"off")=197060
+	Set gtmtypes("jnl_buffer",55,"len")=4
+	Set gtmtypes("jnl_buffer",55,"type")="int"
+	Set gtmtypfldindx("jnl_buffer","io_in_prog")=55
+	Set gtmtypes("jnl_buffer",56,"name")="jnl_buffer.enospc_errcnt"
+	Set gtmtypes("jnl_buffer",56,"off")=197064
+	Set gtmtypes("jnl_buffer",56,"len")=4
+	Set gtmtypes("jnl_buffer",56,"type")="unsigned-int"
+	Set gtmtypfldindx("jnl_buffer","enospc_errcnt")=56
+	Set gtmtypes("jnl_buffer",57,"name")="jnl_buffer.max_jrec_len"
+	Set gtmtypes("jnl_buffer",57,"off")=197068
 	Set gtmtypes("jnl_buffer",57,"len")=4
-	Set gtmtypes("jnl_buffer",57,"type")="int"
-	Set gtmtypfldindx("jnl_buffer","fsync_in_prog_latch.u.parts.latch_pid")=57
-	Set gtmtypes("jnl_buffer",58,"name")="jnl_buffer.fsync_in_prog_latch.u.parts.latch_word"
-	Set gtmtypes("jnl_buffer",58,"off")=504
+	Set gtmtypes("jnl_buffer",57,"type")="unsigned-int"
+	Set gtmtypfldindx("jnl_buffer","max_jrec_len")=57
+	Set gtmtypes("jnl_buffer",58,"name")="jnl_buffer.fs_block_size"
+	Set gtmtypes("jnl_buffer",58,"off")=197072
 	Set gtmtypes("jnl_buffer",58,"len")=4
-	Set gtmtypes("jnl_buffer",58,"type")="int"
-	Set gtmtypfldindx("jnl_buffer","fsync_in_prog_latch.u.parts.latch_word")=58
-	Set gtmtypes("jnl_buffer",59,"name")="jnl_buffer.fill_cacheline2"
-	Set gtmtypes("jnl_buffer",59,"off")=508
-	Set gtmtypes("jnl_buffer",59,"len")=24
-	Set gtmtypes("jnl_buffer",59,"type")="char"
-	Set gtmtypfldindx("jnl_buffer","fill_cacheline2")=59
-	Set gtmtypes("jnl_buffer",60,"name")="jnl_buffer.buff"
-	Set gtmtypes("jnl_buffer",60,"off")=532
-	Set gtmtypes("jnl_buffer",60,"len")=1
-	Set gtmtypes("jnl_buffer",60,"type")="unsigned-char"
-	Set gtmtypfldindx("jnl_buffer","buff")=60
+	Set gtmtypes("jnl_buffer",58,"type")="unsigned-int"
+	Set gtmtypfldindx("jnl_buffer","fs_block_size")=58
+	Set gtmtypes("jnl_buffer",59,"name")="jnl_buffer.post_epoch_freeaddr"
+	Set gtmtypes("jnl_buffer",59,"off")=197076
+	Set gtmtypes("jnl_buffer",59,"len")=4
+	Set gtmtypes("jnl_buffer",59,"type")="unsigned-int"
+	Set gtmtypfldindx("jnl_buffer","post_epoch_freeaddr")=59
+	Set gtmtypes("jnl_buffer",60,"name")="jnl_buffer.last_eof_written"
+	Set gtmtypes("jnl_buffer",60,"off")=197080
+	Set gtmtypes("jnl_buffer",60,"len")=4
+	Set gtmtypes("jnl_buffer",60,"type")="boolean_t"
+	Set gtmtypfldindx("jnl_buffer","last_eof_written")=60
+	Set gtmtypes("jnl_buffer",61,"name")="jnl_buffer.end_of_data_at_open"
+	Set gtmtypes("jnl_buffer",61,"off")=197084
+	Set gtmtypes("jnl_buffer",61,"len")=4
+	Set gtmtypes("jnl_buffer",61,"type")="unsigned-int"
+	Set gtmtypfldindx("jnl_buffer","end_of_data_at_open")=61
+	Set gtmtypes("jnl_buffer",62,"name")="jnl_buffer.re_read_dskaddr"
+	Set gtmtypes("jnl_buffer",62,"off")=197088
+	Set gtmtypes("jnl_buffer",62,"len")=4
+	Set gtmtypes("jnl_buffer",62,"type")="unsigned-int"
+	Set gtmtypfldindx("jnl_buffer","re_read_dskaddr")=62
+	Set gtmtypes("jnl_buffer",63,"name")="jnl_buffer.fill_cacheline0"
+	Set gtmtypes("jnl_buffer",63,"off")=197092
+	Set gtmtypes("jnl_buffer",63,"len")=24
+	Set gtmtypes("jnl_buffer",63,"type")="char"
+	Set gtmtypfldindx("jnl_buffer","fill_cacheline0")=63
+	Set gtmtypes("jnl_buffer",64,"name")="jnl_buffer.io_in_prog_latch"
+	Set gtmtypes("jnl_buffer",64,"off")=197116
+	Set gtmtypes("jnl_buffer",64,"len")=8
+	Set gtmtypes("jnl_buffer",64,"type")="global_latch_t"
+	Set gtmtypfldindx("jnl_buffer","io_in_prog_latch")=64
+	Set gtmtypes("jnl_buffer",65,"name")="jnl_buffer.io_in_prog_latch.u"
+	Set gtmtypes("jnl_buffer",65,"off")=197116
+	Set gtmtypes("jnl_buffer",65,"len")=8
+	Set gtmtypes("jnl_buffer",65,"type")="union"
+	Set gtmtypfldindx("jnl_buffer","io_in_prog_latch.u")=65
+	Set gtmtypes("jnl_buffer",66,"name")="jnl_buffer.io_in_prog_latch.u.pid_imgcnt"
+	Set gtmtypes("jnl_buffer",66,"off")=197116
+	Set gtmtypes("jnl_buffer",66,"len")=8
+	Set gtmtypes("jnl_buffer",66,"type")="uint64_t"
+	Set gtmtypfldindx("jnl_buffer","io_in_prog_latch.u.pid_imgcnt")=66
+	Set gtmtypes("jnl_buffer",67,"name")="jnl_buffer.io_in_prog_latch.u.parts"
+	Set gtmtypes("jnl_buffer",67,"off")=197116
+	Set gtmtypes("jnl_buffer",67,"len")=8
+	Set gtmtypes("jnl_buffer",67,"type")="struct"
+	Set gtmtypfldindx("jnl_buffer","io_in_prog_latch.u.parts")=67
+	Set gtmtypes("jnl_buffer",68,"name")="jnl_buffer.io_in_prog_latch.u.parts.latch_pid"
+	Set gtmtypes("jnl_buffer",68,"off")=197116
+	Set gtmtypes("jnl_buffer",68,"len")=4
+	Set gtmtypes("jnl_buffer",68,"type")="int"
+	Set gtmtypfldindx("jnl_buffer","io_in_prog_latch.u.parts.latch_pid")=68
+	Set gtmtypes("jnl_buffer",69,"name")="jnl_buffer.io_in_prog_latch.u.parts.latch_word"
+	Set gtmtypes("jnl_buffer",69,"off")=197120
+	Set gtmtypes("jnl_buffer",69,"len")=4
+	Set gtmtypes("jnl_buffer",69,"type")="int"
+	Set gtmtypfldindx("jnl_buffer","io_in_prog_latch.u.parts.latch_word")=69
+	Set gtmtypes("jnl_buffer",70,"name")="jnl_buffer.fill_cacheline1"
+	Set gtmtypes("jnl_buffer",70,"off")=197124
+	Set gtmtypes("jnl_buffer",70,"len")=24
+	Set gtmtypes("jnl_buffer",70,"type")="char"
+	Set gtmtypfldindx("jnl_buffer","fill_cacheline1")=70
+	Set gtmtypes("jnl_buffer",71,"name")="jnl_buffer.fsync_in_prog_latch"
+	Set gtmtypes("jnl_buffer",71,"off")=197148
+	Set gtmtypes("jnl_buffer",71,"len")=8
+	Set gtmtypes("jnl_buffer",71,"type")="global_latch_t"
+	Set gtmtypfldindx("jnl_buffer","fsync_in_prog_latch")=71
+	Set gtmtypes("jnl_buffer",72,"name")="jnl_buffer.fsync_in_prog_latch.u"
+	Set gtmtypes("jnl_buffer",72,"off")=197148
+	Set gtmtypes("jnl_buffer",72,"len")=8
+	Set gtmtypes("jnl_buffer",72,"type")="union"
+	Set gtmtypfldindx("jnl_buffer","fsync_in_prog_latch.u")=72
+	Set gtmtypes("jnl_buffer",73,"name")="jnl_buffer.fsync_in_prog_latch.u.pid_imgcnt"
+	Set gtmtypes("jnl_buffer",73,"off")=197148
+	Set gtmtypes("jnl_buffer",73,"len")=8
+	Set gtmtypes("jnl_buffer",73,"type")="uint64_t"
+	Set gtmtypfldindx("jnl_buffer","fsync_in_prog_latch.u.pid_imgcnt")=73
+	Set gtmtypes("jnl_buffer",74,"name")="jnl_buffer.fsync_in_prog_latch.u.parts"
+	Set gtmtypes("jnl_buffer",74,"off")=197148
+	Set gtmtypes("jnl_buffer",74,"len")=8
+	Set gtmtypes("jnl_buffer",74,"type")="struct"
+	Set gtmtypfldindx("jnl_buffer","fsync_in_prog_latch.u.parts")=74
+	Set gtmtypes("jnl_buffer",75,"name")="jnl_buffer.fsync_in_prog_latch.u.parts.latch_pid"
+	Set gtmtypes("jnl_buffer",75,"off")=197148
+	Set gtmtypes("jnl_buffer",75,"len")=4
+	Set gtmtypes("jnl_buffer",75,"type")="int"
+	Set gtmtypfldindx("jnl_buffer","fsync_in_prog_latch.u.parts.latch_pid")=75
+	Set gtmtypes("jnl_buffer",76,"name")="jnl_buffer.fsync_in_prog_latch.u.parts.latch_word"
+	Set gtmtypes("jnl_buffer",76,"off")=197152
+	Set gtmtypes("jnl_buffer",76,"len")=4
+	Set gtmtypes("jnl_buffer",76,"type")="int"
+	Set gtmtypfldindx("jnl_buffer","fsync_in_prog_latch.u.parts.latch_word")=76
+	Set gtmtypes("jnl_buffer",77,"name")="jnl_buffer.fill_cacheline2"
+	Set gtmtypes("jnl_buffer",77,"off")=197156
+	Set gtmtypes("jnl_buffer",77,"len")=24
+	Set gtmtypes("jnl_buffer",77,"type")="char"
+	Set gtmtypfldindx("jnl_buffer","fill_cacheline2")=77
+	Set gtmtypes("jnl_buffer",78,"name")="jnl_buffer.phase2_commit_latch"
+	Set gtmtypes("jnl_buffer",78,"off")=197180
+	Set gtmtypes("jnl_buffer",78,"len")=8
+	Set gtmtypes("jnl_buffer",78,"type")="global_latch_t"
+	Set gtmtypfldindx("jnl_buffer","phase2_commit_latch")=78
+	Set gtmtypes("jnl_buffer",79,"name")="jnl_buffer.phase2_commit_latch.u"
+	Set gtmtypes("jnl_buffer",79,"off")=197180
+	Set gtmtypes("jnl_buffer",79,"len")=8
+	Set gtmtypes("jnl_buffer",79,"type")="union"
+	Set gtmtypfldindx("jnl_buffer","phase2_commit_latch.u")=79
+	Set gtmtypes("jnl_buffer",80,"name")="jnl_buffer.phase2_commit_latch.u.pid_imgcnt"
+	Set gtmtypes("jnl_buffer",80,"off")=197180
+	Set gtmtypes("jnl_buffer",80,"len")=8
+	Set gtmtypes("jnl_buffer",80,"type")="uint64_t"
+	Set gtmtypfldindx("jnl_buffer","phase2_commit_latch.u.pid_imgcnt")=80
+	Set gtmtypes("jnl_buffer",81,"name")="jnl_buffer.phase2_commit_latch.u.parts"
+	Set gtmtypes("jnl_buffer",81,"off")=197180
+	Set gtmtypes("jnl_buffer",81,"len")=8
+	Set gtmtypes("jnl_buffer",81,"type")="struct"
+	Set gtmtypfldindx("jnl_buffer","phase2_commit_latch.u.parts")=81
+	Set gtmtypes("jnl_buffer",82,"name")="jnl_buffer.phase2_commit_latch.u.parts.latch_pid"
+	Set gtmtypes("jnl_buffer",82,"off")=197180
+	Set gtmtypes("jnl_buffer",82,"len")=4
+	Set gtmtypes("jnl_buffer",82,"type")="int"
+	Set gtmtypfldindx("jnl_buffer","phase2_commit_latch.u.parts.latch_pid")=82
+	Set gtmtypes("jnl_buffer",83,"name")="jnl_buffer.phase2_commit_latch.u.parts.latch_word"
+	Set gtmtypes("jnl_buffer",83,"off")=197184
+	Set gtmtypes("jnl_buffer",83,"len")=4
+	Set gtmtypes("jnl_buffer",83,"type")="int"
+	Set gtmtypfldindx("jnl_buffer","phase2_commit_latch.u.parts.latch_word")=83
+	Set gtmtypes("jnl_buffer",84,"name")="jnl_buffer.fill_cacheline3"
+	Set gtmtypes("jnl_buffer",84,"off")=197188
+	Set gtmtypes("jnl_buffer",84,"len")=24
+	Set gtmtypes("jnl_buffer",84,"type")="char"
+	Set gtmtypfldindx("jnl_buffer","fill_cacheline3")=84
+	Set gtmtypes("jnl_buffer",85,"name")="jnl_buffer.buff"
+	Set gtmtypes("jnl_buffer",85,"off")=197212
+	Set gtmtypes("jnl_buffer",85,"len")=1
+	Set gtmtypes("jnl_buffer",85,"type")="unsigned-char"
+	Set gtmtypfldindx("jnl_buffer","buff")=85
 	;
 	Set gtmtypes("jnl_create_info")="struct"
 	Set gtmtypes("jnl_create_info",0)=35
@@ -10407,8 +10627,8 @@ Init
 	Set gtmtypfldindx("jnl_ctl_list","turn_around_fullyupgraded")=47
 	;
 	Set gtmtypes("jnl_fence_control")="struct"
-	Set gtmtypes("jnl_fence_control",0)=4
-	Set gtmtypes("jnl_fence_control","len")=24
+	Set gtmtypes("jnl_fence_control",0)=5
+	Set gtmtypes("jnl_fence_control","len")=28
 	Set gtmtypes("jnl_fence_control",1,"name")="jnl_fence_control.fence_list"
 	Set gtmtypes("jnl_fence_control",1,"off")=0
 	Set gtmtypes("jnl_fence_control",1,"len")=4
@@ -10419,16 +10639,21 @@ Init
 	Set gtmtypes("jnl_fence_control",2,"len")=4
 	Set gtmtypes("jnl_fence_control",2,"type")="int"
 	Set gtmtypfldindx("jnl_fence_control","level")=2
-	Set gtmtypes("jnl_fence_control",3,"name")="jnl_fence_control.token"
+	Set gtmtypes("jnl_fence_control",3,"name")="jnl_fence_control.replication"
 	Set gtmtypes("jnl_fence_control",3,"off")=8
-	Set gtmtypes("jnl_fence_control",3,"len")=8
-	Set gtmtypes("jnl_fence_control",3,"type")="uint64_t"
-	Set gtmtypfldindx("jnl_fence_control","token")=3
-	Set gtmtypes("jnl_fence_control",4,"name")="jnl_fence_control.strm_seqno"
-	Set gtmtypes("jnl_fence_control",4,"off")=16
+	Set gtmtypes("jnl_fence_control",3,"len")=4
+	Set gtmtypes("jnl_fence_control",3,"type")="boolean_t"
+	Set gtmtypfldindx("jnl_fence_control","replication")=3
+	Set gtmtypes("jnl_fence_control",4,"name")="jnl_fence_control.token"
+	Set gtmtypes("jnl_fence_control",4,"off")=12
 	Set gtmtypes("jnl_fence_control",4,"len")=8
 	Set gtmtypes("jnl_fence_control",4,"type")="uint64_t"
-	Set gtmtypfldindx("jnl_fence_control","strm_seqno")=4
+	Set gtmtypfldindx("jnl_fence_control","token")=4
+	Set gtmtypes("jnl_fence_control",5,"name")="jnl_fence_control.strm_seqno"
+	Set gtmtypes("jnl_fence_control",5,"off")=20
+	Set gtmtypes("jnl_fence_control",5,"len")=8
+	Set gtmtypes("jnl_fence_control",5,"type")="uint64_t"
+	Set gtmtypfldindx("jnl_fence_control","strm_seqno")=5
 	;
 	Set gtmtypes("jnl_file_header")="struct"
 	Set gtmtypes("jnl_file_header",0)=67
@@ -10985,8 +11210,8 @@ Init
 	Set gtmtypfldindx("jnl_gbls_t","mur_update")=27
 	;
 	Set gtmtypes("jnl_private_control")="struct"
-	Set gtmtypes("jnl_private_control",0)=24
-	Set gtmtypes("jnl_private_control","len")=104
+	Set gtmtypes("jnl_private_control",0)=22
+	Set gtmtypes("jnl_private_control","len")=96
 	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
@@ -11027,86 +11252,76 @@ Init
 	Set gtmtypes("jnl_private_control",8,"len")=4
 	Set gtmtypes("jnl_private_control",8,"type")="unsigned-int"
 	Set gtmtypfldindx("jnl_private_control","fileid.st_gen")=8
-	Set gtmtypes("jnl_private_control",9,"name")="jnl_private_control.jnllsb"
+	Set gtmtypes("jnl_private_control",9,"name")="jnl_private_control.pini_addr"
 	Set gtmtypes("jnl_private_control",9,"off")=36
 	Set gtmtypes("jnl_private_control",9,"len")=4
-	Set gtmtypes("jnl_private_control",9,"type")="addr"
-	Set gtmtypfldindx("jnl_private_control","jnllsb")=9
-	Set gtmtypes("jnl_private_control",10,"name")="jnl_private_control.pini_addr"
+	Set gtmtypes("jnl_private_control",9,"type")="unsigned-int"
+	Set gtmtypfldindx("jnl_private_control","pini_addr")=9
+	Set gtmtypes("jnl_private_control",10,"name")="jnl_private_control.new_freeaddr"
 	Set gtmtypes("jnl_private_control",10,"off")=40
 	Set gtmtypes("jnl_private_control",10,"len")=4
 	Set gtmtypes("jnl_private_control",10,"type")="unsigned-int"
-	Set gtmtypfldindx("jnl_private_control","pini_addr")=10
-	Set gtmtypes("jnl_private_control",11,"name")="jnl_private_control.new_freeaddr"
+	Set gtmtypfldindx("jnl_private_control","new_freeaddr")=10
+	Set gtmtypes("jnl_private_control",11,"name")="jnl_private_control.phase2_freeaddr"
 	Set gtmtypes("jnl_private_control",11,"off")=44
 	Set gtmtypes("jnl_private_control",11,"len")=4
 	Set gtmtypes("jnl_private_control",11,"type")="unsigned-int"
-	Set gtmtypfldindx("jnl_private_control","new_freeaddr")=11
-	Set gtmtypes("jnl_private_control",12,"name")="jnl_private_control.temp_free"
+	Set gtmtypfldindx("jnl_private_control","phase2_freeaddr")=11
+	Set gtmtypes("jnl_private_control",12,"name")="jnl_private_control.phase2_free"
 	Set gtmtypes("jnl_private_control",12,"off")=48
 	Set gtmtypes("jnl_private_control",12,"len")=4
-	Set gtmtypes("jnl_private_control",12,"type")="int"
-	Set gtmtypfldindx("jnl_private_control","temp_free")=12
-	Set gtmtypes("jnl_private_control",13,"name")="jnl_private_control.filler_q0"
+	Set gtmtypes("jnl_private_control",12,"type")="unsigned-int"
+	Set gtmtypfldindx("jnl_private_control","phase2_free")=12
+	Set gtmtypes("jnl_private_control",13,"name")="jnl_private_control.in_jnl_phase2_salvage"
 	Set gtmtypes("jnl_private_control",13,"off")=52
-	Set gtmtypes("jnl_private_control",13,"len")=8
-	Set gtmtypes("jnl_private_control",13,"type")="double"
-	Set gtmtypfldindx("jnl_private_control","filler_q0")=13
-	Set gtmtypes("jnl_private_control",14,"name")="jnl_private_control.new_dsk"
-	Set gtmtypes("jnl_private_control",14,"off")=60
+	Set gtmtypes("jnl_private_control",13,"len")=4
+	Set gtmtypes("jnl_private_control",13,"type")="boolean_t"
+	Set gtmtypfldindx("jnl_private_control","in_jnl_phase2_salvage")=13
+	Set gtmtypes("jnl_private_control",14,"name")="jnl_private_control.status"
+	Set gtmtypes("jnl_private_control",14,"off")=56
 	Set gtmtypes("jnl_private_control",14,"len")=4
 	Set gtmtypes("jnl_private_control",14,"type")="int"
-	Set gtmtypfldindx("jnl_private_control","new_dsk")=14
-	Set gtmtypes("jnl_private_control",15,"name")="jnl_private_control.new_dskaddr"
-	Set gtmtypes("jnl_private_control",15,"off")=64
+	Set gtmtypfldindx("jnl_private_control","status")=14
+	Set gtmtypes("jnl_private_control",15,"name")="jnl_private_control.qio_active"
+	Set gtmtypes("jnl_private_control",15,"off")=60
 	Set gtmtypes("jnl_private_control",15,"len")=4
-	Set gtmtypes("jnl_private_control",15,"type")="unsigned-int"
-	Set gtmtypfldindx("jnl_private_control","new_dskaddr")=15
-	Set gtmtypes("jnl_private_control",16,"name")="jnl_private_control.status"
-	Set gtmtypes("jnl_private_control",16,"off")=68
+	Set gtmtypes("jnl_private_control",15,"type")="boolean_t"
+	Set gtmtypfldindx("jnl_private_control","qio_active")=15
+	Set gtmtypes("jnl_private_control",16,"name")="jnl_private_control.fd_mismatch"
+	Set gtmtypes("jnl_private_control",16,"off")=64
 	Set gtmtypes("jnl_private_control",16,"len")=4
-	Set gtmtypes("jnl_private_control",16,"type")="int"
-	Set gtmtypfldindx("jnl_private_control","status")=16
-	Set gtmtypes("jnl_private_control",17,"name")="jnl_private_control.dsk_update_inprog"
-	Set gtmtypes("jnl_private_control",17,"off")=72
+	Set gtmtypes("jnl_private_control",16,"type")="boolean_t"
+	Set gtmtypfldindx("jnl_private_control","fd_mismatch")=16
+	Set gtmtypes("jnl_private_control",17,"name")="jnl_private_control.sync_io"
+	Set gtmtypes("jnl_private_control",17,"off")=68
 	Set gtmtypes("jnl_private_control",17,"len")=4
 	Set gtmtypes("jnl_private_control",17,"type")="boolean_t"
-	Set gtmtypfldindx("jnl_private_control","dsk_update_inprog")=17
-	Set gtmtypes("jnl_private_control",18,"name")="jnl_private_control.qio_active"
-	Set gtmtypes("jnl_private_control",18,"off")=76
+	Set gtmtypfldindx("jnl_private_control","sync_io")=17
+	Set gtmtypes("jnl_private_control",18,"name")="jnl_private_control.error_reported"
+	Set gtmtypes("jnl_private_control",18,"off")=72
 	Set gtmtypes("jnl_private_control",18,"len")=4
 	Set gtmtypes("jnl_private_control",18,"type")="boolean_t"
-	Set gtmtypfldindx("jnl_private_control","qio_active")=18
-	Set gtmtypes("jnl_private_control",19,"name")="jnl_private_control.fd_mismatch"
-	Set gtmtypes("jnl_private_control",19,"off")=80
+	Set gtmtypfldindx("jnl_private_control","error_reported")=18
+	Set gtmtypes("jnl_private_control",19,"name")="jnl_private_control.status2"
+	Set gtmtypes("jnl_private_control",19,"off")=76
 	Set gtmtypes("jnl_private_control",19,"len")=4
-	Set gtmtypes("jnl_private_control",19,"type")="boolean_t"
-	Set gtmtypfldindx("jnl_private_control","fd_mismatch")=19
-	Set gtmtypes("jnl_private_control",20,"name")="jnl_private_control.sync_io"
-	Set gtmtypes("jnl_private_control",20,"off")=84
+	Set gtmtypes("jnl_private_control",19,"type")="unsigned-int"
+	Set gtmtypfldindx("jnl_private_control","status2")=19
+	Set gtmtypes("jnl_private_control",20,"name")="jnl_private_control.cycle"
+	Set gtmtypes("jnl_private_control",20,"off")=80
 	Set gtmtypes("jnl_private_control",20,"len")=4
-	Set gtmtypes("jnl_private_control",20,"type")="boolean_t"
-	Set gtmtypfldindx("jnl_private_control","sync_io")=20
-	Set gtmtypes("jnl_private_control",21,"name")="jnl_private_control.error_reported"
-	Set gtmtypes("jnl_private_control",21,"off")=88
+	Set gtmtypes("jnl_private_control",20,"type")="unsigned-int"
+	Set gtmtypfldindx("jnl_private_control","cycle")=20
+	Set gtmtypes("jnl_private_control",21,"name")="jnl_private_control.err_str"
+	Set gtmtypes("jnl_private_control",21,"off")=84
 	Set gtmtypes("jnl_private_control",21,"len")=4
-	Set gtmtypes("jnl_private_control",21,"type")="boolean_t"
-	Set gtmtypfldindx("jnl_private_control","error_reported")=21
-	Set gtmtypes("jnl_private_control",22,"name")="jnl_private_control.status2"
-	Set gtmtypes("jnl_private_control",22,"off")=92
-	Set gtmtypes("jnl_private_control",22,"len")=4
-	Set gtmtypes("jnl_private_control",22,"type")="unsigned-int"
-	Set gtmtypfldindx("jnl_private_control","status2")=22
-	Set gtmtypes("jnl_private_control",23,"name")="jnl_private_control.cycle"
-	Set gtmtypes("jnl_private_control",23,"off")=96
-	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_private_control",21,"type")="addr"
+	Set gtmtypfldindx("jnl_private_control","err_str")=21
+	Set gtmtypes("jnl_private_control",22,"name")="jnl_private_control.curr_tn"
+	Set gtmtypes("jnl_private_control",22,"off")=88
+	Set gtmtypes("jnl_private_control",22,"len")=8
+	Set gtmtypes("jnl_private_control",22,"type")="uint64_t"
+	Set gtmtypfldindx("jnl_private_control","curr_tn")=22
 	;
 	Set gtmtypes("jnl_process_vector")="struct"
 	Set gtmtypes("jnl_process_vector",0)=10
@@ -11382,19 +11597,19 @@ Init
 	Set gtmtypfldindx("jnl_record","jrec_aimg.blk_contents")=43
 	Set gtmtypes("jnl_record",44,"name")="jnl_record.jrec_align"
 	Set gtmtypes("jnl_record",44,"off")=0
-	Set gtmtypes("jnl_record",44,"len")=32
+	Set gtmtypes("jnl_record",44,"len")=12
 	Set gtmtypes("jnl_record",44,"type")="struct_jrec_align"
 	Set gtmtypfldindx("jnl_record","jrec_align")=44
-	Set gtmtypes("jnl_record",45,"name")="jnl_record.jrec_align.prefix"
-	Set gtmtypes("jnl_record",45,"off")=0
-	Set gtmtypes("jnl_record",45,"len")=24
-	Set gtmtypes("jnl_record",45,"type")="jrec_prefix"
-	Set gtmtypfldindx("jnl_record","jrec_align.prefix")=45
-	Set gtmtypes("jnl_record",46,"name")="jnl_record.jrec_align.align_str"
-	Set gtmtypes("jnl_record",46,"off")=24
-	Set gtmtypes("jnl_record",46,"len")=8
-	Set gtmtypes("jnl_record",46,"type")="jnl_string"
-	Set gtmtypfldindx("jnl_record","jrec_align.align_str")=46
+	Set gtmtypes("jnl_record",45,"name")="jnl_record.jrec_align.checksum"
+	Set gtmtypes("jnl_record",45,"off")=4
+	Set gtmtypes("jnl_record",45,"len")=4
+	Set gtmtypes("jnl_record",45,"type")="unsigned-int"
+	Set gtmtypfldindx("jnl_record","jrec_align.checksum")=45
+	Set gtmtypes("jnl_record",46,"name")="jnl_record.jrec_align.time"
+	Set gtmtypes("jnl_record",46,"off")=8
+	Set gtmtypes("jnl_record",46,"len")=4
+	Set gtmtypes("jnl_record",46,"type")="unsigned-int"
+	Set gtmtypfldindx("jnl_record","jrec_align.time")=46
 	Set gtmtypes("jnl_record",47,"name")="jnl_record.jrec_tcom"
 	Set gtmtypes("jnl_record",47,"off")=0
 	Set gtmtypes("jnl_record",47,"len")=56
@@ -11731,8 +11946,8 @@ Init
 	Set gtmtypfldindx("jnlext_multi_t","size")=7
 	;
 	Set gtmtypes("jnlpool_addrs")="struct"
-	Set gtmtypes("jnlpool_addrs",0)=7
-	Set gtmtypes("jnlpool_addrs","len")=28
+	Set gtmtypes("jnlpool_addrs",0)=16
+	Set gtmtypes("jnlpool_addrs","len")=68
 	Set gtmtypes("jnlpool_addrs",1,"name")="jnlpool_addrs.jnlpool_ctl"
 	Set gtmtypes("jnlpool_addrs",1,"off")=0
 	Set gtmtypes("jnlpool_addrs",1,"len")=4
@@ -11768,10 +11983,55 @@ Init
 	Set gtmtypes("jnlpool_addrs",7,"len")=4
 	Set gtmtypes("jnlpool_addrs",7,"type")="addr"
 	Set gtmtypfldindx("jnlpool_addrs","jnldata_base")=7
+	Set gtmtypes("jnlpool_addrs",8,"name")="jnlpool_addrs.jrs"
+	Set gtmtypes("jnlpool_addrs",8,"off")=28
+	Set gtmtypes("jnlpool_addrs",8,"len")=40
+	Set gtmtypes("jnlpool_addrs",8,"type")="jpl_rsrv_struct_t"
+	Set gtmtypfldindx("jnlpool_addrs","jrs")=8
+	Set gtmtypes("jnlpool_addrs",9,"name")="jnlpool_addrs.jrs.start_write_addr"
+	Set gtmtypes("jnlpool_addrs",9,"off")=28
+	Set gtmtypes("jnlpool_addrs",9,"len")=8
+	Set gtmtypes("jnlpool_addrs",9,"type")="uint64_t"
+	Set gtmtypfldindx("jnlpool_addrs","jrs.start_write_addr")=9
+	Set gtmtypes("jnlpool_addrs",10,"name")="jnlpool_addrs.jrs.cur_write_addr"
+	Set gtmtypes("jnlpool_addrs",10,"off")=36
+	Set gtmtypes("jnlpool_addrs",10,"len")=8
+	Set gtmtypes("jnlpool_addrs",10,"type")="uint64_t"
+	Set gtmtypfldindx("jnlpool_addrs","jrs.cur_write_addr")=10
+	Set gtmtypes("jnlpool_addrs",11,"name")="jnlpool_addrs.jrs.tot_jrec_len"
+	Set gtmtypes("jnlpool_addrs",11,"off")=44
+	Set gtmtypes("jnlpool_addrs",11,"len")=4
+	Set gtmtypes("jnlpool_addrs",11,"type")="unsigned-int"
+	Set gtmtypfldindx("jnlpool_addrs","jrs.tot_jrec_len")=11
+	Set gtmtypes("jnlpool_addrs",12,"name")="jnlpool_addrs.jrs.write_total"
+	Set gtmtypes("jnlpool_addrs",12,"off")=48
+	Set gtmtypes("jnlpool_addrs",12,"len")=4
+	Set gtmtypes("jnlpool_addrs",12,"type")="unsigned-int"
+	Set gtmtypfldindx("jnlpool_addrs","jrs.write_total")=12
+	Set gtmtypes("jnlpool_addrs",13,"name")="jnlpool_addrs.jrs.memcpy_skipped"
+	Set gtmtypes("jnlpool_addrs",13,"off")=52
+	Set gtmtypes("jnlpool_addrs",13,"len")=4
+	Set gtmtypes("jnlpool_addrs",13,"type")="boolean_t"
+	Set gtmtypfldindx("jnlpool_addrs","jrs.memcpy_skipped")=13
+	Set gtmtypes("jnlpool_addrs",14,"name")="jnlpool_addrs.jrs.phase2_commit_index"
+	Set gtmtypes("jnlpool_addrs",14,"off")=56
+	Set gtmtypes("jnlpool_addrs",14,"len")=4
+	Set gtmtypes("jnlpool_addrs",14,"type")="unsigned-int"
+	Set gtmtypfldindx("jnlpool_addrs","jrs.phase2_commit_index")=14
+	Set gtmtypes("jnlpool_addrs",15,"name")="jnlpool_addrs.jrs.num_tcoms"
+	Set gtmtypes("jnlpool_addrs",15,"off")=60
+	Set gtmtypes("jnlpool_addrs",15,"len")=4
+	Set gtmtypes("jnlpool_addrs",15,"type")="unsigned-int"
+	Set gtmtypfldindx("jnlpool_addrs","jrs.num_tcoms")=15
+	Set gtmtypes("jnlpool_addrs",16,"name")="jnlpool_addrs.jrs.filler_8byte_align"
+	Set gtmtypes("jnlpool_addrs",16,"off")=64
+	Set gtmtypes("jnlpool_addrs",16,"len")=4
+	Set gtmtypes("jnlpool_addrs",16,"type")="char"
+	Set gtmtypfldindx("jnlpool_addrs","jrs.filler_8byte_align")=16
 	;
 	Set gtmtypes("jnlpool_ctl_struct")="struct"
-	Set gtmtypes("jnlpool_ctl_struct",0)=48
-	Set gtmtypes("jnlpool_ctl_struct","len")=3712
+	Set gtmtypes("jnlpool_ctl_struct",0)=72
+	Set gtmtypes("jnlpool_ctl_struct","len")=659152
 	Set gtmtypes("jnlpool_ctl_struct",1,"name")="jnlpool_ctl_struct.jnlpool_id"
 	Set gtmtypes("jnlpool_ctl_struct",1,"off")=0
 	Set gtmtypes("jnlpool_ctl_struct",1,"len")=312
@@ -11852,181 +12112,288 @@ Init
 	Set gtmtypes("jnlpool_ctl_struct",16,"len")=8
 	Set gtmtypes("jnlpool_ctl_struct",16,"type")="uint64_t"
 	Set gtmtypfldindx("jnlpool_ctl_struct","max_zqgblmod_seqno")=16
-	Set gtmtypes("jnlpool_ctl_struct",17,"name")="jnlpool_ctl_struct.early_write_addr"
+	Set gtmtypes("jnlpool_ctl_struct",17,"name")="jnlpool_ctl_struct.strm_seqno"
 	Set gtmtypes("jnlpool_ctl_struct",17,"off")=368
-	Set gtmtypes("jnlpool_ctl_struct",17,"len")=8
+	Set gtmtypes("jnlpool_ctl_struct",17,"len")=128
 	Set gtmtypes("jnlpool_ctl_struct",17,"type")="uint64_t"
-	Set gtmtypfldindx("jnlpool_ctl_struct","early_write_addr")=17
-	Set gtmtypes("jnlpool_ctl_struct",18,"name")="jnlpool_ctl_struct.write_addr"
-	Set gtmtypes("jnlpool_ctl_struct",18,"off")=376
-	Set gtmtypes("jnlpool_ctl_struct",18,"len")=8
-	Set gtmtypes("jnlpool_ctl_struct",18,"type")="uint64_t"
-	Set gtmtypfldindx("jnlpool_ctl_struct","write_addr")=18
-	Set gtmtypes("jnlpool_ctl_struct",19,"name")="jnlpool_ctl_struct.write"
-	Set gtmtypes("jnlpool_ctl_struct",19,"off")=384
+	Set gtmtypfldindx("jnlpool_ctl_struct","strm_seqno")=17
+	Set gtmtypes("jnlpool_ctl_struct",17,"dim")=16
+	Set gtmtypes("jnlpool_ctl_struct",18,"name")="jnlpool_ctl_struct.this_side"
+	Set gtmtypes("jnlpool_ctl_struct",18,"off")=496
+	Set gtmtypes("jnlpool_ctl_struct",18,"len")=48
+	Set gtmtypes("jnlpool_ctl_struct",18,"type")="repl_conn_info_t"
+	Set gtmtypfldindx("jnlpool_ctl_struct","this_side")=18
+	Set gtmtypes("jnlpool_ctl_struct",19,"name")="jnlpool_ctl_struct.this_side.proto_ver"
+	Set gtmtypes("jnlpool_ctl_struct",19,"off")=496
 	Set gtmtypes("jnlpool_ctl_struct",19,"len")=4
-	Set gtmtypes("jnlpool_ctl_struct",19,"type")="unsigned-int"
-	Set gtmtypfldindx("jnlpool_ctl_struct","write")=19
-	Set gtmtypes("jnlpool_ctl_struct",20,"name")="jnlpool_ctl_struct.upd_disabled"
-	Set gtmtypes("jnlpool_ctl_struct",20,"off")=388
+	Set gtmtypes("jnlpool_ctl_struct",19,"type")="int"
+	Set gtmtypfldindx("jnlpool_ctl_struct","this_side.proto_ver")=19
+	Set gtmtypes("jnlpool_ctl_struct",20,"name")="jnlpool_ctl_struct.this_side.jnl_ver"
+	Set gtmtypes("jnlpool_ctl_struct",20,"off")=500
 	Set gtmtypes("jnlpool_ctl_struct",20,"len")=4
-	Set gtmtypes("jnlpool_ctl_struct",20,"type")="boolean_t"
-	Set gtmtypfldindx("jnlpool_ctl_struct","upd_disabled")=20
-	Set gtmtypes("jnlpool_ctl_struct",21,"name")="jnlpool_ctl_struct.lastwrite_len"
-	Set gtmtypes("jnlpool_ctl_struct",21,"off")=392
+	Set gtmtypes("jnlpool_ctl_struct",20,"type")="unsigned-int"
+	Set gtmtypfldindx("jnlpool_ctl_struct","this_side.jnl_ver")=20
+	Set gtmtypes("jnlpool_ctl_struct",21,"name")="jnlpool_ctl_struct.this_side.is_std_null_coll"
+	Set gtmtypes("jnlpool_ctl_struct",21,"off")=504
 	Set gtmtypes("jnlpool_ctl_struct",21,"len")=4
-	Set gtmtypes("jnlpool_ctl_struct",21,"type")="unsigned-int"
-	Set gtmtypfldindx("jnlpool_ctl_struct","lastwrite_len")=21
-	Set gtmtypes("jnlpool_ctl_struct",22,"name")="jnlpool_ctl_struct.send_losttn_complete"
-	Set gtmtypes("jnlpool_ctl_struct",22,"off")=396
+	Set gtmtypes("jnlpool_ctl_struct",21,"type")="boolean_t"
+	Set gtmtypfldindx("jnlpool_ctl_struct","this_side.is_std_null_coll")=21
+	Set gtmtypes("jnlpool_ctl_struct",22,"name")="jnlpool_ctl_struct.this_side.trigger_supported"
+	Set gtmtypes("jnlpool_ctl_struct",22,"off")=508
 	Set gtmtypes("jnlpool_ctl_struct",22,"len")=4
 	Set gtmtypes("jnlpool_ctl_struct",22,"type")="boolean_t"
-	Set gtmtypfldindx("jnlpool_ctl_struct","send_losttn_complete")=22
-	Set gtmtypes("jnlpool_ctl_struct",23,"name")="jnlpool_ctl_struct.primary_instname"
-	Set gtmtypes("jnlpool_ctl_struct",23,"off")=400
-	Set gtmtypes("jnlpool_ctl_struct",23,"len")=16
-	Set gtmtypes("jnlpool_ctl_struct",23,"type")="unsigned-char"
-	Set gtmtypfldindx("jnlpool_ctl_struct","primary_instname")=23
-	Set gtmtypes("jnlpool_ctl_struct",24,"name")="jnlpool_ctl_struct.gtmrecv_pid"
-	Set gtmtypes("jnlpool_ctl_struct",24,"off")=416
+	Set gtmtypfldindx("jnlpool_ctl_struct","this_side.trigger_supported")=22
+	Set gtmtypes("jnlpool_ctl_struct",23,"name")="jnlpool_ctl_struct.this_side.cross_endian"
+	Set gtmtypes("jnlpool_ctl_struct",23,"off")=512
+	Set gtmtypes("jnlpool_ctl_struct",23,"len")=4
+	Set gtmtypes("jnlpool_ctl_struct",23,"type")="boolean_t"
+	Set gtmtypfldindx("jnlpool_ctl_struct","this_side.cross_endian")=23
+	Set gtmtypes("jnlpool_ctl_struct",24,"name")="jnlpool_ctl_struct.this_side.endianness_known"
+	Set gtmtypes("jnlpool_ctl_struct",24,"off")=516
 	Set gtmtypes("jnlpool_ctl_struct",24,"len")=4
-	Set gtmtypes("jnlpool_ctl_struct",24,"type")="unsigned-int"
-	Set gtmtypfldindx("jnlpool_ctl_struct","gtmrecv_pid")=24
-	Set gtmtypes("jnlpool_ctl_struct",25,"name")="jnlpool_ctl_struct.prev_jnlseqno_time"
-	Set gtmtypes("jnlpool_ctl_struct",25,"off")=420
+	Set gtmtypes("jnlpool_ctl_struct",24,"type")="boolean_t"
+	Set gtmtypfldindx("jnlpool_ctl_struct","this_side.endianness_known")=24
+	Set gtmtypes("jnlpool_ctl_struct",25,"name")="jnlpool_ctl_struct.this_side.null_subs_xform"
+	Set gtmtypes("jnlpool_ctl_struct",25,"off")=520
 	Set gtmtypes("jnlpool_ctl_struct",25,"len")=4
-	Set gtmtypes("jnlpool_ctl_struct",25,"type")="unsigned-int"
-	Set gtmtypfldindx("jnlpool_ctl_struct","prev_jnlseqno_time")=25
-	Set gtmtypes("jnlpool_ctl_struct",26,"name")="jnlpool_ctl_struct.pool_initialized"
-	Set gtmtypes("jnlpool_ctl_struct",26,"off")=424
+	Set gtmtypes("jnlpool_ctl_struct",25,"type")="boolean_t"
+	Set gtmtypfldindx("jnlpool_ctl_struct","this_side.null_subs_xform")=25
+	Set gtmtypes("jnlpool_ctl_struct",26,"name")="jnlpool_ctl_struct.this_side.is_supplementary"
+	Set gtmtypes("jnlpool_ctl_struct",26,"off")=524
 	Set gtmtypes("jnlpool_ctl_struct",26,"len")=4
 	Set gtmtypes("jnlpool_ctl_struct",26,"type")="boolean_t"
-	Set gtmtypfldindx("jnlpool_ctl_struct","pool_initialized")=26
-	Set gtmtypes("jnlpool_ctl_struct",27,"name")="jnlpool_ctl_struct.jnlpool_creator_pid"
-	Set gtmtypes("jnlpool_ctl_struct",27,"off")=428
+	Set gtmtypfldindx("jnlpool_ctl_struct","this_side.is_supplementary")=26
+	Set gtmtypes("jnlpool_ctl_struct",27,"name")="jnlpool_ctl_struct.this_side.tls_requested"
+	Set gtmtypes("jnlpool_ctl_struct",27,"off")=528
 	Set gtmtypes("jnlpool_ctl_struct",27,"len")=4
-	Set gtmtypes("jnlpool_ctl_struct",27,"type")="unsigned-int"
-	Set gtmtypfldindx("jnlpool_ctl_struct","jnlpool_creator_pid")=27
-	Set gtmtypes("jnlpool_ctl_struct",28,"name")="jnlpool_ctl_struct.this_side"
-	Set gtmtypes("jnlpool_ctl_struct",28,"off")=432
-	Set gtmtypes("jnlpool_ctl_struct",28,"len")=48
-	Set gtmtypes("jnlpool_ctl_struct",28,"type")="repl_conn_info_t"
-	Set gtmtypfldindx("jnlpool_ctl_struct","this_side")=28
-	Set gtmtypes("jnlpool_ctl_struct",29,"name")="jnlpool_ctl_struct.this_side.proto_ver"
-	Set gtmtypes("jnlpool_ctl_struct",29,"off")=432
-	Set gtmtypes("jnlpool_ctl_struct",29,"len")=4
-	Set gtmtypes("jnlpool_ctl_struct",29,"type")="int"
-	Set gtmtypfldindx("jnlpool_ctl_struct","this_side.proto_ver")=29
-	Set gtmtypes("jnlpool_ctl_struct",30,"name")="jnlpool_ctl_struct.this_side.jnl_ver"
-	Set gtmtypes("jnlpool_ctl_struct",30,"off")=436
-	Set gtmtypes("jnlpool_ctl_struct",30,"len")=4
-	Set gtmtypes("jnlpool_ctl_struct",30,"type")="unsigned-int"
-	Set gtmtypfldindx("jnlpool_ctl_struct","this_side.jnl_ver")=30
-	Set gtmtypes("jnlpool_ctl_struct",31,"name")="jnlpool_ctl_struct.this_side.is_std_null_coll"
-	Set gtmtypes("jnlpool_ctl_struct",31,"off")=440
+	Set gtmtypes("jnlpool_ctl_struct",27,"type")="boolean_t"
+	Set gtmtypfldindx("jnlpool_ctl_struct","this_side.tls_requested")=27
+	Set gtmtypes("jnlpool_ctl_struct",28,"name")="jnlpool_ctl_struct.this_side.filler_16"
+	Set gtmtypes("jnlpool_ctl_struct",28,"off")=532
+	Set gtmtypes("jnlpool_ctl_struct",28,"len")=12
+	Set gtmtypes("jnlpool_ctl_struct",28,"type")="char"
+	Set gtmtypfldindx("jnlpool_ctl_struct","this_side.filler_16")=28
+	Set gtmtypes("jnlpool_ctl_struct",29,"name")="jnlpool_ctl_struct.write_addr"
+	Set gtmtypes("jnlpool_ctl_struct",29,"off")=544
+	Set gtmtypes("jnlpool_ctl_struct",29,"len")=8
+	Set gtmtypes("jnlpool_ctl_struct",29,"type")="uint64_t"
+	Set gtmtypfldindx("jnlpool_ctl_struct","write_addr")=29
+	Set gtmtypes("jnlpool_ctl_struct",30,"name")="jnlpool_ctl_struct.rsrv_write_addr"
+	Set gtmtypes("jnlpool_ctl_struct",30,"off")=552
+	Set gtmtypes("jnlpool_ctl_struct",30,"len")=8
+	Set gtmtypes("jnlpool_ctl_struct",30,"type")="uint64_t"
+	Set gtmtypfldindx("jnlpool_ctl_struct","rsrv_write_addr")=30
+	Set gtmtypes("jnlpool_ctl_struct",31,"name")="jnlpool_ctl_struct.upd_disabled"
+	Set gtmtypes("jnlpool_ctl_struct",31,"off")=560
 	Set gtmtypes("jnlpool_ctl_struct",31,"len")=4
 	Set gtmtypes("jnlpool_ctl_struct",31,"type")="boolean_t"
-	Set gtmtypfldindx("jnlpool_ctl_struct","this_side.is_std_null_coll")=31
-	Set gtmtypes("jnlpool_ctl_struct",32,"name")="jnlpool_ctl_struct.this_side.trigger_supported"
-	Set gtmtypes("jnlpool_ctl_struct",32,"off")=444
+	Set gtmtypfldindx("jnlpool_ctl_struct","upd_disabled")=31
+	Set gtmtypes("jnlpool_ctl_struct",32,"name")="jnlpool_ctl_struct.lastwrite_len"
+	Set gtmtypes("jnlpool_ctl_struct",32,"off")=564
 	Set gtmtypes("jnlpool_ctl_struct",32,"len")=4
-	Set gtmtypes("jnlpool_ctl_struct",32,"type")="boolean_t"
-	Set gtmtypfldindx("jnlpool_ctl_struct","this_side.trigger_supported")=32
-	Set gtmtypes("jnlpool_ctl_struct",33,"name")="jnlpool_ctl_struct.this_side.cross_endian"
-	Set gtmtypes("jnlpool_ctl_struct",33,"off")=448
+	Set gtmtypes("jnlpool_ctl_struct",32,"type")="unsigned-int"
+	Set gtmtypfldindx("jnlpool_ctl_struct","lastwrite_len")=32
+	Set gtmtypes("jnlpool_ctl_struct",33,"name")="jnlpool_ctl_struct.send_losttn_complete"
+	Set gtmtypes("jnlpool_ctl_struct",33,"off")=568
 	Set gtmtypes("jnlpool_ctl_struct",33,"len")=4
 	Set gtmtypes("jnlpool_ctl_struct",33,"type")="boolean_t"
-	Set gtmtypfldindx("jnlpool_ctl_struct","this_side.cross_endian")=33
-	Set gtmtypes("jnlpool_ctl_struct",34,"name")="jnlpool_ctl_struct.this_side.endianness_known"
-	Set gtmtypes("jnlpool_ctl_struct",34,"off")=452
-	Set gtmtypes("jnlpool_ctl_struct",34,"len")=4
-	Set gtmtypes("jnlpool_ctl_struct",34,"type")="boolean_t"
-	Set gtmtypfldindx("jnlpool_ctl_struct","this_side.endianness_known")=34
-	Set gtmtypes("jnlpool_ctl_struct",35,"name")="jnlpool_ctl_struct.this_side.null_subs_xform"
-	Set gtmtypes("jnlpool_ctl_struct",35,"off")=456
+	Set gtmtypfldindx("jnlpool_ctl_struct","send_losttn_complete")=33
+	Set gtmtypes("jnlpool_ctl_struct",34,"name")="jnlpool_ctl_struct.primary_instname"
+	Set gtmtypes("jnlpool_ctl_struct",34,"off")=572
+	Set gtmtypes("jnlpool_ctl_struct",34,"len")=16
+	Set gtmtypes("jnlpool_ctl_struct",34,"type")="unsigned-char"
+	Set gtmtypfldindx("jnlpool_ctl_struct","primary_instname")=34
+	Set gtmtypes("jnlpool_ctl_struct",35,"name")="jnlpool_ctl_struct.gtmrecv_pid"
+	Set gtmtypes("jnlpool_ctl_struct",35,"off")=588
 	Set gtmtypes("jnlpool_ctl_struct",35,"len")=4
-	Set gtmtypes("jnlpool_ctl_struct",35,"type")="boolean_t"
-	Set gtmtypfldindx("jnlpool_ctl_struct","this_side.null_subs_xform")=35
-	Set gtmtypes("jnlpool_ctl_struct",36,"name")="jnlpool_ctl_struct.this_side.is_supplementary"
-	Set gtmtypes("jnlpool_ctl_struct",36,"off")=460
+	Set gtmtypes("jnlpool_ctl_struct",35,"type")="unsigned-int"
+	Set gtmtypfldindx("jnlpool_ctl_struct","gtmrecv_pid")=35
+	Set gtmtypes("jnlpool_ctl_struct",36,"name")="jnlpool_ctl_struct.prev_jnlseqno_time"
+	Set gtmtypes("jnlpool_ctl_struct",36,"off")=592
 	Set gtmtypes("jnlpool_ctl_struct",36,"len")=4
-	Set gtmtypes("jnlpool_ctl_struct",36,"type")="boolean_t"
-	Set gtmtypfldindx("jnlpool_ctl_struct","this_side.is_supplementary")=36
-	Set gtmtypes("jnlpool_ctl_struct",37,"name")="jnlpool_ctl_struct.this_side.tls_requested"
-	Set gtmtypes("jnlpool_ctl_struct",37,"off")=464
+	Set gtmtypes("jnlpool_ctl_struct",36,"type")="unsigned-int"
+	Set gtmtypfldindx("jnlpool_ctl_struct","prev_jnlseqno_time")=36
+	Set gtmtypes("jnlpool_ctl_struct",37,"name")="jnlpool_ctl_struct.pool_initialized"
+	Set gtmtypes("jnlpool_ctl_struct",37,"off")=596
 	Set gtmtypes("jnlpool_ctl_struct",37,"len")=4
 	Set gtmtypes("jnlpool_ctl_struct",37,"type")="boolean_t"
-	Set gtmtypfldindx("jnlpool_ctl_struct","this_side.tls_requested")=37
-	Set gtmtypes("jnlpool_ctl_struct",38,"name")="jnlpool_ctl_struct.this_side.filler_16"
-	Set gtmtypes("jnlpool_ctl_struct",38,"off")=468
-	Set gtmtypes("jnlpool_ctl_struct",38,"len")=12
-	Set gtmtypes("jnlpool_ctl_struct",38,"type")="char"
-	Set gtmtypfldindx("jnlpool_ctl_struct","this_side.filler_16")=38
-	Set gtmtypes("jnlpool_ctl_struct",39,"name")="jnlpool_ctl_struct.strm_seqno"
-	Set gtmtypes("jnlpool_ctl_struct",39,"off")=480
-	Set gtmtypes("jnlpool_ctl_struct",39,"len")=128
-	Set gtmtypes("jnlpool_ctl_struct",39,"type")="uint64_t"
-	Set gtmtypfldindx("jnlpool_ctl_struct","strm_seqno")=39
-	Set gtmtypes("jnlpool_ctl_struct",39,"dim")=16
-	Set gtmtypes("jnlpool_ctl_struct",40,"name")="jnlpool_ctl_struct.onln_rlbk_pid"
+	Set gtmtypfldindx("jnlpool_ctl_struct","pool_initialized")=37
+	Set gtmtypes("jnlpool_ctl_struct",38,"name")="jnlpool_ctl_struct.jnlpool_creator_pid"
+	Set gtmtypes("jnlpool_ctl_struct",38,"off")=600
+	Set gtmtypes("jnlpool_ctl_struct",38,"len")=4
+	Set gtmtypes("jnlpool_ctl_struct",38,"type")="unsigned-int"
+	Set gtmtypfldindx("jnlpool_ctl_struct","jnlpool_creator_pid")=38
+	Set gtmtypes("jnlpool_ctl_struct",39,"name")="jnlpool_ctl_struct.onln_rlbk_pid"
+	Set gtmtypes("jnlpool_ctl_struct",39,"off")=604
+	Set gtmtypes("jnlpool_ctl_struct",39,"len")=4
+	Set gtmtypes("jnlpool_ctl_struct",39,"type")="unsigned-int"
+	Set gtmtypfldindx("jnlpool_ctl_struct","onln_rlbk_pid")=39
+	Set gtmtypes("jnlpool_ctl_struct",40,"name")="jnlpool_ctl_struct.onln_rlbk_cycle"
 	Set gtmtypes("jnlpool_ctl_struct",40,"off")=608
 	Set gtmtypes("jnlpool_ctl_struct",40,"len")=4
 	Set gtmtypes("jnlpool_ctl_struct",40,"type")="unsigned-int"
-	Set gtmtypfldindx("jnlpool_ctl_struct","onln_rlbk_pid")=40
-	Set gtmtypes("jnlpool_ctl_struct",41,"name")="jnlpool_ctl_struct.onln_rlbk_cycle"
+	Set gtmtypfldindx("jnlpool_ctl_struct","onln_rlbk_cycle")=40
+	Set gtmtypes("jnlpool_ctl_struct",41,"name")="jnlpool_ctl_struct.freeze"
 	Set gtmtypes("jnlpool_ctl_struct",41,"off")=612
 	Set gtmtypes("jnlpool_ctl_struct",41,"len")=4
-	Set gtmtypes("jnlpool_ctl_struct",41,"type")="unsigned-int"
-	Set gtmtypfldindx("jnlpool_ctl_struct","onln_rlbk_cycle")=41
-	Set gtmtypes("jnlpool_ctl_struct",42,"name")="jnlpool_ctl_struct.freeze"
+	Set gtmtypes("jnlpool_ctl_struct",41,"type")="boolean_t"
+	Set gtmtypfldindx("jnlpool_ctl_struct","freeze")=41
+	Set gtmtypes("jnlpool_ctl_struct",42,"name")="jnlpool_ctl_struct.freeze_comment"
 	Set gtmtypes("jnlpool_ctl_struct",42,"off")=616
-	Set gtmtypes("jnlpool_ctl_struct",42,"len")=4
-	Set gtmtypes("jnlpool_ctl_struct",42,"type")="boolean_t"
-	Set gtmtypfldindx("jnlpool_ctl_struct","freeze")=42
-	Set gtmtypes("jnlpool_ctl_struct",43,"name")="jnlpool_ctl_struct.freeze_comment"
-	Set gtmtypes("jnlpool_ctl_struct",43,"off")=620
-	Set gtmtypes("jnlpool_ctl_struct",43,"len")=1024
-	Set gtmtypes("jnlpool_ctl_struct",43,"type")="char"
-	Set gtmtypfldindx("jnlpool_ctl_struct","freeze_comment")=43
-	Set gtmtypes("jnlpool_ctl_struct",44,"name")="jnlpool_ctl_struct.instfreeze_environ_inited"
+	Set gtmtypes("jnlpool_ctl_struct",42,"len")=1024
+	Set gtmtypes("jnlpool_ctl_struct",42,"type")="char"
+	Set gtmtypfldindx("jnlpool_ctl_struct","freeze_comment")=42
+	Set gtmtypes("jnlpool_ctl_struct",43,"name")="jnlpool_ctl_struct.instfreeze_environ_inited"
+	Set gtmtypes("jnlpool_ctl_struct",43,"off")=1640
+	Set gtmtypes("jnlpool_ctl_struct",43,"len")=4
+	Set gtmtypes("jnlpool_ctl_struct",43,"type")="boolean_t"
+	Set gtmtypfldindx("jnlpool_ctl_struct","instfreeze_environ_inited")=43
+	Set gtmtypes("jnlpool_ctl_struct",44,"name")="jnlpool_ctl_struct.merrors_array"
 	Set gtmtypes("jnlpool_ctl_struct",44,"off")=1644
-	Set gtmtypes("jnlpool_ctl_struct",44,"len")=4
-	Set gtmtypes("jnlpool_ctl_struct",44,"type")="boolean_t"
-	Set gtmtypfldindx("jnlpool_ctl_struct","instfreeze_environ_inited")=44
-	Set gtmtypes("jnlpool_ctl_struct",45,"name")="jnlpool_ctl_struct.merrors_array"
-	Set gtmtypes("jnlpool_ctl_struct",45,"off")=1648
-	Set gtmtypes("jnlpool_ctl_struct",45,"len")=2048
-	Set gtmtypes("jnlpool_ctl_struct",45,"type")="unsigned-char"
-	Set gtmtypfldindx("jnlpool_ctl_struct","merrors_array")=45
-	Set gtmtypes("jnlpool_ctl_struct",46,"name")="jnlpool_ctl_struct.outofsync_core_generated"
+	Set gtmtypes("jnlpool_ctl_struct",44,"len")=2048
+	Set gtmtypes("jnlpool_ctl_struct",44,"type")="unsigned-char"
+	Set gtmtypfldindx("jnlpool_ctl_struct","merrors_array")=44
+	Set gtmtypes("jnlpool_ctl_struct",45,"name")="jnlpool_ctl_struct.ftok_counter_halted"
+	Set gtmtypes("jnlpool_ctl_struct",45,"off")=3692
+	Set gtmtypes("jnlpool_ctl_struct",45,"len")=4
+	Set gtmtypes("jnlpool_ctl_struct",45,"type")="boolean_t"
+	Set gtmtypfldindx("jnlpool_ctl_struct","ftok_counter_halted")=45
+	Set gtmtypes("jnlpool_ctl_struct",46,"name")="jnlpool_ctl_struct.phase2_commit_index1"
 	Set gtmtypes("jnlpool_ctl_struct",46,"off")=3696
 	Set gtmtypes("jnlpool_ctl_struct",46,"len")=4
-	Set gtmtypes("jnlpool_ctl_struct",46,"type")="boolean_t"
-	Set gtmtypfldindx("jnlpool_ctl_struct","outofsync_core_generated")=46
-	Set gtmtypes("jnlpool_ctl_struct",47,"name")="jnlpool_ctl_struct.ftok_counter_halted"
+	Set gtmtypes("jnlpool_ctl_struct",46,"type")="unsigned-int"
+	Set gtmtypfldindx("jnlpool_ctl_struct","phase2_commit_index1")=46
+	Set gtmtypes("jnlpool_ctl_struct",47,"name")="jnlpool_ctl_struct.phase2_commit_index2"
 	Set gtmtypes("jnlpool_ctl_struct",47,"off")=3700
 	Set gtmtypes("jnlpool_ctl_struct",47,"len")=4
-	Set gtmtypes("jnlpool_ctl_struct",47,"type")="boolean_t"
-	Set gtmtypfldindx("jnlpool_ctl_struct","ftok_counter_halted")=47
-	Set gtmtypes("jnlpool_ctl_struct",48,"name")="jnlpool_ctl_struct.filler_16bytealign"
+	Set gtmtypes("jnlpool_ctl_struct",47,"type")="unsigned-int"
+	Set gtmtypfldindx("jnlpool_ctl_struct","phase2_commit_index2")=47
+	Set gtmtypes("jnlpool_ctl_struct",48,"name")="jnlpool_ctl_struct.filler_16bytealign1"
 	Set gtmtypes("jnlpool_ctl_struct",48,"off")=3704
 	Set gtmtypes("jnlpool_ctl_struct",48,"len")=8
 	Set gtmtypes("jnlpool_ctl_struct",48,"type")="char"
-	Set gtmtypfldindx("jnlpool_ctl_struct","filler_16bytealign")=48
-	;
-	Set gtmtypes("jnlpool_write_ctx_t")="struct"
-	Set gtmtypes("jnlpool_write_ctx_t",0)=2
-	Set gtmtypes("jnlpool_write_ctx_t","len")=8
-	Set gtmtypes("jnlpool_write_ctx_t",1,"name")="jnlpool_write_ctx_t.write"
-	Set gtmtypes("jnlpool_write_ctx_t",1,"off")=0
-	Set gtmtypes("jnlpool_write_ctx_t",1,"len")=4
-	Set gtmtypes("jnlpool_write_ctx_t",1,"type")="unsigned-int"
-	Set gtmtypfldindx("jnlpool_write_ctx_t","write")=1
-	Set gtmtypes("jnlpool_write_ctx_t",2,"name")="jnlpool_write_ctx_t.write_total"
-	Set gtmtypes("jnlpool_write_ctx_t",2,"off")=4
-	Set gtmtypes("jnlpool_write_ctx_t",2,"len")=4
-	Set gtmtypes("jnlpool_write_ctx_t",2,"type")="unsigned-int"
-	Set gtmtypfldindx("jnlpool_write_ctx_t","write_total")=2
+	Set gtmtypfldindx("jnlpool_ctl_struct","filler_16bytealign1")=48
+	Set gtmtypes("jnlpool_ctl_struct",49,"name")="jnlpool_ctl_struct.jnl_pool_write_sleep"
+	Set gtmtypes("jnlpool_ctl_struct",49,"off")=3712
+	Set gtmtypes("jnlpool_ctl_struct",49,"len")=16
+	Set gtmtypes("jnlpool_ctl_struct",49,"type")="jpl_trc_rec_t"
+	Set gtmtypfldindx("jnlpool_ctl_struct","jnl_pool_write_sleep")=49
+	Set gtmtypes("jnlpool_ctl_struct",50,"name")="jnlpool_ctl_struct.jnl_pool_write_sleep.cntr"
+	Set gtmtypes("jnlpool_ctl_struct",50,"off")=3712
+	Set gtmtypes("jnlpool_ctl_struct",50,"len")=8
+	Set gtmtypes("jnlpool_ctl_struct",50,"type")="uint64_t"
+	Set gtmtypfldindx("jnlpool_ctl_struct","jnl_pool_write_sleep.cntr")=50
+	Set gtmtypes("jnlpool_ctl_struct",51,"name")="jnlpool_ctl_struct.jnl_pool_write_sleep.seqno"
+	Set gtmtypes("jnlpool_ctl_struct",51,"off")=3720
+	Set gtmtypes("jnlpool_ctl_struct",51,"len")=8
+	Set gtmtypes("jnlpool_ctl_struct",51,"type")="uint64_t"
+	Set gtmtypfldindx("jnlpool_ctl_struct","jnl_pool_write_sleep.seqno")=51
+	Set gtmtypes("jnlpool_ctl_struct",52,"name")="jnlpool_ctl_struct.repl_phs2cmt_arrayfull_sleep"
+	Set gtmtypes("jnlpool_ctl_struct",52,"off")=3728
+	Set gtmtypes("jnlpool_ctl_struct",52,"len")=16
+	Set gtmtypes("jnlpool_ctl_struct",52,"type")="jpl_trc_rec_t"
+	Set gtmtypfldindx("jnlpool_ctl_struct","repl_phs2cmt_arrayfull_sleep")=52
+	Set gtmtypes("jnlpool_ctl_struct",53,"name")="jnlpool_ctl_struct.repl_phs2cmt_arrayfull_sleep.cntr"
+	Set gtmtypes("jnlpool_ctl_struct",53,"off")=3728
+	Set gtmtypes("jnlpool_ctl_struct",53,"len")=8
+	Set gtmtypes("jnlpool_ctl_struct",53,"type")="uint64_t"
+	Set gtmtypfldindx("jnlpool_ctl_struct","repl_phs2cmt_arrayfull_sleep.cntr")=53
+	Set gtmtypes("jnlpool_ctl_struct",54,"name")="jnlpool_ctl_struct.repl_phs2cmt_arrayfull_sleep.seqno"
+	Set gtmtypes("jnlpool_ctl_struct",54,"off")=3736
+	Set gtmtypes("jnlpool_ctl_struct",54,"len")=8
+	Set gtmtypes("jnlpool_ctl_struct",54,"type")="uint64_t"
+	Set gtmtypfldindx("jnlpool_ctl_struct","repl_phs2cmt_arrayfull_sleep.seqno")=54
+	Set gtmtypes("jnlpool_ctl_struct",55,"name")="jnlpool_ctl_struct.repl_phase2_cleanup_isprcalv"
+	Set gtmtypes("jnlpool_ctl_struct",55,"off")=3744
+	Set gtmtypes("jnlpool_ctl_struct",55,"len")=16
+	Set gtmtypes("jnlpool_ctl_struct",55,"type")="jpl_trc_rec_t"
+	Set gtmtypfldindx("jnlpool_ctl_struct","repl_phase2_cleanup_isprcalv")=55
+	Set gtmtypes("jnlpool_ctl_struct",56,"name")="jnlpool_ctl_struct.repl_phase2_cleanup_isprcalv.cntr"
+	Set gtmtypes("jnlpool_ctl_struct",56,"off")=3744
+	Set gtmtypes("jnlpool_ctl_struct",56,"len")=8
+	Set gtmtypes("jnlpool_ctl_struct",56,"type")="uint64_t"
+	Set gtmtypfldindx("jnlpool_ctl_struct","repl_phase2_cleanup_isprcalv.cntr")=56
+	Set gtmtypes("jnlpool_ctl_struct",57,"name")="jnlpool_ctl_struct.repl_phase2_cleanup_isprcalv.seqno"
+	Set gtmtypes("jnlpool_ctl_struct",57,"off")=3752
+	Set gtmtypes("jnlpool_ctl_struct",57,"len")=8
+	Set gtmtypes("jnlpool_ctl_struct",57,"type")="uint64_t"
+	Set gtmtypfldindx("jnlpool_ctl_struct","repl_phase2_cleanup_isprcalv.seqno")=57
+	Set gtmtypes("jnlpool_ctl_struct",58,"name")="jnlpool_ctl_struct.phase2_commit_array"
+	Set gtmtypes("jnlpool_ctl_struct",58,"off")=3760
+	Set gtmtypes("jnlpool_ctl_struct",58,"len")=655360
+	Set gtmtypes("jnlpool_ctl_struct",58,"type")="jpl_phase2_in_prog_t"
+	Set gtmtypfldindx("jnlpool_ctl_struct","phase2_commit_array")=58
+	Set gtmtypes("jnlpool_ctl_struct",58,"dim")=16384
+	Set gtmtypes("jnlpool_ctl_struct",59,"name")="jnlpool_ctl_struct.phase2_commit_array[0].jnl_seqno"
+	Set gtmtypes("jnlpool_ctl_struct",59,"off")=3760
+	Set gtmtypes("jnlpool_ctl_struct",59,"len")=8
+	Set gtmtypes("jnlpool_ctl_struct",59,"type")="uint64_t"
+	Set gtmtypfldindx("jnlpool_ctl_struct","phase2_commit_array[0].jnl_seqno")=59
+	Set gtmtypes("jnlpool_ctl_struct",60,"name")="jnlpool_ctl_struct.phase2_commit_array[0].strm_seqno"
+	Set gtmtypes("jnlpool_ctl_struct",60,"off")=3768
+	Set gtmtypes("jnlpool_ctl_struct",60,"len")=8
+	Set gtmtypes("jnlpool_ctl_struct",60,"type")="uint64_t"
+	Set gtmtypfldindx("jnlpool_ctl_struct","phase2_commit_array[0].strm_seqno")=60
+	Set gtmtypes("jnlpool_ctl_struct",61,"name")="jnlpool_ctl_struct.phase2_commit_array[0].start_write_addr"
+	Set gtmtypes("jnlpool_ctl_struct",61,"off")=3776
+	Set gtmtypes("jnlpool_ctl_struct",61,"len")=8
+	Set gtmtypes("jnlpool_ctl_struct",61,"type")="uint64_t"
+	Set gtmtypfldindx("jnlpool_ctl_struct","phase2_commit_array[0].start_write_addr")=61
+	Set gtmtypes("jnlpool_ctl_struct",62,"name")="jnlpool_ctl_struct.phase2_commit_array[0].process_id"
+	Set gtmtypes("jnlpool_ctl_struct",62,"off")=3784
+	Set gtmtypes("jnlpool_ctl_struct",62,"len")=4
+	Set gtmtypes("jnlpool_ctl_struct",62,"type")="unsigned-int"
+	Set gtmtypfldindx("jnlpool_ctl_struct","phase2_commit_array[0].process_id")=62
+	Set gtmtypes("jnlpool_ctl_struct",63,"name")="jnlpool_ctl_struct.phase2_commit_array[0].tot_jrec_len"
+	Set gtmtypes("jnlpool_ctl_struct",63,"off")=3788
+	Set gtmtypes("jnlpool_ctl_struct",63,"len")=4
+	Set gtmtypes("jnlpool_ctl_struct",63,"type")="unsigned-int"
+	Set gtmtypfldindx("jnlpool_ctl_struct","phase2_commit_array[0].tot_jrec_len")=63
+	Set gtmtypes("jnlpool_ctl_struct",64,"name")="jnlpool_ctl_struct.phase2_commit_array[0].prev_jrec_len"
+	Set gtmtypes("jnlpool_ctl_struct",64,"off")=3792
+	Set gtmtypes("jnlpool_ctl_struct",64,"len")=4
+	Set gtmtypes("jnlpool_ctl_struct",64,"type")="unsigned-int"
+	Set gtmtypfldindx("jnlpool_ctl_struct","phase2_commit_array[0].prev_jrec_len")=64
+	Set gtmtypes("jnlpool_ctl_struct",65,"name")="jnlpool_ctl_struct.phase2_commit_array[0].write_complete"
+	Set gtmtypes("jnlpool_ctl_struct",65,"off")=3796
+	Set gtmtypes("jnlpool_ctl_struct",65,"len")=4
+	Set gtmtypes("jnlpool_ctl_struct",65,"type")="boolean_t"
+	Set gtmtypfldindx("jnlpool_ctl_struct","phase2_commit_array[0].write_complete")=65
+	Set gtmtypes("jnlpool_ctl_struct",66,"name")="jnlpool_ctl_struct.fill_cacheline0"
+	Set gtmtypes("jnlpool_ctl_struct",66,"off")=659120
+	Set gtmtypes("jnlpool_ctl_struct",66,"len")=24
+	Set gtmtypes("jnlpool_ctl_struct",66,"type")="char"
+	Set gtmtypfldindx("jnlpool_ctl_struct","fill_cacheline0")=66
+	Set gtmtypes("jnlpool_ctl_struct",67,"name")="jnlpool_ctl_struct.phase2_commit_latch"
+	Set gtmtypes("jnlpool_ctl_struct",67,"off")=659144
+	Set gtmtypes("jnlpool_ctl_struct",67,"len")=8
+	Set gtmtypes("jnlpool_ctl_struct",67,"type")="global_latch_t"
+	Set gtmtypfldindx("jnlpool_ctl_struct","phase2_commit_latch")=67
+	Set gtmtypes("jnlpool_ctl_struct",68,"name")="jnlpool_ctl_struct.phase2_commit_latch.u"
+	Set gtmtypes("jnlpool_ctl_struct",68,"off")=659144
+	Set gtmtypes("jnlpool_ctl_struct",68,"len")=8
+	Set gtmtypes("jnlpool_ctl_struct",68,"type")="union"
+	Set gtmtypfldindx("jnlpool_ctl_struct","phase2_commit_latch.u")=68
+	Set gtmtypes("jnlpool_ctl_struct",69,"name")="jnlpool_ctl_struct.phase2_commit_latch.u.pid_imgcnt"
+	Set gtmtypes("jnlpool_ctl_struct",69,"off")=659144
+	Set gtmtypes("jnlpool_ctl_struct",69,"len")=8
+	Set gtmtypes("jnlpool_ctl_struct",69,"type")="uint64_t"
+	Set gtmtypfldindx("jnlpool_ctl_struct","phase2_commit_latch.u.pid_imgcnt")=69
+	Set gtmtypes("jnlpool_ctl_struct",70,"name")="jnlpool_ctl_struct.phase2_commit_latch.u.parts"
+	Set gtmtypes("jnlpool_ctl_struct",70,"off")=659144
+	Set gtmtypes("jnlpool_ctl_struct",70,"len")=8
+	Set gtmtypes("jnlpool_ctl_struct",70,"type")="struct"
+	Set gtmtypfldindx("jnlpool_ctl_struct","phase2_commit_latch.u.parts")=70
+	Set gtmtypes("jnlpool_ctl_struct",71,"name")="jnlpool_ctl_struct.phase2_commit_latch.u.parts.latch_pid"
+	Set gtmtypes("jnlpool_ctl_struct",71,"off")=659144
+	Set gtmtypes("jnlpool_ctl_struct",71,"len")=4
+	Set gtmtypes("jnlpool_ctl_struct",71,"type")="int"
+	Set gtmtypfldindx("jnlpool_ctl_struct","phase2_commit_latch.u.parts.latch_pid")=71
+	Set gtmtypes("jnlpool_ctl_struct",72,"name")="jnlpool_ctl_struct.phase2_commit_latch.u.parts.latch_word"
+	Set gtmtypes("jnlpool_ctl_struct",72,"off")=659148
+	Set gtmtypes("jnlpool_ctl_struct",72,"len")=4
+	Set gtmtypes("jnlpool_ctl_struct",72,"type")="int"
+	Set gtmtypfldindx("jnlpool_ctl_struct","phase2_commit_latch.u.parts.latch_word")=72
 	;
 	Set gtmtypes("job_arg_msg")="struct"
 	Set gtmtypes("job_arg_msg",0)=2
@@ -12378,6 +12745,103 @@ Init
 	Set gtmtypes("joberr_msg",2,"type")="int"
 	Set gtmtypfldindx("joberr_msg","len")=2
 	;
+	Set gtmtypes("jpl_phase2_in_prog_t")="struct"
+	Set gtmtypes("jpl_phase2_in_prog_t",0)=7
+	Set gtmtypes("jpl_phase2_in_prog_t","len")=40
+	Set gtmtypes("jpl_phase2_in_prog_t",1,"name")="jpl_phase2_in_prog_t.jnl_seqno"
+	Set gtmtypes("jpl_phase2_in_prog_t",1,"off")=0
+	Set gtmtypes("jpl_phase2_in_prog_t",1,"len")=8
+	Set gtmtypes("jpl_phase2_in_prog_t",1,"type")="uint64_t"
+	Set gtmtypfldindx("jpl_phase2_in_prog_t","jnl_seqno")=1
+	Set gtmtypes("jpl_phase2_in_prog_t",2,"name")="jpl_phase2_in_prog_t.strm_seqno"
+	Set gtmtypes("jpl_phase2_in_prog_t",2,"off")=8
+	Set gtmtypes("jpl_phase2_in_prog_t",2,"len")=8
+	Set gtmtypes("jpl_phase2_in_prog_t",2,"type")="uint64_t"
+	Set gtmtypfldindx("jpl_phase2_in_prog_t","strm_seqno")=2
+	Set gtmtypes("jpl_phase2_in_prog_t",3,"name")="jpl_phase2_in_prog_t.start_write_addr"
+	Set gtmtypes("jpl_phase2_in_prog_t",3,"off")=16
+	Set gtmtypes("jpl_phase2_in_prog_t",3,"len")=8
+	Set gtmtypes("jpl_phase2_in_prog_t",3,"type")="uint64_t"
+	Set gtmtypfldindx("jpl_phase2_in_prog_t","start_write_addr")=3
+	Set gtmtypes("jpl_phase2_in_prog_t",4,"name")="jpl_phase2_in_prog_t.process_id"
+	Set gtmtypes("jpl_phase2_in_prog_t",4,"off")=24
+	Set gtmtypes("jpl_phase2_in_prog_t",4,"len")=4
+	Set gtmtypes("jpl_phase2_in_prog_t",4,"type")="unsigned-int"
+	Set gtmtypfldindx("jpl_phase2_in_prog_t","process_id")=4
+	Set gtmtypes("jpl_phase2_in_prog_t",5,"name")="jpl_phase2_in_prog_t.tot_jrec_len"
+	Set gtmtypes("jpl_phase2_in_prog_t",5,"off")=28
+	Set gtmtypes("jpl_phase2_in_prog_t",5,"len")=4
+	Set gtmtypes("jpl_phase2_in_prog_t",5,"type")="unsigned-int"
+	Set gtmtypfldindx("jpl_phase2_in_prog_t","tot_jrec_len")=5
+	Set gtmtypes("jpl_phase2_in_prog_t",6,"name")="jpl_phase2_in_prog_t.prev_jrec_len"
+	Set gtmtypes("jpl_phase2_in_prog_t",6,"off")=32
+	Set gtmtypes("jpl_phase2_in_prog_t",6,"len")=4
+	Set gtmtypes("jpl_phase2_in_prog_t",6,"type")="unsigned-int"
+	Set gtmtypfldindx("jpl_phase2_in_prog_t","prev_jrec_len")=6
+	Set gtmtypes("jpl_phase2_in_prog_t",7,"name")="jpl_phase2_in_prog_t.write_complete"
+	Set gtmtypes("jpl_phase2_in_prog_t",7,"off")=36
+	Set gtmtypes("jpl_phase2_in_prog_t",7,"len")=4
+	Set gtmtypes("jpl_phase2_in_prog_t",7,"type")="boolean_t"
+	Set gtmtypfldindx("jpl_phase2_in_prog_t","write_complete")=7
+	;
+	Set gtmtypes("jpl_rsrv_struct_t")="struct"
+	Set gtmtypes("jpl_rsrv_struct_t",0)=8
+	Set gtmtypes("jpl_rsrv_struct_t","len")=40
+	Set gtmtypes("jpl_rsrv_struct_t",1,"name")="jpl_rsrv_struct_t.start_write_addr"
+	Set gtmtypes("jpl_rsrv_struct_t",1,"off")=0
+	Set gtmtypes("jpl_rsrv_struct_t",1,"len")=8
+	Set gtmtypes("jpl_rsrv_struct_t",1,"type")="uint64_t"
+	Set gtmtypfldindx("jpl_rsrv_struct_t","start_write_addr")=1
+	Set gtmtypes("jpl_rsrv_struct_t",2,"name")="jpl_rsrv_struct_t.cur_write_addr"
+	Set gtmtypes("jpl_rsrv_struct_t",2,"off")=8
+	Set gtmtypes("jpl_rsrv_struct_t",2,"len")=8
+	Set gtmtypes("jpl_rsrv_struct_t",2,"type")="uint64_t"
+	Set gtmtypfldindx("jpl_rsrv_struct_t","cur_write_addr")=2
+	Set gtmtypes("jpl_rsrv_struct_t",3,"name")="jpl_rsrv_struct_t.tot_jrec_len"
+	Set gtmtypes("jpl_rsrv_struct_t",3,"off")=16
+	Set gtmtypes("jpl_rsrv_struct_t",3,"len")=4
+	Set gtmtypes("jpl_rsrv_struct_t",3,"type")="unsigned-int"
+	Set gtmtypfldindx("jpl_rsrv_struct_t","tot_jrec_len")=3
+	Set gtmtypes("jpl_rsrv_struct_t",4,"name")="jpl_rsrv_struct_t.write_total"
+	Set gtmtypes("jpl_rsrv_struct_t",4,"off")=20
+	Set gtmtypes("jpl_rsrv_struct_t",4,"len")=4
+	Set gtmtypes("jpl_rsrv_struct_t",4,"type")="unsigned-int"
+	Set gtmtypfldindx("jpl_rsrv_struct_t","write_total")=4
+	Set gtmtypes("jpl_rsrv_struct_t",5,"name")="jpl_rsrv_struct_t.memcpy_skipped"
+	Set gtmtypes("jpl_rsrv_struct_t",5,"off")=24
+	Set gtmtypes("jpl_rsrv_struct_t",5,"len")=4
+	Set gtmtypes("jpl_rsrv_struct_t",5,"type")="boolean_t"
+	Set gtmtypfldindx("jpl_rsrv_struct_t","memcpy_skipped")=5
+	Set gtmtypes("jpl_rsrv_struct_t",6,"name")="jpl_rsrv_struct_t.phase2_commit_index"
+	Set gtmtypes("jpl_rsrv_struct_t",6,"off")=28
+	Set gtmtypes("jpl_rsrv_struct_t",6,"len")=4
+	Set gtmtypes("jpl_rsrv_struct_t",6,"type")="unsigned-int"
+	Set gtmtypfldindx("jpl_rsrv_struct_t","phase2_commit_index")=6
+	Set gtmtypes("jpl_rsrv_struct_t",7,"name")="jpl_rsrv_struct_t.num_tcoms"
+	Set gtmtypes("jpl_rsrv_struct_t",7,"off")=32
+	Set gtmtypes("jpl_rsrv_struct_t",7,"len")=4
+	Set gtmtypes("jpl_rsrv_struct_t",7,"type")="unsigned-int"
+	Set gtmtypfldindx("jpl_rsrv_struct_t","num_tcoms")=7
+	Set gtmtypes("jpl_rsrv_struct_t",8,"name")="jpl_rsrv_struct_t.filler_8byte_align"
+	Set gtmtypes("jpl_rsrv_struct_t",8,"off")=36
+	Set gtmtypes("jpl_rsrv_struct_t",8,"len")=4
+	Set gtmtypes("jpl_rsrv_struct_t",8,"type")="char"
+	Set gtmtypfldindx("jpl_rsrv_struct_t","filler_8byte_align")=8
+	;
+	Set gtmtypes("jpl_trc_rec_t")="struct"
+	Set gtmtypes("jpl_trc_rec_t",0)=2
+	Set gtmtypes("jpl_trc_rec_t","len")=16
+	Set gtmtypes("jpl_trc_rec_t",1,"name")="jpl_trc_rec_t.cntr"
+	Set gtmtypes("jpl_trc_rec_t",1,"off")=0
+	Set gtmtypes("jpl_trc_rec_t",1,"len")=8
+	Set gtmtypes("jpl_trc_rec_t",1,"type")="uint64_t"
+	Set gtmtypfldindx("jpl_trc_rec_t","cntr")=1
+	Set gtmtypes("jpl_trc_rec_t",2,"name")="jpl_trc_rec_t.seqno"
+	Set gtmtypes("jpl_trc_rec_t",2,"off")=8
+	Set gtmtypes("jpl_trc_rec_t",2,"len")=8
+	Set gtmtypes("jpl_trc_rec_t",2,"type")="uint64_t"
+	Set gtmtypfldindx("jpl_trc_rec_t","seqno")=2
+	;
 	Set gtmtypes("jrec_prefix")="struct"
 	Set gtmtypes("jrec_prefix",0)=4
 	Set gtmtypes("jrec_prefix","len")=24
@@ -12402,6 +12866,25 @@ Init
 	Set gtmtypes("jrec_prefix",4,"type")="uint64_t"
 	Set gtmtypfldindx("jrec_prefix","tn")=4
 	;
+	Set gtmtypes("jrec_rsrv_elem_t")="struct"
+	Set gtmtypes("jrec_rsrv_elem_t",0)=3
+	Set gtmtypes("jrec_rsrv_elem_t","len")=12
+	Set gtmtypes("jrec_rsrv_elem_t",1,"name")="jrec_rsrv_elem_t.rectype"
+	Set gtmtypes("jrec_rsrv_elem_t",1,"off")=0
+	Set gtmtypes("jrec_rsrv_elem_t",1,"len")=4
+	Set gtmtypes("jrec_rsrv_elem_t",1,"type")="int"
+	Set gtmtypfldindx("jrec_rsrv_elem_t","rectype")=1
+	Set gtmtypes("jrec_rsrv_elem_t",2,"name")="jrec_rsrv_elem_t.reclen"
+	Set gtmtypes("jrec_rsrv_elem_t",2,"off")=4
+	Set gtmtypes("jrec_rsrv_elem_t",2,"len")=4
+	Set gtmtypes("jrec_rsrv_elem_t",2,"type")="unsigned-int"
+	Set gtmtypfldindx("jrec_rsrv_elem_t","reclen")=2
+	Set gtmtypes("jrec_rsrv_elem_t",3,"name")="jrec_rsrv_elem_t.param1"
+	Set gtmtypes("jrec_rsrv_elem_t",3,"off")=8
+	Set gtmtypes("jrec_rsrv_elem_t",3,"len")=4
+	Set gtmtypes("jrec_rsrv_elem_t",3,"type")="addr"
+	Set gtmtypfldindx("jrec_rsrv_elem_t","param1")=3
+	;
 	Set gtmtypes("key_cum_value")="struct"
 	Set gtmtypes("key_cum_value",0)=11
 	Set gtmtypes("key_cum_value","len")=1076
@@ -13156,6 +13639,362 @@ Init
 	Set gtmtypes("lv_xnew_var",6,"type")="addr"
 	Set gtmtypfldindx("lv_xnew_var","lvval")=6
 	;
+	Set gtmtypes("lvmon_value_ent")="struct"
+	Set gtmtypes("lvmon_value_ent",0)=31
+	Set gtmtypes("lvmon_value_ent","len")=84
+	Set gtmtypes("lvmon_value_ent",1,"name")="lvmon_value_ent.varlvval"
+	Set gtmtypes("lvmon_value_ent",1,"off")=0
+	Set gtmtypes("lvmon_value_ent",1,"len")=68
+	Set gtmtypes("lvmon_value_ent",1,"type")="lv_val"
+	Set gtmtypfldindx("lvmon_value_ent","varlvval")=1
+	Set gtmtypes("lvmon_value_ent",2,"name")="lvmon_value_ent.varlvval.v"
+	Set gtmtypes("lvmon_value_ent",2,"off")=0
+	Set gtmtypes("lvmon_value_ent",2,"len")=32
+	Set gtmtypes("lvmon_value_ent",2,"type")="mval"
+	Set gtmtypfldindx("lvmon_value_ent","varlvval.v")=2
+	Set gtmtypes("lvmon_value_ent",3,"name")="lvmon_value_ent.varlvval.v.mvtype"
+	Set gtmtypes("lvmon_value_ent",3,"off")=0
+	Set gtmtypes("lvmon_value_ent",3,"len")=2
+	Set gtmtypes("lvmon_value_ent",3,"type")="unsigned-short"
+	Set gtmtypfldindx("lvmon_value_ent","varlvval.v.mvtype")=3
+	Set gtmtypes("lvmon_value_ent",4,"name")="lvmon_value_ent.varlvval.v.fnpc_indx"
+	Set gtmtypes("lvmon_value_ent",4,"off")=3
+	Set gtmtypes("lvmon_value_ent",4,"len")=1
+	Set gtmtypes("lvmon_value_ent",4,"type")="unsigned-char"
+	Set gtmtypfldindx("lvmon_value_ent","varlvval.v.fnpc_indx")=4
+	Set gtmtypes("lvmon_value_ent",5,"name")="lvmon_value_ent.varlvval.v.utfcgr_indx"
+	Set gtmtypes("lvmon_value_ent",5,"off")=4
+	Set gtmtypes("lvmon_value_ent",5,"len")=4
+	Set gtmtypes("lvmon_value_ent",5,"type")="unsigned-int"
+	Set gtmtypfldindx("lvmon_value_ent","varlvval.v.utfcgr_indx")=5
+	Set gtmtypes("lvmon_value_ent",6,"name")="lvmon_value_ent.varlvval.v.filler2"
+	Set gtmtypes("lvmon_value_ent",6,"off")=8
+	Set gtmtypes("lvmon_value_ent",6,"len")=4
+	Set gtmtypes("lvmon_value_ent",6,"type")="unsigned-int"
+	Set gtmtypfldindx("lvmon_value_ent","varlvval.v.filler2")=6
+	Set gtmtypes("lvmon_value_ent",7,"name")="lvmon_value_ent.varlvval.v.m"
+	Set gtmtypes("lvmon_value_ent",7,"off")=12
+	Set gtmtypes("lvmon_value_ent",7,"len")=8
+	Set gtmtypes("lvmon_value_ent",7,"type")="int"
+	Set gtmtypfldindx("lvmon_value_ent","varlvval.v.m")=7
+	Set gtmtypes("lvmon_value_ent",7,"dim")=2
+	Set gtmtypes("lvmon_value_ent",8,"name")="lvmon_value_ent.varlvval.v.str"
+	Set gtmtypes("lvmon_value_ent",8,"off")=20
+	Set gtmtypes("lvmon_value_ent",8,"len")=12
+	Set gtmtypes("lvmon_value_ent",8,"type")="mstr"
+	Set gtmtypfldindx("lvmon_value_ent","varlvval.v.str")=8
+	Set gtmtypes("lvmon_value_ent",9,"name")="lvmon_value_ent.varlvval.ptrs"
+	Set gtmtypes("lvmon_value_ent",9,"off")=32
+	Set gtmtypes("lvmon_value_ent",9,"len")=8
+	Set gtmtypes("lvmon_value_ent",9,"type")="union"
+	Set gtmtypfldindx("lvmon_value_ent","varlvval.ptrs")=9
+	Set gtmtypes("lvmon_value_ent",10,"name")="lvmon_value_ent.varlvval.ptrs.val_ent"
+	Set gtmtypes("lvmon_value_ent",10,"off")=32
+	Set gtmtypes("lvmon_value_ent",10,"len")=8
+	Set gtmtypes("lvmon_value_ent",10,"type")="struct"
+	Set gtmtypfldindx("lvmon_value_ent","varlvval.ptrs.val_ent")=10
+	Set gtmtypes("lvmon_value_ent",11,"name")="lvmon_value_ent.varlvval.ptrs.val_ent.children"
+	Set gtmtypes("lvmon_value_ent",11,"off")=32
+	Set gtmtypes("lvmon_value_ent",11,"len")=4
+	Set gtmtypes("lvmon_value_ent",11,"type")="addr"
+	Set gtmtypfldindx("lvmon_value_ent","varlvval.ptrs.val_ent.children")=11
+	Set gtmtypes("lvmon_value_ent",12,"name")="lvmon_value_ent.varlvval.ptrs.val_ent.parent"
+	Set gtmtypes("lvmon_value_ent",12,"off")=36
+	Set gtmtypes("lvmon_value_ent",12,"len")=4
+	Set gtmtypes("lvmon_value_ent",12,"type")="union"
+	Set gtmtypfldindx("lvmon_value_ent","varlvval.ptrs.val_ent.parent")=12
+	Set gtmtypes("lvmon_value_ent",13,"name")="lvmon_value_ent.varlvval.ptrs.val_ent.parent.sym"
+	Set gtmtypes("lvmon_value_ent",13,"off")=36
+	Set gtmtypes("lvmon_value_ent",13,"len")=4
+	Set gtmtypes("lvmon_value_ent",13,"type")="addr"
+	Set gtmtypfldindx("lvmon_value_ent","varlvval.ptrs.val_ent.parent.sym")=13
+	Set gtmtypes("lvmon_value_ent",14,"name")="lvmon_value_ent.varlvval.ptrs.val_ent.parent.sbs_tree"
+	Set gtmtypes("lvmon_value_ent",14,"off")=36
+	Set gtmtypes("lvmon_value_ent",14,"len")=4
+	Set gtmtypes("lvmon_value_ent",14,"type")="addr"
+	Set gtmtypfldindx("lvmon_value_ent","varlvval.ptrs.val_ent.parent.sbs_tree")=14
+	Set gtmtypes("lvmon_value_ent",15,"name")="lvmon_value_ent.varlvval.ptrs.free_ent"
+	Set gtmtypes("lvmon_value_ent",15,"off")=32
+	Set gtmtypes("lvmon_value_ent",15,"len")=4
+	Set gtmtypes("lvmon_value_ent",15,"type")="struct"
+	Set gtmtypfldindx("lvmon_value_ent","varlvval.ptrs.free_ent")=15
+	Set gtmtypes("lvmon_value_ent",16,"name")="lvmon_value_ent.varlvval.ptrs.free_ent.next_free"
+	Set gtmtypes("lvmon_value_ent",16,"off")=32
+	Set gtmtypes("lvmon_value_ent",16,"len")=4
+	Set gtmtypes("lvmon_value_ent",16,"type")="addr"
+	Set gtmtypfldindx("lvmon_value_ent","varlvval.ptrs.free_ent.next_free")=16
+	Set gtmtypes("lvmon_value_ent",17,"name")="lvmon_value_ent.varlvval.ptrs.copy_loc"
+	Set gtmtypes("lvmon_value_ent",17,"off")=32
+	Set gtmtypes("lvmon_value_ent",17,"len")=4
+	Set gtmtypes("lvmon_value_ent",17,"type")="struct"
+	Set gtmtypfldindx("lvmon_value_ent","varlvval.ptrs.copy_loc")=17
+	Set gtmtypes("lvmon_value_ent",18,"name")="lvmon_value_ent.varlvval.ptrs.copy_loc.newtablv"
+	Set gtmtypes("lvmon_value_ent",18,"off")=32
+	Set gtmtypes("lvmon_value_ent",18,"len")=4
+	Set gtmtypes("lvmon_value_ent",18,"type")="addr"
+	Set gtmtypfldindx("lvmon_value_ent","varlvval.ptrs.copy_loc.newtablv")=18
+	Set gtmtypes("lvmon_value_ent",19,"name")="lvmon_value_ent.varlvval.stats"
+	Set gtmtypes("lvmon_value_ent",19,"off")=40
+	Set gtmtypes("lvmon_value_ent",19,"len")=16
+	Set gtmtypes("lvmon_value_ent",19,"type")="struct"
+	Set gtmtypfldindx("lvmon_value_ent","varlvval.stats")=19
+	Set gtmtypes("lvmon_value_ent",20,"name")="lvmon_value_ent.varlvval.stats.trefcnt"
+	Set gtmtypes("lvmon_value_ent",20,"off")=40
+	Set gtmtypes("lvmon_value_ent",20,"len")=4
+	Set gtmtypes("lvmon_value_ent",20,"type")="int"
+	Set gtmtypfldindx("lvmon_value_ent","varlvval.stats.trefcnt")=20
+	Set gtmtypes("lvmon_value_ent",21,"name")="lvmon_value_ent.varlvval.stats.crefcnt"
+	Set gtmtypes("lvmon_value_ent",21,"off")=44
+	Set gtmtypes("lvmon_value_ent",21,"len")=4
+	Set gtmtypes("lvmon_value_ent",21,"type")="int"
+	Set gtmtypfldindx("lvmon_value_ent","varlvval.stats.crefcnt")=21
+	Set gtmtypes("lvmon_value_ent",22,"name")="lvmon_value_ent.varlvval.stats.tstartcycle"
+	Set gtmtypes("lvmon_value_ent",22,"off")=48
+	Set gtmtypes("lvmon_value_ent",22,"len")=4
+	Set gtmtypes("lvmon_value_ent",22,"type")="unsigned-int"
+	Set gtmtypfldindx("lvmon_value_ent","varlvval.stats.tstartcycle")=22
+	Set gtmtypes("lvmon_value_ent",23,"name")="lvmon_value_ent.varlvval.stats.lvtaskcycle"
+	Set gtmtypes("lvmon_value_ent",23,"off")=52
+	Set gtmtypes("lvmon_value_ent",23,"len")=4
+	Set gtmtypes("lvmon_value_ent",23,"type")="unsigned-int"
+	Set gtmtypfldindx("lvmon_value_ent","varlvval.stats.lvtaskcycle")=23
+	Set gtmtypes("lvmon_value_ent",24,"name")="lvmon_value_ent.varlvval.has_aliascont"
+	Set gtmtypes("lvmon_value_ent",24,"off")=56
+	Set gtmtypes("lvmon_value_ent",24,"len")=4
+	Set gtmtypes("lvmon_value_ent",24,"type")="boolean_t"
+	Set gtmtypfldindx("lvmon_value_ent","varlvval.has_aliascont")=24
+	Set gtmtypes("lvmon_value_ent",25,"name")="lvmon_value_ent.varlvval.lvmon_mark"
+	Set gtmtypes("lvmon_value_ent",25,"off")=60
+	Set gtmtypes("lvmon_value_ent",25,"len")=4
+	Set gtmtypes("lvmon_value_ent",25,"type")="boolean_t"
+	Set gtmtypfldindx("lvmon_value_ent","varlvval.lvmon_mark")=25
+	Set gtmtypes("lvmon_value_ent",26,"name")="lvmon_value_ent.varlvval.tp_var"
+	Set gtmtypes("lvmon_value_ent",26,"off")=64
+	Set gtmtypes("lvmon_value_ent",26,"len")=4
+	Set gtmtypes("lvmon_value_ent",26,"type")="addr"
+	Set gtmtypfldindx("lvmon_value_ent","varlvval.tp_var")=26
+	Set gtmtypes("lvmon_value_ent",27,"name")="lvmon_value_ent.varvalue"
+	Set gtmtypes("lvmon_value_ent",27,"off")=68
+	Set gtmtypes("lvmon_value_ent",27,"len")=12
+	Set gtmtypes("lvmon_value_ent",27,"type")="mstr"
+	Set gtmtypfldindx("lvmon_value_ent","varvalue")=27
+	Set gtmtypes("lvmon_value_ent",28,"name")="lvmon_value_ent.varvalue.char_len"
+	Set gtmtypes("lvmon_value_ent",28,"off")=68
+	Set gtmtypes("lvmon_value_ent",28,"len")=4
+	Set gtmtypes("lvmon_value_ent",28,"type")="unsigned-int"
+	Set gtmtypfldindx("lvmon_value_ent","varvalue.char_len")=28
+	Set gtmtypes("lvmon_value_ent",29,"name")="lvmon_value_ent.varvalue.len"
+	Set gtmtypes("lvmon_value_ent",29,"off")=72
+	Set gtmtypes("lvmon_value_ent",29,"len")=4
+	Set gtmtypes("lvmon_value_ent",29,"type")="int"
+	Set gtmtypfldindx("lvmon_value_ent","varvalue.len")=29
+	Set gtmtypes("lvmon_value_ent",30,"name")="lvmon_value_ent.varvalue.addr"
+	Set gtmtypes("lvmon_value_ent",30,"off")=76
+	Set gtmtypes("lvmon_value_ent",30,"len")=4
+	Set gtmtypes("lvmon_value_ent",30,"type")="addr"
+	Set gtmtypfldindx("lvmon_value_ent","varvalue.addr")=30
+	Set gtmtypes("lvmon_value_ent",31,"name")="lvmon_value_ent.alloclen"
+	Set gtmtypes("lvmon_value_ent",31,"off")=80
+	Set gtmtypes("lvmon_value_ent",31,"len")=4
+	Set gtmtypes("lvmon_value_ent",31,"type")="unsigned-int"
+	Set gtmtypfldindx("lvmon_value_ent","alloclen")=31
+	;
+	Set gtmtypes("lvmon_var")="struct"
+	Set gtmtypes("lvmon_var",0)=38
+	Set gtmtypes("lvmon_var","len")=200
+	Set gtmtypes("lvmon_var",1,"name")="lvmon_var.lvmv"
+	Set gtmtypes("lvmon_var",1,"off")=0
+	Set gtmtypes("lvmon_var",1,"len")=20
+	Set gtmtypes("lvmon_var",1,"type")="mname_entry"
+	Set gtmtypfldindx("lvmon_var","lvmv")=1
+	Set gtmtypes("lvmon_var",2,"name")="lvmon_var.lvmv.var_name"
+	Set gtmtypes("lvmon_var",2,"off")=0
+	Set gtmtypes("lvmon_var",2,"len")=12
+	Set gtmtypes("lvmon_var",2,"type")="mstr"
+	Set gtmtypfldindx("lvmon_var","lvmv.var_name")=2
+	Set gtmtypes("lvmon_var",3,"name")="lvmon_var.lvmv.hash_code"
+	Set gtmtypes("lvmon_var",3,"off")=12
+	Set gtmtypes("lvmon_var",3,"len")=4
+	Set gtmtypes("lvmon_var",3,"type")="unsigned-int"
+	Set gtmtypfldindx("lvmon_var","lvmv.hash_code")=3
+	Set gtmtypes("lvmon_var",4,"name")="lvmon_var.lvmv.marked"
+	Set gtmtypes("lvmon_var",4,"off")=16
+	Set gtmtypes("lvmon_var",4,"len")=4
+	Set gtmtypes("lvmon_var",4,"type")="boolean_t"
+	Set gtmtypfldindx("lvmon_var","lvmv.marked")=4
+	Set gtmtypes("lvmon_var",5,"name")="lvmon_var.varlvadr"
+	Set gtmtypes("lvmon_var",5,"off")=20
+	Set gtmtypes("lvmon_var",5,"len")=4
+	Set gtmtypes("lvmon_var",5,"type")="addr"
+	Set gtmtypfldindx("lvmon_var","varlvadr")=5
+	Set gtmtypes("lvmon_var",6,"name")="lvmon_var.curr_symval_cycle"
+	Set gtmtypes("lvmon_var",6,"off")=24
+	Set gtmtypes("lvmon_var",6,"len")=8
+	Set gtmtypes("lvmon_var",6,"type")="gtm_int8"
+	Set gtmtypfldindx("lvmon_var","curr_symval_cycle")=6
+	Set gtmtypes("lvmon_var",7,"name")="lvmon_var.values"
+	Set gtmtypes("lvmon_var",7,"off")=32
+	Set gtmtypes("lvmon_var",7,"len")=168
+	Set gtmtypes("lvmon_var",7,"type")="lvmon_value_ent"
+	Set gtmtypfldindx("lvmon_var","values")=7
+	Set gtmtypes("lvmon_var",7,"dim")=2
+	Set gtmtypes("lvmon_var",8,"name")="lvmon_var.values[0].varlvval"
+	Set gtmtypes("lvmon_var",8,"off")=32
+	Set gtmtypes("lvmon_var",8,"len")=68
+	Set gtmtypes("lvmon_var",8,"type")="lv_val"
+	Set gtmtypfldindx("lvmon_var","values[0].varlvval")=8
+	Set gtmtypes("lvmon_var",9,"name")="lvmon_var.values[0].varlvval.v"
+	Set gtmtypes("lvmon_var",9,"off")=32
+	Set gtmtypes("lvmon_var",9,"len")=32
+	Set gtmtypes("lvmon_var",9,"type")="mval"
+	Set gtmtypfldindx("lvmon_var","values[0].varlvval.v")=9
+	Set gtmtypes("lvmon_var",10,"name")="lvmon_var.values[0].varlvval.v.mvtype"
+	Set gtmtypes("lvmon_var",10,"off")=32
+	Set gtmtypes("lvmon_var",10,"len")=2
+	Set gtmtypes("lvmon_var",10,"type")="unsigned-short"
+	Set gtmtypfldindx("lvmon_var","values[0].varlvval.v.mvtype")=10
+	Set gtmtypes("lvmon_var",11,"name")="lvmon_var.values[0].varlvval.v.fnpc_indx"
+	Set gtmtypes("lvmon_var",11,"off")=35
+	Set gtmtypes("lvmon_var",11,"len")=1
+	Set gtmtypes("lvmon_var",11,"type")="unsigned-char"
+	Set gtmtypfldindx("lvmon_var","values[0].varlvval.v.fnpc_indx")=11
+	Set gtmtypes("lvmon_var",12,"name")="lvmon_var.values[0].varlvval.v.utfcgr_indx"
+	Set gtmtypes("lvmon_var",12,"off")=36
+	Set gtmtypes("lvmon_var",12,"len")=4
+	Set gtmtypes("lvmon_var",12,"type")="unsigned-int"
+	Set gtmtypfldindx("lvmon_var","values[0].varlvval.v.utfcgr_indx")=12
+	Set gtmtypes("lvmon_var",13,"name")="lvmon_var.values[0].varlvval.v.filler2"
+	Set gtmtypes("lvmon_var",13,"off")=40
+	Set gtmtypes("lvmon_var",13,"len")=4
+	Set gtmtypes("lvmon_var",13,"type")="unsigned-int"
+	Set gtmtypfldindx("lvmon_var","values[0].varlvval.v.filler2")=13
+	Set gtmtypes("lvmon_var",14,"name")="lvmon_var.values[0].varlvval.v.m"
+	Set gtmtypes("lvmon_var",14,"off")=44
+	Set gtmtypes("lvmon_var",14,"len")=8
+	Set gtmtypes("lvmon_var",14,"type")="int"
+	Set gtmtypfldindx("lvmon_var","values[0].varlvval.v.m")=14
+	Set gtmtypes("lvmon_var",14,"dim")=2
+	Set gtmtypes("lvmon_var",15,"name")="lvmon_var.values[0].varlvval.v.str"
+	Set gtmtypes("lvmon_var",15,"off")=52
+	Set gtmtypes("lvmon_var",15,"len")=12
+	Set gtmtypes("lvmon_var",15,"type")="mstr"
+	Set gtmtypfldindx("lvmon_var","values[0].varlvval.v.str")=15
+	Set gtmtypes("lvmon_var",16,"name")="lvmon_var.values[0].varlvval.ptrs"
+	Set gtmtypes("lvmon_var",16,"off")=64
+	Set gtmtypes("lvmon_var",16,"len")=8
+	Set gtmtypes("lvmon_var",16,"type")="union"
+	Set gtmtypfldindx("lvmon_var","values[0].varlvval.ptrs")=16
+	Set gtmtypes("lvmon_var",17,"name")="lvmon_var.values[0].varlvval.ptrs.val_ent"
+	Set gtmtypes("lvmon_var",17,"off")=64
+	Set gtmtypes("lvmon_var",17,"len")=8
+	Set gtmtypes("lvmon_var",17,"type")="struct"
+	Set gtmtypfldindx("lvmon_var","values[0].varlvval.ptrs.val_ent")=17
+	Set gtmtypes("lvmon_var",18,"name")="lvmon_var.values[0].varlvval.ptrs.val_ent.children"
+	Set gtmtypes("lvmon_var",18,"off")=64
+	Set gtmtypes("lvmon_var",18,"len")=4
+	Set gtmtypes("lvmon_var",18,"type")="addr"
+	Set gtmtypfldindx("lvmon_var","values[0].varlvval.ptrs.val_ent.children")=18
+	Set gtmtypes("lvmon_var",19,"name")="lvmon_var.values[0].varlvval.ptrs.val_ent.parent"
+	Set gtmtypes("lvmon_var",19,"off")=68
+	Set gtmtypes("lvmon_var",19,"len")=4
+	Set gtmtypes("lvmon_var",19,"type")="union"
+	Set gtmtypfldindx("lvmon_var","values[0].varlvval.ptrs.val_ent.parent")=19
+	Set gtmtypes("lvmon_var",20,"name")="lvmon_var.values[0].varlvval.ptrs.val_ent.parent.sym"
+	Set gtmtypes("lvmon_var",20,"off")=68
+	Set gtmtypes("lvmon_var",20,"len")=4
+	Set gtmtypes("lvmon_var",20,"type")="addr"
+	Set gtmtypfldindx("lvmon_var","values[0].varlvval.ptrs.val_ent.parent.sym")=20
+	Set gtmtypes("lvmon_var",21,"name")="lvmon_var.values[0].varlvval.ptrs.val_ent.parent.sbs_tree"
+	Set gtmtypes("lvmon_var",21,"off")=68
+	Set gtmtypes("lvmon_var",21,"len")=4
+	Set gtmtypes("lvmon_var",21,"type")="addr"
+	Set gtmtypfldindx("lvmon_var","values[0].varlvval.ptrs.val_ent.parent.sbs_tree")=21
+	Set gtmtypes("lvmon_var",22,"name")="lvmon_var.values[0].varlvval.ptrs.free_ent"
+	Set gtmtypes("lvmon_var",22,"off")=64
+	Set gtmtypes("lvmon_var",22,"len")=4
+	Set gtmtypes("lvmon_var",22,"type")="struct"
+	Set gtmtypfldindx("lvmon_var","values[0].varlvval.ptrs.free_ent")=22
+	Set gtmtypes("lvmon_var",23,"name")="lvmon_var.values[0].varlvval.ptrs.free_ent.next_free"
+	Set gtmtypes("lvmon_var",23,"off")=64
+	Set gtmtypes("lvmon_var",23,"len")=4
+	Set gtmtypes("lvmon_var",23,"type")="addr"
+	Set gtmtypfldindx("lvmon_var","values[0].varlvval.ptrs.free_ent.next_free")=23
+	Set gtmtypes("lvmon_var",24,"name")="lvmon_var.values[0].varlvval.ptrs.copy_loc"
+	Set gtmtypes("lvmon_var",24,"off")=64
+	Set gtmtypes("lvmon_var",24,"len")=4
+	Set gtmtypes("lvmon_var",24,"type")="struct"
+	Set gtmtypfldindx("lvmon_var","values[0].varlvval.ptrs.copy_loc")=24
+	Set gtmtypes("lvmon_var",25,"name")="lvmon_var.values[0].varlvval.ptrs.copy_loc.newtablv"
+	Set gtmtypes("lvmon_var",25,"off")=64
+	Set gtmtypes("lvmon_var",25,"len")=4
+	Set gtmtypes("lvmon_var",25,"type")="addr"
+	Set gtmtypfldindx("lvmon_var","values[0].varlvval.ptrs.copy_loc.newtablv")=25
+	Set gtmtypes("lvmon_var",26,"name")="lvmon_var.values[0].varlvval.stats"
+	Set gtmtypes("lvmon_var",26,"off")=72
+	Set gtmtypes("lvmon_var",26,"len")=16
+	Set gtmtypes("lvmon_var",26,"type")="struct"
+	Set gtmtypfldindx("lvmon_var","values[0].varlvval.stats")=26
+	Set gtmtypes("lvmon_var",27,"name")="lvmon_var.values[0].varlvval.stats.trefcnt"
+	Set gtmtypes("lvmon_var",27,"off")=72
+	Set gtmtypes("lvmon_var",27,"len")=4
+	Set gtmtypes("lvmon_var",27,"type")="int"
+	Set gtmtypfldindx("lvmon_var","values[0].varlvval.stats.trefcnt")=27
+	Set gtmtypes("lvmon_var",28,"name")="lvmon_var.values[0].varlvval.stats.crefcnt"
+	Set gtmtypes("lvmon_var",28,"off")=76
+	Set gtmtypes("lvmon_var",28,"len")=4
+	Set gtmtypes("lvmon_var",28,"type")="int"
+	Set gtmtypfldindx("lvmon_var","values[0].varlvval.stats.crefcnt")=28
+	Set gtmtypes("lvmon_var",29,"name")="lvmon_var.values[0].varlvval.stats.tstartcycle"
+	Set gtmtypes("lvmon_var",29,"off")=80
+	Set gtmtypes("lvmon_var",29,"len")=4
+	Set gtmtypes("lvmon_var",29,"type")="unsigned-int"
+	Set gtmtypfldindx("lvmon_var","values[0].varlvval.stats.tstartcycle")=29
+	Set gtmtypes("lvmon_var",30,"name")="lvmon_var.values[0].varlvval.stats.lvtaskcycle"
+	Set gtmtypes("lvmon_var",30,"off")=84
+	Set gtmtypes("lvmon_var",30,"len")=4
+	Set gtmtypes("lvmon_var",30,"type")="unsigned-int"
+	Set gtmtypfldindx("lvmon_var","values[0].varlvval.stats.lvtaskcycle")=30
+	Set gtmtypes("lvmon_var",31,"name")="lvmon_var.values[0].varlvval.has_aliascont"
+	Set gtmtypes("lvmon_var",31,"off")=88
+	Set gtmtypes("lvmon_var",31,"len")=4
+	Set gtmtypes("lvmon_var",31,"type")="boolean_t"
+	Set gtmtypfldindx("lvmon_var","values[0].varlvval.has_aliascont")=31
+	Set gtmtypes("lvmon_var",32,"name")="lvmon_var.values[0].varlvval.lvmon_mark"
+	Set gtmtypes("lvmon_var",32,"off")=92
+	Set gtmtypes("lvmon_var",32,"len")=4
+	Set gtmtypes("lvmon_var",32,"type")="boolean_t"
+	Set gtmtypfldindx("lvmon_var","values[0].varlvval.lvmon_mark")=32
+	Set gtmtypes("lvmon_var",33,"name")="lvmon_var.values[0].varlvval.tp_var"
+	Set gtmtypes("lvmon_var",33,"off")=96
+	Set gtmtypes("lvmon_var",33,"len")=4
+	Set gtmtypes("lvmon_var",33,"type")="addr"
+	Set gtmtypfldindx("lvmon_var","values[0].varlvval.tp_var")=33
+	Set gtmtypes("lvmon_var",34,"name")="lvmon_var.values[0].varvalue"
+	Set gtmtypes("lvmon_var",34,"off")=100
+	Set gtmtypes("lvmon_var",34,"len")=12
+	Set gtmtypes("lvmon_var",34,"type")="mstr"
+	Set gtmtypfldindx("lvmon_var","values[0].varvalue")=34
+	Set gtmtypes("lvmon_var",35,"name")="lvmon_var.values[0].varvalue.char_len"
+	Set gtmtypes("lvmon_var",35,"off")=100
+	Set gtmtypes("lvmon_var",35,"len")=4
+	Set gtmtypes("lvmon_var",35,"type")="unsigned-int"
+	Set gtmtypfldindx("lvmon_var","values[0].varvalue.char_len")=35
+	Set gtmtypes("lvmon_var",36,"name")="lvmon_var.values[0].varvalue.len"
+	Set gtmtypes("lvmon_var",36,"off")=104
+	Set gtmtypes("lvmon_var",36,"len")=4
+	Set gtmtypes("lvmon_var",36,"type")="int"
+	Set gtmtypfldindx("lvmon_var","values[0].varvalue.len")=36
+	Set gtmtypes("lvmon_var",37,"name")="lvmon_var.values[0].varvalue.addr"
+	Set gtmtypes("lvmon_var",37,"off")=108
+	Set gtmtypes("lvmon_var",37,"len")=4
+	Set gtmtypes("lvmon_var",37,"type")="addr"
+	Set gtmtypfldindx("lvmon_var","values[0].varvalue.addr")=37
+	Set gtmtypes("lvmon_var",38,"name")="lvmon_var.values[0].alloclen"
+	Set gtmtypes("lvmon_var",38,"off")=112
+	Set gtmtypes("lvmon_var",38,"len")=4
+	Set gtmtypes("lvmon_var",38,"type")="unsigned-int"
+	Set gtmtypfldindx("lvmon_var","values[0].alloclen")=38
+	;
 	Set gtmtypes("lvname_info")="struct"
 	Set gtmtypes("lvname_info",0)=4
 	Set gtmtypes("lvname_info","len")=140
@@ -13392,8 +14231,8 @@ Init
 	Set gtmtypfldindx("mlabel","gbl")=9
 	;
 	Set gtmtypes("mline")="struct"
-	Set gtmtypes("mline",0)=6
-	Set gtmtypes("mline","len")=24
+	Set gtmtypes("mline",0)=7
+	Set gtmtypes("mline","len")=28
 	Set gtmtypes("mline",1,"name")="mline.parent"
 	Set gtmtypes("mline",1,"off")=0
 	Set gtmtypes("mline",1,"len")=4
@@ -13424,6 +14263,11 @@ Init
 	Set gtmtypes("mline",6,"len")=4
 	Set gtmtypes("mline",6,"type")="boolean_t"
 	Set gtmtypfldindx("mline","table")=6
+	Set gtmtypes("mline",7,"name")="mline.block_ok"
+	Set gtmtypes("mline",7,"off")=24
+	Set gtmtypes("mline",7,"len")=4
+	Set gtmtypes("mline",7,"type")="boolean_t"
+	Set gtmtypfldindx("mline","block_ok")=7
 	;
 	Set gtmtypes("mliteral")="struct"
 	Set gtmtypes("mliteral",0)=12
@@ -17089,8 +17933,8 @@ Init
 	Set gtmtypfldindx("nametabent","name")=2
 	;
 	Set gtmtypes("node_local")="struct"
-	Set gtmtypes("node_local",0)=249
-	Set gtmtypes("node_local","len")=104768
+	Set gtmtypes("node_local",0)=250
+	Set gtmtypes("node_local","len")=104776
 	Set gtmtypes("node_local",1,"name")="node_local.label"
 	Set gtmtypes("node_local",1,"off")=0
 	Set gtmtypes("node_local",1,"len")=12
@@ -18227,126 +19071,131 @@ Init
 	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,"name")="node_local.update_underway_tn"
 	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",226,"len")=8
+	Set gtmtypes("node_local",226,"type")="uint64_t"
+	Set gtmtypfldindx("node_local","update_underway_tn")=226
+	Set gtmtypes("node_local",227,"name")="node_local.lastwriterbypas_msg_issued"
+	Set gtmtypes("node_local",227,"off")=104704
 	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 gtmtypfldindx("node_local","lastwriterbypas_msg_issued")=227
+	Set gtmtypes("node_local",228,"name")="node_local.first_writer_seen"
+	Set gtmtypes("node_local",228,"off")=104708
 	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 gtmtypfldindx("node_local","first_writer_seen")=228
+	Set gtmtypes("node_local",229,"name")="node_local.first_nonbypas_writer_seen"
+	Set gtmtypes("node_local",229,"off")=104712
 	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 gtmtypfldindx("node_local","first_nonbypas_writer_seen")=229
+	Set gtmtypes("node_local",230,"name")="node_local.ftok_counter_halted"
+	Set gtmtypes("node_local",230,"off")=104716
 	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 gtmtypfldindx("node_local","ftok_counter_halted")=230
+	Set gtmtypes("node_local",231,"name")="node_local.access_counter_halted"
+	Set gtmtypes("node_local",231,"off")=104720
 	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 gtmtypfldindx("node_local","access_counter_halted")=231
+	Set gtmtypes("node_local",232,"name")="node_local.statsdb_created"
+	Set gtmtypes("node_local",232,"off")=104724
 	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",232,"type")="boolean_t"
+	Set gtmtypfldindx("node_local","statsdb_created")=232
+	Set gtmtypes("node_local",233,"name")="node_local.statsdb_fname_len"
+	Set gtmtypes("node_local",233,"off")=104728
 	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",233,"type")="unsigned-int"
+	Set gtmtypfldindx("node_local","statsdb_fname_len")=233
+	Set gtmtypes("node_local",234,"name")="node_local.statsdb_rundown_clean"
+	Set gtmtypes("node_local",234,"off")=104732
+	Set gtmtypes("node_local",234,"len")=4
+	Set gtmtypes("node_local",234,"type")="boolean_t"
+	Set gtmtypfldindx("node_local","statsdb_rundown_clean")=234
+	Set gtmtypes("node_local",235,"name")="node_local.freeze_latch"
+	Set gtmtypes("node_local",235,"off")=104736
 	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",235,"type")="global_latch_t"
+	Set gtmtypfldindx("node_local","freeze_latch")=235
+	Set gtmtypes("node_local",236,"name")="node_local.freeze_latch.u"
+	Set gtmtypes("node_local",236,"off")=104736
 	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",236,"type")="union"
+	Set gtmtypfldindx("node_local","freeze_latch.u")=236
+	Set gtmtypes("node_local",237,"name")="node_local.freeze_latch.u.pid_imgcnt"
+	Set gtmtypes("node_local",237,"off")=104736
 	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",237,"type")="uint64_t"
+	Set gtmtypfldindx("node_local","freeze_latch.u.pid_imgcnt")=237
+	Set gtmtypes("node_local",238,"name")="node_local.freeze_latch.u.parts"
+	Set gtmtypes("node_local",238,"off")=104736
+	Set gtmtypes("node_local",238,"len")=8
+	Set gtmtypes("node_local",238,"type")="struct"
+	Set gtmtypfldindx("node_local","freeze_latch.u.parts")=238
+	Set gtmtypes("node_local",239,"name")="node_local.freeze_latch.u.parts.latch_pid"
+	Set gtmtypes("node_local",239,"off")=104736
 	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 gtmtypfldindx("node_local","freeze_latch.u.parts.latch_pid")=239
+	Set gtmtypes("node_local",240,"name")="node_local.freeze_latch.u.parts.latch_word"
+	Set gtmtypes("node_local",240,"off")=104740
+	Set gtmtypes("node_local",240,"len")=4
+	Set gtmtypes("node_local",240,"type")="int"
+	Set gtmtypfldindx("node_local","freeze_latch.u.parts.latch_word")=240
+	Set gtmtypes("node_local",241,"name")="node_local.wcs_buffs_freed"
 	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 gtmtypfldindx("node_local","wcs_buffs_freed")=241
+	Set gtmtypes("node_local",242,"name")="node_local.dskspace_next_fire"
 	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",242,"type")="uint64_t"
+	Set gtmtypfldindx("node_local","dskspace_next_fire")=242
+	Set gtmtypes("node_local",243,"name")="node_local.lock_crit"
+	Set gtmtypes("node_local",243,"off")=104760
 	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",243,"type")="global_latch_t"
+	Set gtmtypfldindx("node_local","lock_crit")=243
+	Set gtmtypes("node_local",244,"name")="node_local.lock_crit.u"
+	Set gtmtypes("node_local",244,"off")=104760
 	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",244,"type")="union"
+	Set gtmtypfldindx("node_local","lock_crit.u")=244
+	Set gtmtypes("node_local",245,"name")="node_local.lock_crit.u.pid_imgcnt"
+	Set gtmtypes("node_local",245,"off")=104760
 	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",245,"type")="uint64_t"
+	Set gtmtypfldindx("node_local","lock_crit.u.pid_imgcnt")=245
+	Set gtmtypes("node_local",246,"name")="node_local.lock_crit.u.parts"
+	Set gtmtypes("node_local",246,"off")=104760
+	Set gtmtypes("node_local",246,"len")=8
+	Set gtmtypes("node_local",246,"type")="struct"
+	Set gtmtypfldindx("node_local","lock_crit.u.parts")=246
+	Set gtmtypes("node_local",247,"name")="node_local.lock_crit.u.parts.latch_pid"
+	Set gtmtypes("node_local",247,"off")=104760
 	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 gtmtypfldindx("node_local","lock_crit.u.parts.latch_pid")=247
+	Set gtmtypes("node_local",248,"name")="node_local.lock_crit.u.parts.latch_word"
+	Set gtmtypes("node_local",248,"off")=104764
 	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 gtmtypfldindx("node_local","lock_crit.u.parts.latch_word")=248
+	Set gtmtypes("node_local",249,"name")="node_local.tp_hint"
+	Set gtmtypes("node_local",249,"off")=104768
 	Set gtmtypes("node_local",249,"len")=4
 	Set gtmtypes("node_local",249,"type")="int"
-	Set gtmtypfldindx("node_local","filler_8byte_align6")=249
+	Set gtmtypfldindx("node_local","tp_hint")=249
+	Set gtmtypes("node_local",250,"name")="node_local.filler_8byte_align6"
+	Set gtmtypes("node_local",250,"off")=104772
+	Set gtmtypes("node_local",250,"len")=4
+	Set gtmtypes("node_local",250,"type")="int"
+	Set gtmtypfldindx("node_local","filler_8byte_align6")=250
 	;
 	Set gtmtypes("noisolation_element")="struct"
 	Set gtmtypes("noisolation_element",0)=2
@@ -19278,6 +20127,106 @@ Init
 	Set gtmtypes("parse_blk",17,"type")="addr"
 	Set gtmtypfldindx("parse_blk","l_ext")=17
 	;
+	Set gtmtypes("parse_save_block")="struct"
+	Set gtmtypes("parse_save_block",0)=19
+	Set gtmtypes("parse_save_block","len")=124
+	Set gtmtypes("parse_save_block",1,"name")="parse_save_block.source_error_found"
+	Set gtmtypes("parse_save_block",1,"off")=0
+	Set gtmtypes("parse_save_block",1,"len")=4
+	Set gtmtypes("parse_save_block",1,"type")="boolean_t"
+	Set gtmtypfldindx("parse_save_block","source_error_found")=1
+	Set gtmtypes("parse_save_block",2,"name")="parse_save_block.source_column"
+	Set gtmtypes("parse_save_block",2,"off")=4
+	Set gtmtypes("parse_save_block",2,"len")=4
+	Set gtmtypes("parse_save_block",2,"type")="int"
+	Set gtmtypfldindx("parse_save_block","source_column")=2
+	Set gtmtypes("parse_save_block",3,"name")="parse_save_block.director_ident_len"
+	Set gtmtypes("parse_save_block",3,"off")=8
+	Set gtmtypes("parse_save_block",3,"len")=4
+	Set gtmtypes("parse_save_block",3,"type")="int"
+	Set gtmtypfldindx("parse_save_block","director_ident_len")=3
+	Set gtmtypes("parse_save_block",4,"name")="parse_save_block.block_level"
+	Set gtmtypes("parse_save_block",4,"off")=12
+	Set gtmtypes("parse_save_block",4,"len")=4
+	Set gtmtypes("parse_save_block",4,"type")="int"
+	Set gtmtypfldindx("parse_save_block","block_level")=4
+	Set gtmtypes("parse_save_block",5,"name")="parse_save_block.source_len"
+	Set gtmtypes("parse_save_block",5,"off")=16
+	Set gtmtypes("parse_save_block",5,"len")=4
+	Set gtmtypes("parse_save_block",5,"type")="int"
+	Set gtmtypfldindx("parse_save_block","source_len")=5
+	Set gtmtypes("parse_save_block",6,"name")="parse_save_block.director_mval"
+	Set gtmtypes("parse_save_block",6,"off")=20
+	Set gtmtypes("parse_save_block",6,"len")=32
+	Set gtmtypes("parse_save_block",6,"type")="mval"
+	Set gtmtypfldindx("parse_save_block","director_mval")=6
+	Set gtmtypes("parse_save_block",7,"name")="parse_save_block.director_mval.mvtype"
+	Set gtmtypes("parse_save_block",7,"off")=20
+	Set gtmtypes("parse_save_block",7,"len")=2
+	Set gtmtypes("parse_save_block",7,"type")="unsigned-short"
+	Set gtmtypfldindx("parse_save_block","director_mval.mvtype")=7
+	Set gtmtypes("parse_save_block",8,"name")="parse_save_block.director_mval.fnpc_indx"
+	Set gtmtypes("parse_save_block",8,"off")=23
+	Set gtmtypes("parse_save_block",8,"len")=1
+	Set gtmtypes("parse_save_block",8,"type")="unsigned-char"
+	Set gtmtypfldindx("parse_save_block","director_mval.fnpc_indx")=8
+	Set gtmtypes("parse_save_block",9,"name")="parse_save_block.director_mval.utfcgr_indx"
+	Set gtmtypes("parse_save_block",9,"off")=24
+	Set gtmtypes("parse_save_block",9,"len")=4
+	Set gtmtypes("parse_save_block",9,"type")="unsigned-int"
+	Set gtmtypfldindx("parse_save_block","director_mval.utfcgr_indx")=9
+	Set gtmtypes("parse_save_block",10,"name")="parse_save_block.director_mval.filler2"
+	Set gtmtypes("parse_save_block",10,"off")=28
+	Set gtmtypes("parse_save_block",10,"len")=4
+	Set gtmtypes("parse_save_block",10,"type")="unsigned-int"
+	Set gtmtypfldindx("parse_save_block","director_mval.filler2")=10
+	Set gtmtypes("parse_save_block",11,"name")="parse_save_block.director_mval.m"
+	Set gtmtypes("parse_save_block",11,"off")=32
+	Set gtmtypes("parse_save_block",11,"len")=8
+	Set gtmtypes("parse_save_block",11,"type")="int"
+	Set gtmtypfldindx("parse_save_block","director_mval.m")=11
+	Set gtmtypes("parse_save_block",11,"dim")=2
+	Set gtmtypes("parse_save_block",12,"name")="parse_save_block.director_mval.str"
+	Set gtmtypes("parse_save_block",12,"off")=40
+	Set gtmtypes("parse_save_block",12,"len")=12
+	Set gtmtypes("parse_save_block",12,"type")="mstr"
+	Set gtmtypfldindx("parse_save_block","director_mval.str")=12
+	Set gtmtypes("parse_save_block",13,"name")="parse_save_block.director_mval.str.char_len"
+	Set gtmtypes("parse_save_block",13,"off")=40
+	Set gtmtypes("parse_save_block",13,"len")=4
+	Set gtmtypes("parse_save_block",13,"type")="unsigned-int"
+	Set gtmtypfldindx("parse_save_block","director_mval.str.char_len")=13
+	Set gtmtypes("parse_save_block",14,"name")="parse_save_block.director_mval.str.len"
+	Set gtmtypes("parse_save_block",14,"off")=44
+	Set gtmtypes("parse_save_block",14,"len")=4
+	Set gtmtypes("parse_save_block",14,"type")="int"
+	Set gtmtypfldindx("parse_save_block","director_mval.str.len")=14
+	Set gtmtypes("parse_save_block",15,"name")="parse_save_block.director_mval.str.addr"
+	Set gtmtypes("parse_save_block",15,"off")=48
+	Set gtmtypes("parse_save_block",15,"len")=4
+	Set gtmtypes("parse_save_block",15,"type")="addr"
+	Set gtmtypfldindx("parse_save_block","director_mval.str.addr")=15
+	Set gtmtypes("parse_save_block",16,"name")="parse_save_block.ident_buffer"
+	Set gtmtypes("parse_save_block",16,"off")=52
+	Set gtmtypes("parse_save_block",16,"len")=63
+	Set gtmtypes("parse_save_block",16,"type")="unsigned-char"
+	Set gtmtypfldindx("parse_save_block","ident_buffer")=16
+	Set gtmtypes("parse_save_block",17,"name")="parse_save_block.director_token"
+	Set gtmtypes("parse_save_block",17,"off")=115
+	Set gtmtypes("parse_save_block",17,"len")=1
+	Set gtmtypes("parse_save_block",17,"type")="char"
+	Set gtmtypfldindx("parse_save_block","director_token")=17
+	Set gtmtypes("parse_save_block",18,"name")="parse_save_block.lexical_ptr"
+	Set gtmtypes("parse_save_block",18,"off")=116
+	Set gtmtypes("parse_save_block",18,"len")=4
+	Set gtmtypes("parse_save_block",18,"type")="addr"
+	Set gtmtypfldindx("parse_save_block","lexical_ptr")=18
+	Set gtmtypes("parse_save_block",19,"name")="parse_save_block.window_token"
+	Set gtmtypes("parse_save_block",19,"off")=120
+	Set gtmtypes("parse_save_block",19,"len")=1
+	Set gtmtypes("parse_save_block",19,"type")="char"
+	Set gtmtypfldindx("parse_save_block","window_token")=19
+	;
 	Set gtmtypes("pat_strlit")="struct"
 	Set gtmtypes("pat_strlit",0)=4
 	Set gtmtypes("pat_strlit","len")=3956
@@ -26169,8 +27118,8 @@ Init
 	Set gtmtypfldindx("sgbg_addrs","fill1")=2
 	;
 	Set gtmtypes("sgm_info")="struct"
-	Set gtmtypes("sgm_info",0)=39
-	Set gtmtypes("sgm_info","len")=160
+	Set gtmtypes("sgm_info",0)=40
+	Set gtmtypes("sgm_info","len")=164
 	Set gtmtypes("sgm_info",1,"name")="sgm_info.next_sgm_info"
 	Set gtmtypes("sgm_info",1,"off")=0
 	Set gtmtypes("sgm_info",1,"len")=4
@@ -26366,6 +27315,11 @@ Init
 	Set gtmtypes("sgm_info",39,"len")=4
 	Set gtmtypes("sgm_info",39,"type")="unsigned-int"
 	Set gtmtypfldindx("sgm_info","tot_jrec_size")=39
+	Set gtmtypes("sgm_info",40,"name")="sgm_info.jbuf_rsrv_ptr"
+	Set gtmtypes("sgm_info",40,"off")=160
+	Set gtmtypes("sgm_info",40,"len")=4
+	Set gtmtypes("sgm_info",40,"type")="addr"
+	Set gtmtypfldindx("sgm_info","jbuf_rsrv_ptr")=40
 	;
 	Set gtmtypes("sgmm_addrs")="struct"
 	Set gtmtypes("sgmm_addrs",0)=1
@@ -26984,7 +27938,7 @@ Init
 	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 gtmtypes("sgmnt_addrs",121,"type")="int"
 	Set gtmtypfldindx("sgmnt_addrs","do_fullblockwrites")=121
 	Set gtmtypes("sgmnt_addrs",122,"name")="sgmnt_addrs.regnum"
 	Set gtmtypes("sgmnt_addrs",122,"off")=712
@@ -27148,7 +28102,7 @@ Init
 	Set gtmtypfldindx("sgmnt_addrs","statsDB_setup_completed")=153
 	;
 	Set gtmtypes("sgmnt_data")="struct"
-	Set gtmtypes("sgmnt_data",0)=586
+	Set gtmtypes("sgmnt_data",0)=592
 	Set gtmtypes("sgmnt_data","len")=8192
 	Set gtmtypes("sgmnt_data",1,"name")="sgmnt_data.label"
 	Set gtmtypes("sgmnt_data",1,"off")=0
@@ -28031,11 +28985,11 @@ Init
 	Set gtmtypes("sgmnt_data",174,"len")=8
 	Set gtmtypes("sgmnt_data",174,"type")="uint64_t"
 	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,"name")="sgmnt_data.wcb_gds_rundown2_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_bgtrcrec1_tn")=175
+	Set gtmtypfldindx("sgmnt_data","wcb_gds_rundown2_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
@@ -28326,11 +29280,11 @@ Init
 	Set gtmtypes("sgmnt_data",233,"len")=8
 	Set gtmtypes("sgmnt_data",233,"type")="uint64_t"
 	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,"name")="sgmnt_data.wcb_wcs_flu0_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_tp_grab_crit_tn")=234
+	Set gtmtypfldindx("sgmnt_data","wcb_wcs_flu0_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
@@ -28351,11 +29305,11 @@ Init
 	Set gtmtypes("sgmnt_data",238,"len")=8
 	Set gtmtypes("sgmnt_data",238,"type")="uint64_t"
 	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,"name")="sgmnt_data.wcb_gds_rundown1_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_gds_rundown_tn")=239
+	Set gtmtypfldindx("sgmnt_data","wcb_gds_rundown1_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
@@ -28711,1391 +29665,1421 @@ Init
 	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,"name")="sgmnt_data.jnlbuff_phs2cmt_array_full_tn"
 	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","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","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","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",311,"len")=8
+	Set gtmtypes("sgmnt_data",311,"type")="uint64_t"
+	Set gtmtypfldindx("sgmnt_data","jnlbuff_phs2cmt_array_full_tn")=311
+	Set gtmtypes("sgmnt_data",312,"name")="sgmnt_data.jnl_phase2_cleanup_if_possible_tn"
+	Set gtmtypes("sgmnt_data",312,"off")=3208
+	Set gtmtypes("sgmnt_data",312,"len")=8
+	Set gtmtypes("sgmnt_data",312,"type")="uint64_t"
+	Set gtmtypfldindx("sgmnt_data","jnl_phase2_cleanup_if_possible_tn")=312
+	Set gtmtypes("sgmnt_data",313,"name")="sgmnt_data.jnlbuff_phs2cmt_isprcalv_tn"
+	Set gtmtypes("sgmnt_data",313,"off")=3216
+	Set gtmtypes("sgmnt_data",313,"len")=8
+	Set gtmtypes("sgmnt_data",313,"type")="uint64_t"
+	Set gtmtypfldindx("sgmnt_data","jnlbuff_phs2cmt_isprcalv_tn")=313
+	Set gtmtypes("sgmnt_data",314,"name")="sgmnt_data.bg_trc_rec_tn_filler"
+	Set gtmtypes("sgmnt_data",314,"off")=3224
+	Set gtmtypes("sgmnt_data",314,"len")=24
+	Set gtmtypes("sgmnt_data",314,"type")="char"
+	Set gtmtypfldindx("sgmnt_data","bg_trc_rec_tn_filler")=314
+	Set gtmtypes("sgmnt_data",315,"name")="sgmnt_data.total_buffer_flush_cntr"
+	Set gtmtypes("sgmnt_data",315,"off")=3248
 	Set gtmtypes("sgmnt_data",315,"len")=4
 	Set gtmtypes("sgmnt_data",315,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","total_buffer_flush_cntr")=315
+	Set gtmtypes("sgmnt_data",316,"name")="sgmnt_data.bufct_buffer_flush_cntr"
+	Set gtmtypes("sgmnt_data",316,"off")=3252
 	Set gtmtypes("sgmnt_data",316,"len")=4
 	Set gtmtypes("sgmnt_data",316,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","bufct_buffer_flush_cntr")=316
+	Set gtmtypes("sgmnt_data",317,"name")="sgmnt_data.bufct_buffer_flush_loop_cntr"
+	Set gtmtypes("sgmnt_data",317,"off")=3256
 	Set gtmtypes("sgmnt_data",317,"len")=4
 	Set gtmtypes("sgmnt_data",317,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","bufct_buffer_flush_loop_cntr")=317
+	Set gtmtypes("sgmnt_data",318,"name")="sgmnt_data.wrt_calls_cntr"
+	Set gtmtypes("sgmnt_data",318,"off")=3260
 	Set gtmtypes("sgmnt_data",318,"len")=4
 	Set gtmtypes("sgmnt_data",318,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","wrt_calls_cntr")=318
+	Set gtmtypes("sgmnt_data",319,"name")="sgmnt_data.wrt_count_cntr"
+	Set gtmtypes("sgmnt_data",319,"off")=3264
 	Set gtmtypes("sgmnt_data",319,"len")=4
 	Set gtmtypes("sgmnt_data",319,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","wrt_count_cntr")=319
+	Set gtmtypes("sgmnt_data",320,"name")="sgmnt_data.wrt_blocked_cntr"
+	Set gtmtypes("sgmnt_data",320,"off")=3268
 	Set gtmtypes("sgmnt_data",320,"len")=4
 	Set gtmtypes("sgmnt_data",320,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","wrt_blocked_cntr")=320
+	Set gtmtypes("sgmnt_data",321,"name")="sgmnt_data.wrt_busy_cntr"
+	Set gtmtypes("sgmnt_data",321,"off")=3272
 	Set gtmtypes("sgmnt_data",321,"len")=4
 	Set gtmtypes("sgmnt_data",321,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","wrt_busy_cntr")=321
+	Set gtmtypes("sgmnt_data",322,"name")="sgmnt_data.wrt_noblks_wrtn_cntr"
+	Set gtmtypes("sgmnt_data",322,"off")=3276
 	Set gtmtypes("sgmnt_data",322,"len")=4
 	Set gtmtypes("sgmnt_data",322,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","wrt_noblks_wrtn_cntr")=322
+	Set gtmtypes("sgmnt_data",323,"name")="sgmnt_data.wcb_gds_rundown2_cntr"
+	Set gtmtypes("sgmnt_data",323,"off")=3280
 	Set gtmtypes("sgmnt_data",323,"len")=4
 	Set gtmtypes("sgmnt_data",323,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","wcb_gds_rundown2_cntr")=323
+	Set gtmtypes("sgmnt_data",324,"name")="sgmnt_data.reserved_bgtrcrec2_cntr"
+	Set gtmtypes("sgmnt_data",324,"off")=3284
 	Set gtmtypes("sgmnt_data",324,"len")=4
 	Set gtmtypes("sgmnt_data",324,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","reserved_bgtrcrec2_cntr")=324
+	Set gtmtypes("sgmnt_data",325,"name")="sgmnt_data.reserved_bgtrcrec3_cntr"
+	Set gtmtypes("sgmnt_data",325,"off")=3288
 	Set gtmtypes("sgmnt_data",325,"len")=4
 	Set gtmtypes("sgmnt_data",325,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","reserved_bgtrcrec3_cntr")=325
+	Set gtmtypes("sgmnt_data",326,"name")="sgmnt_data.lost_block_recovery_cntr"
+	Set gtmtypes("sgmnt_data",326,"off")=3292
 	Set gtmtypes("sgmnt_data",326,"len")=4
 	Set gtmtypes("sgmnt_data",326,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","lost_block_recovery_cntr")=326
+	Set gtmtypes("sgmnt_data",327,"name")="sgmnt_data.wc_blocked_onln_rlbk_cntr"
+	Set gtmtypes("sgmnt_data",327,"off")=3296
 	Set gtmtypes("sgmnt_data",327,"len")=4
 	Set gtmtypes("sgmnt_data",327,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","wc_blocked_onln_rlbk_cntr")=327
+	Set gtmtypes("sgmnt_data",328,"name")="sgmnt_data.stale_cntr"
+	Set gtmtypes("sgmnt_data",328,"off")=3300
 	Set gtmtypes("sgmnt_data",328,"len")=4
 	Set gtmtypes("sgmnt_data",328,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","stale_cntr")=328
+	Set gtmtypes("sgmnt_data",329,"name")="sgmnt_data.starved_cntr"
+	Set gtmtypes("sgmnt_data",329,"off")=3304
 	Set gtmtypes("sgmnt_data",329,"len")=4
 	Set gtmtypes("sgmnt_data",329,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","starved_cntr")=329
+	Set gtmtypes("sgmnt_data",330,"name")="sgmnt_data.stale_timer_started_cntr"
+	Set gtmtypes("sgmnt_data",330,"off")=3308
 	Set gtmtypes("sgmnt_data",330,"len")=4
 	Set gtmtypes("sgmnt_data",330,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","stale_timer_started_cntr")=330
+	Set gtmtypes("sgmnt_data",331,"name")="sgmnt_data.stale_timer_pop_cntr"
+	Set gtmtypes("sgmnt_data",331,"off")=3312
 	Set gtmtypes("sgmnt_data",331,"len")=4
 	Set gtmtypes("sgmnt_data",331,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","stale_timer_pop_cntr")=331
+	Set gtmtypes("sgmnt_data",332,"name")="sgmnt_data.stale_process_defer_cntr"
+	Set gtmtypes("sgmnt_data",332,"off")=3316
 	Set gtmtypes("sgmnt_data",332,"len")=4
 	Set gtmtypes("sgmnt_data",332,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","stale_process_defer_cntr")=332
+	Set gtmtypes("sgmnt_data",333,"name")="sgmnt_data.stale_defer_processed_cntr"
+	Set gtmtypes("sgmnt_data",333,"off")=3320
 	Set gtmtypes("sgmnt_data",333,"len")=4
 	Set gtmtypes("sgmnt_data",333,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","stale_defer_processed_cntr")=333
+	Set gtmtypes("sgmnt_data",334,"name")="sgmnt_data.spcfc_buffer_flush_cntr"
+	Set gtmtypes("sgmnt_data",334,"off")=3324
 	Set gtmtypes("sgmnt_data",334,"len")=4
 	Set gtmtypes("sgmnt_data",334,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","spcfc_buffer_flush_cntr")=334
+	Set gtmtypes("sgmnt_data",335,"name")="sgmnt_data.spcfc_buffer_flush_loop_cntr"
+	Set gtmtypes("sgmnt_data",335,"off")=3328
 	Set gtmtypes("sgmnt_data",335,"len")=4
 	Set gtmtypes("sgmnt_data",335,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","spcfc_buffer_flush_loop_cntr")=335
+	Set gtmtypes("sgmnt_data",336,"name")="sgmnt_data.spcfc_buffer_flush_retries_cntr"
+	Set gtmtypes("sgmnt_data",336,"off")=3332
 	Set gtmtypes("sgmnt_data",336,"len")=4
 	Set gtmtypes("sgmnt_data",336,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","spcfc_buffer_flush_retries_cntr")=336
+	Set gtmtypes("sgmnt_data",337,"name")="sgmnt_data.spcfc_buffer_flushed_during_lockwait_cntr"
+	Set gtmtypes("sgmnt_data",337,"off")=3336
 	Set gtmtypes("sgmnt_data",337,"len")=4
 	Set gtmtypes("sgmnt_data",337,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","spcfc_buffer_flushed_during_lockwait_cntr")=337
+	Set gtmtypes("sgmnt_data",338,"name")="sgmnt_data.tp_crit_retries_cntr"
+	Set gtmtypes("sgmnt_data",338,"off")=3340
 	Set gtmtypes("sgmnt_data",338,"len")=4
 	Set gtmtypes("sgmnt_data",338,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","tp_crit_retries_cntr")=338
+	Set gtmtypes("sgmnt_data",339,"name")="sgmnt_data.db_csh_getn_flush_dirty_cntr"
+	Set gtmtypes("sgmnt_data",339,"off")=3344
 	Set gtmtypes("sgmnt_data",339,"len")=4
 	Set gtmtypes("sgmnt_data",339,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","db_csh_getn_flush_dirty_cntr")=339
+	Set gtmtypes("sgmnt_data",340,"name")="sgmnt_data.db_csh_getn_rip_wait_cntr"
+	Set gtmtypes("sgmnt_data",340,"off")=3348
 	Set gtmtypes("sgmnt_data",340,"len")=4
 	Set gtmtypes("sgmnt_data",340,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","db_csh_getn_rip_wait_cntr")=340
+	Set gtmtypes("sgmnt_data",341,"name")="sgmnt_data.db_csh_getn_buf_owner_stuck_cntr"
+	Set gtmtypes("sgmnt_data",341,"off")=3352
 	Set gtmtypes("sgmnt_data",341,"len")=4
 	Set gtmtypes("sgmnt_data",341,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","db_csh_getn_buf_owner_stuck_cntr")=341
+	Set gtmtypes("sgmnt_data",342,"name")="sgmnt_data.db_csh_getn_out_of_design_cntr"
+	Set gtmtypes("sgmnt_data",342,"off")=3356
 	Set gtmtypes("sgmnt_data",342,"len")=4
 	Set gtmtypes("sgmnt_data",342,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","db_csh_getn_out_of_design_cntr")=342
+	Set gtmtypes("sgmnt_data",343,"name")="sgmnt_data.t_qread_buf_owner_stuck_cntr"
+	Set gtmtypes("sgmnt_data",343,"off")=3360
 	Set gtmtypes("sgmnt_data",343,"len")=4
 	Set gtmtypes("sgmnt_data",343,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","t_qread_buf_owner_stuck_cntr")=343
+	Set gtmtypes("sgmnt_data",344,"name")="sgmnt_data.t_qread_out_of_design_cntr"
+	Set gtmtypes("sgmnt_data",344,"off")=3364
 	Set gtmtypes("sgmnt_data",344,"len")=4
 	Set gtmtypes("sgmnt_data",344,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","t_qread_out_of_design_cntr")=344
+	Set gtmtypes("sgmnt_data",345,"name")="sgmnt_data.bt_put_flush_dirty_cntr"
+	Set gtmtypes("sgmnt_data",345,"off")=3368
 	Set gtmtypes("sgmnt_data",345,"len")=4
 	Set gtmtypes("sgmnt_data",345,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","bt_put_flush_dirty_cntr")=345
+	Set gtmtypes("sgmnt_data",346,"name")="sgmnt_data.mlock_wakeups_cntr"
+	Set gtmtypes("sgmnt_data",346,"off")=3372
 	Set gtmtypes("sgmnt_data",346,"len")=4
 	Set gtmtypes("sgmnt_data",346,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","mlock_wakeups_cntr")=346
+	Set gtmtypes("sgmnt_data",347,"name")="sgmnt_data.wc_blocked_wcs_recover_invoked_cntr"
+	Set gtmtypes("sgmnt_data",347,"off")=3376
 	Set gtmtypes("sgmnt_data",347,"len")=4
 	Set gtmtypes("sgmnt_data",347,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","wc_blocked_wcs_recover_invoked_cntr")=347
+	Set gtmtypes("sgmnt_data",348,"name")="sgmnt_data.wc_blocked_wcs_verify_passed_cntr"
+	Set gtmtypes("sgmnt_data",348,"off")=3380
 	Set gtmtypes("sgmnt_data",348,"len")=4
 	Set gtmtypes("sgmnt_data",348,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","wc_blocked_wcs_verify_passed_cntr")=348
+	Set gtmtypes("sgmnt_data",349,"name")="sgmnt_data.wc_blocked_t_qread_db_csh_getn_invalid_blk_cntr"
+	Set gtmtypes("sgmnt_data",349,"off")=3384
 	Set gtmtypes("sgmnt_data",349,"len")=4
 	Set gtmtypes("sgmnt_data",349,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","wc_blocked_t_qread_db_csh_getn_invalid_blk_cntr")=349
+	Set gtmtypes("sgmnt_data",350,"name")="sgmnt_data.wc_blocked_t_qread_db_csh_get_invalid_blk_cntr"
+	Set gtmtypes("sgmnt_data",350,"off")=3388
 	Set gtmtypes("sgmnt_data",350,"len")=4
 	Set gtmtypes("sgmnt_data",350,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","wc_blocked_t_qread_db_csh_get_invalid_blk_cntr")=350
+	Set gtmtypes("sgmnt_data",351,"name")="sgmnt_data.wc_blocked_db_csh_getn_loopexceed_cntr"
+	Set gtmtypes("sgmnt_data",351,"off")=3392
 	Set gtmtypes("sgmnt_data",351,"len")=4
 	Set gtmtypes("sgmnt_data",351,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","wc_blocked_db_csh_getn_loopexceed_cntr")=351
+	Set gtmtypes("sgmnt_data",352,"name")="sgmnt_data.wc_blocked_db_csh_getn_wcsstarvewrt_cntr"
+	Set gtmtypes("sgmnt_data",352,"off")=3396
 	Set gtmtypes("sgmnt_data",352,"len")=4
 	Set gtmtypes("sgmnt_data",352,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","wc_blocked_db_csh_getn_wcsstarvewrt_cntr")=352
+	Set gtmtypes("sgmnt_data",353,"name")="sgmnt_data.wc_blocked_db_csh_get_cntr"
+	Set gtmtypes("sgmnt_data",353,"off")=3400
 	Set gtmtypes("sgmnt_data",353,"len")=4
 	Set gtmtypes("sgmnt_data",353,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","wc_blocked_db_csh_get_cntr")=353
+	Set gtmtypes("sgmnt_data",354,"name")="sgmnt_data.wc_blocked_tp_tend_wcsgetspace_cntr"
+	Set gtmtypes("sgmnt_data",354,"off")=3404
 	Set gtmtypes("sgmnt_data",354,"len")=4
 	Set gtmtypes("sgmnt_data",354,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","wc_blocked_tp_tend_wcsgetspace_cntr")=354
+	Set gtmtypes("sgmnt_data",355,"name")="sgmnt_data.wc_blocked_tp_tend_t1_cntr"
+	Set gtmtypes("sgmnt_data",355,"off")=3408
 	Set gtmtypes("sgmnt_data",355,"len")=4
 	Set gtmtypes("sgmnt_data",355,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","wc_blocked_tp_tend_t1_cntr")=355
+	Set gtmtypes("sgmnt_data",356,"name")="sgmnt_data.wc_blocked_tp_tend_bitmap_cntr"
+	Set gtmtypes("sgmnt_data",356,"off")=3412
 	Set gtmtypes("sgmnt_data",356,"len")=4
 	Set gtmtypes("sgmnt_data",356,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","wc_blocked_tp_tend_bitmap_cntr")=356
+	Set gtmtypes("sgmnt_data",357,"name")="sgmnt_data.wc_blocked_tp_tend_jnl_cwset_cntr"
+	Set gtmtypes("sgmnt_data",357,"off")=3416
 	Set gtmtypes("sgmnt_data",357,"len")=4
 	Set gtmtypes("sgmnt_data",357,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","wc_blocked_tp_tend_jnl_cwset_cntr")=357
+	Set gtmtypes("sgmnt_data",358,"name")="sgmnt_data.wc_blocked_tp_tend_jnl_wcsflu_cntr"
+	Set gtmtypes("sgmnt_data",358,"off")=3420
 	Set gtmtypes("sgmnt_data",358,"len")=4
 	Set gtmtypes("sgmnt_data",358,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","wc_blocked_tp_tend_jnl_wcsflu_cntr")=358
+	Set gtmtypes("sgmnt_data",359,"name")="sgmnt_data.wc_blocked_t_end_hist_cntr"
+	Set gtmtypes("sgmnt_data",359,"off")=3424
 	Set gtmtypes("sgmnt_data",359,"len")=4
 	Set gtmtypes("sgmnt_data",359,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","wc_blocked_t_end_hist_cntr")=359
+	Set gtmtypes("sgmnt_data",360,"name")="sgmnt_data.wc_blocked_t_end_hist1_nullbt_cntr"
+	Set gtmtypes("sgmnt_data",360,"off")=3428
 	Set gtmtypes("sgmnt_data",360,"len")=4
 	Set gtmtypes("sgmnt_data",360,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","wc_blocked_t_end_hist1_nullbt_cntr")=360
+	Set gtmtypes("sgmnt_data",361,"name")="sgmnt_data.wc_blocked_t_end_hist1_nonnullbt_cntr"
+	Set gtmtypes("sgmnt_data",361,"off")=3432
 	Set gtmtypes("sgmnt_data",361,"len")=4
 	Set gtmtypes("sgmnt_data",361,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","wc_blocked_t_end_hist1_nonnullbt_cntr")=361
+	Set gtmtypes("sgmnt_data",362,"name")="sgmnt_data.wc_blocked_t_end_bitmap_nullbt_cntr"
+	Set gtmtypes("sgmnt_data",362,"off")=3436
 	Set gtmtypes("sgmnt_data",362,"len")=4
 	Set gtmtypes("sgmnt_data",362,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","wc_blocked_t_end_bitmap_nullbt_cntr")=362
+	Set gtmtypes("sgmnt_data",363,"name")="sgmnt_data.wc_blocked_t_end_bitmap_nonnullbt_cntr"
+	Set gtmtypes("sgmnt_data",363,"off")=3440
 	Set gtmtypes("sgmnt_data",363,"len")=4
 	Set gtmtypes("sgmnt_data",363,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","wc_blocked_t_end_bitmap_nonnullbt_cntr")=363
+	Set gtmtypes("sgmnt_data",364,"name")="sgmnt_data.wc_blocked_t_end_jnl_cwset_cntr"
+	Set gtmtypes("sgmnt_data",364,"off")=3444
 	Set gtmtypes("sgmnt_data",364,"len")=4
 	Set gtmtypes("sgmnt_data",364,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","wc_blocked_t_end_jnl_cwset_cntr")=364
+	Set gtmtypes("sgmnt_data",365,"name")="sgmnt_data.wc_blocked_t_end_jnl_wcsflu_cntr"
+	Set gtmtypes("sgmnt_data",365,"off")=3448
 	Set gtmtypes("sgmnt_data",365,"len")=4
 	Set gtmtypes("sgmnt_data",365,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","wc_blocked_t_end_jnl_wcsflu_cntr")=365
+	Set gtmtypes("sgmnt_data",366,"name")="sgmnt_data.db_csh_get_too_many_loops_cntr"
+	Set gtmtypes("sgmnt_data",366,"off")=3452
 	Set gtmtypes("sgmnt_data",366,"len")=4
 	Set gtmtypes("sgmnt_data",366,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","db_csh_get_too_many_loops_cntr")=366
+	Set gtmtypes("sgmnt_data",367,"name")="sgmnt_data.wc_blocked_tpckh_hist1_nullbt_cntr"
+	Set gtmtypes("sgmnt_data",367,"off")=3456
 	Set gtmtypes("sgmnt_data",367,"len")=4
 	Set gtmtypes("sgmnt_data",367,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","wc_blocked_tpckh_hist1_nullbt_cntr")=367
+	Set gtmtypes("sgmnt_data",368,"name")="sgmnt_data.wc_blocked_tpckh_hist1_nonnullbt_cntr"
+	Set gtmtypes("sgmnt_data",368,"off")=3460
 	Set gtmtypes("sgmnt_data",368,"len")=4
 	Set gtmtypes("sgmnt_data",368,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","wc_blocked_tpckh_hist1_nonnullbt_cntr")=368
+	Set gtmtypes("sgmnt_data",369,"name")="sgmnt_data.jnl_blocked_writer_lost_cntr"
+	Set gtmtypes("sgmnt_data",369,"off")=3464
 	Set gtmtypes("sgmnt_data",369,"len")=4
 	Set gtmtypes("sgmnt_data",369,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","jnl_blocked_writer_lost_cntr")=369
+	Set gtmtypes("sgmnt_data",370,"name")="sgmnt_data.jnl_blocked_writer_stuck_cntr"
+	Set gtmtypes("sgmnt_data",370,"off")=3468
 	Set gtmtypes("sgmnt_data",370,"len")=4
 	Set gtmtypes("sgmnt_data",370,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","jnl_blocked_writer_stuck_cntr")=370
+	Set gtmtypes("sgmnt_data",371,"name")="sgmnt_data.jnl_blocked_writer_blocked_cntr"
+	Set gtmtypes("sgmnt_data",371,"off")=3472
 	Set gtmtypes("sgmnt_data",371,"len")=4
 	Set gtmtypes("sgmnt_data",371,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","jnl_blocked_writer_blocked_cntr")=371
+	Set gtmtypes("sgmnt_data",372,"name")="sgmnt_data.n_jnl_fsyncs_cntr"
+	Set gtmtypes("sgmnt_data",372,"off")=3476
 	Set gtmtypes("sgmnt_data",372,"len")=4
 	Set gtmtypes("sgmnt_data",372,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","n_jnl_fsyncs_cntr")=372
+	Set gtmtypes("sgmnt_data",373,"name")="sgmnt_data.n_jnl_fsync_tries_cntr"
+	Set gtmtypes("sgmnt_data",373,"off")=3480
 	Set gtmtypes("sgmnt_data",373,"len")=4
 	Set gtmtypes("sgmnt_data",373,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","n_jnl_fsync_tries_cntr")=373
+	Set gtmtypes("sgmnt_data",374,"name")="sgmnt_data.n_jnl_fsync_recovers_cntr"
+	Set gtmtypes("sgmnt_data",374,"off")=3484
 	Set gtmtypes("sgmnt_data",374,"len")=4
 	Set gtmtypes("sgmnt_data",374,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","n_jnl_fsync_recovers_cntr")=374
+	Set gtmtypes("sgmnt_data",375,"name")="sgmnt_data.n_db_fsyncs_cntr"
+	Set gtmtypes("sgmnt_data",375,"off")=3488
 	Set gtmtypes("sgmnt_data",375,"len")=4
 	Set gtmtypes("sgmnt_data",375,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","n_db_fsyncs_cntr")=375
+	Set gtmtypes("sgmnt_data",376,"name")="sgmnt_data.n_db_fsyncs_in_crit_cntr"
+	Set gtmtypes("sgmnt_data",376,"off")=3492
 	Set gtmtypes("sgmnt_data",376,"len")=4
 	Set gtmtypes("sgmnt_data",376,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","n_db_fsyncs_in_crit_cntr")=376
+	Set gtmtypes("sgmnt_data",377,"name")="sgmnt_data.n_dbsync_timers_cntr"
+	Set gtmtypes("sgmnt_data",377,"off")=3496
 	Set gtmtypes("sgmnt_data",377,"len")=4
 	Set gtmtypes("sgmnt_data",377,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","n_dbsync_timers_cntr")=377
+	Set gtmtypes("sgmnt_data",378,"name")="sgmnt_data.n_dbsync_writes_cntr"
+	Set gtmtypes("sgmnt_data",378,"off")=3500
 	Set gtmtypes("sgmnt_data",378,"len")=4
 	Set gtmtypes("sgmnt_data",378,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","n_dbsync_writes_cntr")=378
+	Set gtmtypes("sgmnt_data",379,"name")="sgmnt_data.mutex_queue_full_cntr"
+	Set gtmtypes("sgmnt_data",379,"off")=3504
 	Set gtmtypes("sgmnt_data",379,"len")=4
 	Set gtmtypes("sgmnt_data",379,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","mutex_queue_full_cntr")=379
+	Set gtmtypes("sgmnt_data",380,"name")="sgmnt_data.wcb_bt_put_cntr"
+	Set gtmtypes("sgmnt_data",380,"off")=3508
 	Set gtmtypes("sgmnt_data",380,"len")=4
 	Set gtmtypes("sgmnt_data",380,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","wcb_bt_put_cntr")=380
+	Set gtmtypes("sgmnt_data",381,"name")="sgmnt_data.wcb_mutex_salvage_cntr"
+	Set gtmtypes("sgmnt_data",381,"off")=3512
 	Set gtmtypes("sgmnt_data",381,"len")=4
 	Set gtmtypes("sgmnt_data",381,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","wcb_mutex_salvage_cntr")=381
+	Set gtmtypes("sgmnt_data",382,"name")="sgmnt_data.wcb_wcs_flu0_cntr"
+	Set gtmtypes("sgmnt_data",382,"off")=3516
 	Set gtmtypes("sgmnt_data",382,"len")=4
 	Set gtmtypes("sgmnt_data",382,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","wcb_wcs_flu0_cntr")=382
+	Set gtmtypes("sgmnt_data",383,"name")="sgmnt_data.wcb_t_end_sysops_nocr_invcr_cntr"
+	Set gtmtypes("sgmnt_data",383,"off")=3520
 	Set gtmtypes("sgmnt_data",383,"len")=4
 	Set gtmtypes("sgmnt_data",383,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","wcb_t_end_sysops_nocr_invcr_cntr")=383
+	Set gtmtypes("sgmnt_data",384,"name")="sgmnt_data.wcb_t_end_sysops_cr_invcr_cntr"
+	Set gtmtypes("sgmnt_data",384,"off")=3524
 	Set gtmtypes("sgmnt_data",384,"len")=4
 	Set gtmtypes("sgmnt_data",384,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","wcb_t_end_sysops_cr_invcr_cntr")=384
+	Set gtmtypes("sgmnt_data",385,"name")="sgmnt_data.wcb_t_end_sysops_rip_wait_cntr"
+	Set gtmtypes("sgmnt_data",385,"off")=3528
 	Set gtmtypes("sgmnt_data",385,"len")=4
 	Set gtmtypes("sgmnt_data",385,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","wcb_t_end_sysops_rip_wait_cntr")=385
+	Set gtmtypes("sgmnt_data",386,"name")="sgmnt_data.wcb_t_end_sysops_dirtyripwait_cntr"
+	Set gtmtypes("sgmnt_data",386,"off")=3532
 	Set gtmtypes("sgmnt_data",386,"len")=4
 	Set gtmtypes("sgmnt_data",386,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","wcb_t_end_sysops_dirtyripwait_cntr")=386
+	Set gtmtypes("sgmnt_data",387,"name")="sgmnt_data.wcb_gds_rundown1_cntr"
+	Set gtmtypes("sgmnt_data",387,"off")=3536
 	Set gtmtypes("sgmnt_data",387,"len")=4
 	Set gtmtypes("sgmnt_data",387,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","wcb_gds_rundown1_cntr")=387
+	Set gtmtypes("sgmnt_data",388,"name")="sgmnt_data.wcb_wcs_flu1_cntr"
+	Set gtmtypes("sgmnt_data",388,"off")=3540
 	Set gtmtypes("sgmnt_data",388,"len")=4
 	Set gtmtypes("sgmnt_data",388,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","wcb_wcs_flu1_cntr")=388
+	Set gtmtypes("sgmnt_data",389,"name")="sgmnt_data.wcb_mu_back_cntr"
+	Set gtmtypes("sgmnt_data",389,"off")=3544
 	Set gtmtypes("sgmnt_data",389,"len")=4
 	Set gtmtypes("sgmnt_data",389,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","wcb_mu_back_cntr")=389
+	Set gtmtypes("sgmnt_data",390,"name")="sgmnt_data.wcb_t_end_sysops_dirty_invcr_cntr"
+	Set gtmtypes("sgmnt_data",390,"off")=3548
 	Set gtmtypes("sgmnt_data",390,"len")=4
 	Set gtmtypes("sgmnt_data",390,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","wcb_t_end_sysops_dirty_invcr_cntr")=390
+	Set gtmtypes("sgmnt_data",391,"name")="sgmnt_data.wcb_t_end_sysops_wtfini_fail_cntr"
+	Set gtmtypes("sgmnt_data",391,"off")=3552
 	Set gtmtypes("sgmnt_data",391,"len")=4
 	Set gtmtypes("sgmnt_data",391,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","wcb_t_end_sysops_wtfini_fail_cntr")=391
+	Set gtmtypes("sgmnt_data",392,"name")="sgmnt_data.wcb_t_end_sysops_twin_stuck_cntr"
+	Set gtmtypes("sgmnt_data",392,"off")=3556
 	Set gtmtypes("sgmnt_data",392,"len")=4
 	Set gtmtypes("sgmnt_data",392,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","wcb_t_end_sysops_twin_stuck_cntr")=392
+	Set gtmtypes("sgmnt_data",393,"name")="sgmnt_data.db_csh_getn_wrt_latch_stuck_cntr"
+	Set gtmtypes("sgmnt_data",393,"off")=3560
 	Set gtmtypes("sgmnt_data",393,"len")=4
 	Set gtmtypes("sgmnt_data",393,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","db_csh_getn_wrt_latch_stuck_cntr")=393
+	Set gtmtypes("sgmnt_data",394,"name")="sgmnt_data.wcb_secshr_db_clnup_now_crit_cntr"
+	Set gtmtypes("sgmnt_data",394,"off")=3564
 	Set gtmtypes("sgmnt_data",394,"len")=4
 	Set gtmtypes("sgmnt_data",394,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","wcb_secshr_db_clnup_now_crit_cntr")=394
+	Set gtmtypes("sgmnt_data",395,"name")="sgmnt_data.wc_blocked_t_qread_bad_bt_index1_cntr"
+	Set gtmtypes("sgmnt_data",395,"off")=3568
 	Set gtmtypes("sgmnt_data",395,"len")=4
 	Set gtmtypes("sgmnt_data",395,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","wc_blocked_t_qread_bad_bt_index1_cntr")=395
+	Set gtmtypes("sgmnt_data",396,"name")="sgmnt_data.wc_blocked_t_qread_bad_bt_index2_cntr"
+	Set gtmtypes("sgmnt_data",396,"off")=3572
 	Set gtmtypes("sgmnt_data",396,"len")=4
 	Set gtmtypes("sgmnt_data",396,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","wc_blocked_t_qread_bad_bt_index2_cntr")=396
+	Set gtmtypes("sgmnt_data",397,"name")="sgmnt_data.wc_blocked_t_end_crbtmismatch1_cntr"
+	Set gtmtypes("sgmnt_data",397,"off")=3576
 	Set gtmtypes("sgmnt_data",397,"len")=4
 	Set gtmtypes("sgmnt_data",397,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","wc_blocked_t_end_crbtmismatch1_cntr")=397
+	Set gtmtypes("sgmnt_data",398,"name")="sgmnt_data.wc_blocked_t_end_crbtmismatch2_cntr"
+	Set gtmtypes("sgmnt_data",398,"off")=3580
 	Set gtmtypes("sgmnt_data",398,"len")=4
 	Set gtmtypes("sgmnt_data",398,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","wc_blocked_t_end_crbtmismatch2_cntr")=398
+	Set gtmtypes("sgmnt_data",399,"name")="sgmnt_data.wc_blocked_t_end_crbtmismatch3_cntr"
+	Set gtmtypes("sgmnt_data",399,"off")=3584
 	Set gtmtypes("sgmnt_data",399,"len")=4
 	Set gtmtypes("sgmnt_data",399,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","wc_blocked_t_end_crbtmismatch3_cntr")=399
+	Set gtmtypes("sgmnt_data",400,"name")="sgmnt_data.wc_blocked_tp_tend_crbtmismatch1_cntr"
+	Set gtmtypes("sgmnt_data",400,"off")=3588
 	Set gtmtypes("sgmnt_data",400,"len")=4
 	Set gtmtypes("sgmnt_data",400,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","wc_blocked_tp_tend_crbtmismatch1_cntr")=400
+	Set gtmtypes("sgmnt_data",401,"name")="sgmnt_data.wc_blocked_tp_tend_crbtmismatch2_cntr"
+	Set gtmtypes("sgmnt_data",401,"off")=3592
 	Set gtmtypes("sgmnt_data",401,"len")=4
 	Set gtmtypes("sgmnt_data",401,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","wc_blocked_tp_tend_crbtmismatch2_cntr")=401
+	Set gtmtypes("sgmnt_data",402,"name")="sgmnt_data.wc_blocked_tp_tend_crbtmismatch3_cntr"
+	Set gtmtypes("sgmnt_data",402,"off")=3596
 	Set gtmtypes("sgmnt_data",402,"len")=4
 	Set gtmtypes("sgmnt_data",402,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","wc_blocked_tp_tend_crbtmismatch3_cntr")=402
+	Set gtmtypes("sgmnt_data",403,"name")="sgmnt_data.wc_blocked_wcs_wtstart_bad_cr_cntr"
+	Set gtmtypes("sgmnt_data",403,"off")=3600
 	Set gtmtypes("sgmnt_data",403,"len")=4
 	Set gtmtypes("sgmnt_data",403,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","wc_blocked_wcs_wtstart_bad_cr_cntr")=403
+	Set gtmtypes("sgmnt_data",404,"name")="sgmnt_data.wc_blocked_wcs_wtfini_bad_cr_cntr"
+	Set gtmtypes("sgmnt_data",404,"off")=3604
 	Set gtmtypes("sgmnt_data",404,"len")=4
 	Set gtmtypes("sgmnt_data",404,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","wc_blocked_wcs_wtfini_bad_cr_cntr")=404
+	Set gtmtypes("sgmnt_data",405,"name")="sgmnt_data.wc_blocked_bt_get_cntr"
+	Set gtmtypes("sgmnt_data",405,"off")=3608
 	Set gtmtypes("sgmnt_data",405,"len")=4
 	Set gtmtypes("sgmnt_data",405,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","wc_blocked_bt_get_cntr")=405
+	Set gtmtypes("sgmnt_data",406,"name")="sgmnt_data.wc_blocked_wcs_cdb_sc_final_retry_cntr"
+	Set gtmtypes("sgmnt_data",406,"off")=3612
 	Set gtmtypes("sgmnt_data",406,"len")=4
 	Set gtmtypes("sgmnt_data",406,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","wc_blocked_wcs_cdb_sc_final_retry_cntr")=406
+	Set gtmtypes("sgmnt_data",407,"name")="sgmnt_data.wcb_bg_update_lckfail1_cntr"
+	Set gtmtypes("sgmnt_data",407,"off")=3616
 	Set gtmtypes("sgmnt_data",407,"len")=4
 	Set gtmtypes("sgmnt_data",407,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","wcb_bg_update_lckfail1_cntr")=407
+	Set gtmtypes("sgmnt_data",408,"name")="sgmnt_data.wcb_bg_update_lckfail2_cntr"
+	Set gtmtypes("sgmnt_data",408,"off")=3620
 	Set gtmtypes("sgmnt_data",408,"len")=4
 	Set gtmtypes("sgmnt_data",408,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","wcb_bg_update_lckfail2_cntr")=408
+	Set gtmtypes("sgmnt_data",409,"name")="sgmnt_data.wcb_wtstart_lckfail1_cntr"
+	Set gtmtypes("sgmnt_data",409,"off")=3624
 	Set gtmtypes("sgmnt_data",409,"len")=4
 	Set gtmtypes("sgmnt_data",409,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","wcb_wtstart_lckfail1_cntr")=409
+	Set gtmtypes("sgmnt_data",410,"name")="sgmnt_data.wcb_wtstart_lckfail2_cntr"
+	Set gtmtypes("sgmnt_data",410,"off")=3628
 	Set gtmtypes("sgmnt_data",410,"len")=4
 	Set gtmtypes("sgmnt_data",410,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","wcb_wtstart_lckfail2_cntr")=410
+	Set gtmtypes("sgmnt_data",411,"name")="sgmnt_data.wcb_wtstart_lckfail3_cntr"
+	Set gtmtypes("sgmnt_data",411,"off")=3632
 	Set gtmtypes("sgmnt_data",411,"len")=4
 	Set gtmtypes("sgmnt_data",411,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","wcb_wtstart_lckfail3_cntr")=411
+	Set gtmtypes("sgmnt_data",412,"name")="sgmnt_data.wcb_wtstart_lckfail4_cntr"
+	Set gtmtypes("sgmnt_data",412,"off")=3636
 	Set gtmtypes("sgmnt_data",412,"len")=4
 	Set gtmtypes("sgmnt_data",412,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","wcb_wtstart_lckfail4_cntr")=412
+	Set gtmtypes("sgmnt_data",413,"name")="sgmnt_data.wcb_wtfini_lckfail1_cntr"
+	Set gtmtypes("sgmnt_data",413,"off")=3640
 	Set gtmtypes("sgmnt_data",413,"len")=4
 	Set gtmtypes("sgmnt_data",413,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","wcb_wtfini_lckfail1_cntr")=413
+	Set gtmtypes("sgmnt_data",414,"name")="sgmnt_data.wcb_wtfini_lckfail2_cntr"
+	Set gtmtypes("sgmnt_data",414,"off")=3644
 	Set gtmtypes("sgmnt_data",414,"len")=4
 	Set gtmtypes("sgmnt_data",414,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","wcb_wtfini_lckfail2_cntr")=414
+	Set gtmtypes("sgmnt_data",415,"name")="sgmnt_data.wcb_wtfini_lckfail3_cntr"
+	Set gtmtypes("sgmnt_data",415,"off")=3648
 	Set gtmtypes("sgmnt_data",415,"len")=4
 	Set gtmtypes("sgmnt_data",415,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","wcb_wtfini_lckfail3_cntr")=415
+	Set gtmtypes("sgmnt_data",416,"name")="sgmnt_data.wcb_wtfini_lckfail4_cntr"
+	Set gtmtypes("sgmnt_data",416,"off")=3652
 	Set gtmtypes("sgmnt_data",416,"len")=4
 	Set gtmtypes("sgmnt_data",416,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","wcb_wtfini_lckfail4_cntr")=416
+	Set gtmtypes("sgmnt_data",417,"name")="sgmnt_data.wcb_t_end_sysops_dirtystuck1_cntr"
+	Set gtmtypes("sgmnt_data",417,"off")=3656
 	Set gtmtypes("sgmnt_data",417,"len")=4
 	Set gtmtypes("sgmnt_data",417,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","wcb_t_end_sysops_dirtystuck1_cntr")=417
+	Set gtmtypes("sgmnt_data",418,"name")="sgmnt_data.wcb_t_end_sysops_dirtystuck2_cntr"
+	Set gtmtypes("sgmnt_data",418,"off")=3660
 	Set gtmtypes("sgmnt_data",418,"len")=4
 	Set gtmtypes("sgmnt_data",418,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","wcb_t_end_sysops_dirtystuck2_cntr")=418
+	Set gtmtypes("sgmnt_data",419,"name")="sgmnt_data.wcb_secshr_db_clnup_wbuf_dqd_cntr"
+	Set gtmtypes("sgmnt_data",419,"off")=3664
 	Set gtmtypes("sgmnt_data",419,"len")=4
 	Set gtmtypes("sgmnt_data",419,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","wcb_secshr_db_clnup_wbuf_dqd_cntr")=419
+	Set gtmtypes("sgmnt_data",420,"name")="sgmnt_data.dwngrd_refmts_syncio_cntr"
+	Set gtmtypes("sgmnt_data",420,"off")=3668
 	Set gtmtypes("sgmnt_data",420,"len")=4
 	Set gtmtypes("sgmnt_data",420,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","dwngrd_refmts_syncio_cntr")=420
+	Set gtmtypes("sgmnt_data",421,"name")="sgmnt_data.dwngrd_refmts_asyncio_cntr"
+	Set gtmtypes("sgmnt_data",421,"off")=3672
 	Set gtmtypes("sgmnt_data",421,"len")=4
 	Set gtmtypes("sgmnt_data",421,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","dwngrd_refmts_asyncio_cntr")=421
+	Set gtmtypes("sgmnt_data",422,"name")="sgmnt_data.shmpool_refmt_harvests_cntr"
+	Set gtmtypes("sgmnt_data",422,"off")=3676
 	Set gtmtypes("sgmnt_data",422,"len")=4
 	Set gtmtypes("sgmnt_data",422,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","shmpool_refmt_harvests_cntr")=422
+	Set gtmtypes("sgmnt_data",423,"name")="sgmnt_data.shmpool_recovery_cntr"
+	Set gtmtypes("sgmnt_data",423,"off")=3680
 	Set gtmtypes("sgmnt_data",423,"len")=4
 	Set gtmtypes("sgmnt_data",423,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","shmpool_recovery_cntr")=423
+	Set gtmtypes("sgmnt_data",424,"name")="sgmnt_data.shmpool_blkd_by_sdc_cntr"
+	Set gtmtypes("sgmnt_data",424,"off")=3684
 	Set gtmtypes("sgmnt_data",424,"len")=4
 	Set gtmtypes("sgmnt_data",424,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","shmpool_blkd_by_sdc_cntr")=424
+	Set gtmtypes("sgmnt_data",425,"name")="sgmnt_data.shmpool_alloc_bbflush_cntr"
+	Set gtmtypes("sgmnt_data",425,"off")=3688
 	Set gtmtypes("sgmnt_data",425,"len")=4
 	Set gtmtypes("sgmnt_data",425,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","shmpool_alloc_bbflush_cntr")=425
+	Set gtmtypes("sgmnt_data",426,"name")="sgmnt_data.refmt_hvst_blk_released_replaced_cntr"
+	Set gtmtypes("sgmnt_data",426,"off")=3692
 	Set gtmtypes("sgmnt_data",426,"len")=4
 	Set gtmtypes("sgmnt_data",426,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","refmt_hvst_blk_released_replaced_cntr")=426
+	Set gtmtypes("sgmnt_data",427,"name")="sgmnt_data.refmt_hvst_blk_released_io_complete_cntr"
+	Set gtmtypes("sgmnt_data",427,"off")=3696
 	Set gtmtypes("sgmnt_data",427,"len")=4
 	Set gtmtypes("sgmnt_data",427,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","refmt_hvst_blk_released_io_complete_cntr")=427
+	Set gtmtypes("sgmnt_data",428,"name")="sgmnt_data.refmt_hvst_blk_kept_cntr"
+	Set gtmtypes("sgmnt_data",428,"off")=3700
 	Set gtmtypes("sgmnt_data",428,"len")=4
 	Set gtmtypes("sgmnt_data",428,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","refmt_hvst_blk_kept_cntr")=428
+	Set gtmtypes("sgmnt_data",429,"name")="sgmnt_data.refmt_hvst_blk_ignored_cntr"
+	Set gtmtypes("sgmnt_data",429,"off")=3704
 	Set gtmtypes("sgmnt_data",429,"len")=4
 	Set gtmtypes("sgmnt_data",429,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","refmt_hvst_blk_ignored_cntr")=429
+	Set gtmtypes("sgmnt_data",430,"name")="sgmnt_data.refmt_blk_chk_blk_freed_cntr"
+	Set gtmtypes("sgmnt_data",430,"off")=3708
 	Set gtmtypes("sgmnt_data",430,"len")=4
 	Set gtmtypes("sgmnt_data",430,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","refmt_blk_chk_blk_freed_cntr")=430
+	Set gtmtypes("sgmnt_data",431,"name")="sgmnt_data.refmt_blk_chk_blk_kept_cntr"
+	Set gtmtypes("sgmnt_data",431,"off")=3712
 	Set gtmtypes("sgmnt_data",431,"len")=4
 	Set gtmtypes("sgmnt_data",431,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","refmt_blk_chk_blk_kept_cntr")=431
+	Set gtmtypes("sgmnt_data",432,"name")="sgmnt_data.active_lvl_trigger_cntr"
+	Set gtmtypes("sgmnt_data",432,"off")=3716
 	Set gtmtypes("sgmnt_data",432,"len")=4
 	Set gtmtypes("sgmnt_data",432,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","active_lvl_trigger_cntr")=432
+	Set gtmtypes("sgmnt_data",433,"name")="sgmnt_data.new_buff_cntr"
+	Set gtmtypes("sgmnt_data",433,"off")=3720
 	Set gtmtypes("sgmnt_data",433,"len")=4
 	Set gtmtypes("sgmnt_data",433,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","new_buff_cntr")=433
+	Set gtmtypes("sgmnt_data",434,"name")="sgmnt_data.phase2_commit_wait_sleep_in_crit_cntr"
+	Set gtmtypes("sgmnt_data",434,"off")=3724
 	Set gtmtypes("sgmnt_data",434,"len")=4
 	Set gtmtypes("sgmnt_data",434,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","phase2_commit_wait_sleep_in_crit_cntr")=434
+	Set gtmtypes("sgmnt_data",435,"name")="sgmnt_data.phase2_commit_wait_sleep_no_crit_cntr"
+	Set gtmtypes("sgmnt_data",435,"off")=3728
 	Set gtmtypes("sgmnt_data",435,"len")=4
 	Set gtmtypes("sgmnt_data",435,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","phase2_commit_wait_sleep_no_crit_cntr")=435
+	Set gtmtypes("sgmnt_data",436,"name")="sgmnt_data.phase2_commit_wait_pidcnt_cntr"
+	Set gtmtypes("sgmnt_data",436,"off")=3732
 	Set gtmtypes("sgmnt_data",436,"len")=4
 	Set gtmtypes("sgmnt_data",436,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","phase2_commit_wait_pidcnt_cntr")=436
+	Set gtmtypes("sgmnt_data",437,"name")="sgmnt_data.wcb_t_end_sysops_intend_wait_cntr"
+	Set gtmtypes("sgmnt_data",437,"off")=3736
 	Set gtmtypes("sgmnt_data",437,"len")=4
 	Set gtmtypes("sgmnt_data",437,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","wcb_t_end_sysops_intend_wait_cntr")=437
+	Set gtmtypes("sgmnt_data",438,"name")="sgmnt_data.wcb_secshr_db_clnup_phase2_clnup_cntr"
+	Set gtmtypes("sgmnt_data",438,"off")=3740
 	Set gtmtypes("sgmnt_data",438,"len")=4
 	Set gtmtypes("sgmnt_data",438,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","wcb_secshr_db_clnup_phase2_clnup_cntr")=438
+	Set gtmtypes("sgmnt_data",439,"name")="sgmnt_data.wcb_phase2_commit_wait_cntr"
+	Set gtmtypes("sgmnt_data",439,"off")=3744
 	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 gtmtypfldindx("sgmnt_data","wcb_phase2_commit_wait_cntr")=439
+	Set gtmtypes("sgmnt_data",440,"name")="sgmnt_data.recompute_upd_array_calls_cntr"
+	Set gtmtypes("sgmnt_data",440,"off")=3748
 	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 gtmtypfldindx("sgmnt_data","recompute_upd_array_calls_cntr")=440
+	Set gtmtypes("sgmnt_data",441,"name")="sgmnt_data.recompute_upd_array_rip_cntr"
+	Set gtmtypes("sgmnt_data",441,"off")=3752
 	Set gtmtypes("sgmnt_data",441,"len")=4
 	Set gtmtypes("sgmnt_data",441,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","recompute_upd_array_rip_cntr")=441
+	Set gtmtypes("sgmnt_data",442,"name")="sgmnt_data.recompute_upd_array_in_tend_cntr"
+	Set gtmtypes("sgmnt_data",442,"off")=3756
 	Set gtmtypes("sgmnt_data",442,"len")=4
 	Set gtmtypes("sgmnt_data",442,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","recompute_upd_array_in_tend_cntr")=442
+	Set gtmtypes("sgmnt_data",443,"name")="sgmnt_data.recompute_upd_array_search_blk_cntr"
+	Set gtmtypes("sgmnt_data",443,"off")=3760
 	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 gtmtypfldindx("sgmnt_data","recompute_upd_array_search_blk_cntr")=443
+	Set gtmtypes("sgmnt_data",444,"name")="sgmnt_data.recompute_upd_array_new_rec_cntr"
+	Set gtmtypes("sgmnt_data",444,"off")=3764
 	Set gtmtypes("sgmnt_data",444,"len")=4
 	Set gtmtypes("sgmnt_data",444,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","recompute_upd_array_new_rec_cntr")=444
+	Set gtmtypes("sgmnt_data",445,"name")="sgmnt_data.recompute_upd_array_rec_size_cntr"
+	Set gtmtypes("sgmnt_data",445,"off")=3768
 	Set gtmtypes("sgmnt_data",445,"len")=4
 	Set gtmtypes("sgmnt_data",445,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","recompute_upd_array_rec_size_cntr")=445
+	Set gtmtypes("sgmnt_data",446,"name")="sgmnt_data.recompute_upd_array_rec_cmpc_cntr"
+	Set gtmtypes("sgmnt_data",446,"off")=3772
 	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 gtmtypfldindx("sgmnt_data","recompute_upd_array_rec_cmpc_cntr")=446
+	Set gtmtypes("sgmnt_data",447,"name")="sgmnt_data.recompute_upd_array_blk_fini_cntr"
+	Set gtmtypes("sgmnt_data",447,"off")=3776
 	Set gtmtypes("sgmnt_data",447,"len")=4
 	Set gtmtypes("sgmnt_data",447,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","recompute_upd_array_blk_fini_cntr")=447
+	Set gtmtypes("sgmnt_data",448,"name")="sgmnt_data.recompute_upd_array_blk_split_cntr"
+	Set gtmtypes("sgmnt_data",448,"off")=3780
 	Set gtmtypes("sgmnt_data",448,"len")=4
 	Set gtmtypes("sgmnt_data",448,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","recompute_upd_array_blk_split_cntr")=448
+	Set gtmtypes("sgmnt_data",449,"name")="sgmnt_data.t_qread_ripsleep_cnt_cntr"
+	Set gtmtypes("sgmnt_data",449,"off")=3784
 	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 gtmtypfldindx("sgmnt_data","t_qread_ripsleep_cnt_cntr")=449
+	Set gtmtypes("sgmnt_data",450,"name")="sgmnt_data.t_qread_ripsleep_nblks_cntr"
+	Set gtmtypes("sgmnt_data",450,"off")=3788
 	Set gtmtypes("sgmnt_data",450,"len")=4
 	Set gtmtypes("sgmnt_data",450,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","t_qread_ripsleep_nblks_cntr")=450
+	Set gtmtypes("sgmnt_data",451,"name")="sgmnt_data.wcs_wtfini_invoked_cntr"
+	Set gtmtypes("sgmnt_data",451,"off")=3792
 	Set gtmtypes("sgmnt_data",451,"len")=4
 	Set gtmtypes("sgmnt_data",451,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","wcs_wtfini_invoked_cntr")=451
+	Set gtmtypes("sgmnt_data",452,"name")="sgmnt_data.wcs_wterror_invoked_cntr"
+	Set gtmtypes("sgmnt_data",452,"off")=3796
 	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 gtmtypfldindx("sgmnt_data","wcs_wterror_invoked_cntr")=452
+	Set gtmtypes("sgmnt_data",453,"name")="sgmnt_data.wcs_wt_restart_invoked_cntr"
+	Set gtmtypes("sgmnt_data",453,"off")=3800
 	Set gtmtypes("sgmnt_data",453,"len")=4
 	Set gtmtypes("sgmnt_data",453,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","wcs_wt_restart_invoked_cntr")=453
+	Set gtmtypes("sgmnt_data",454,"name")="sgmnt_data.wcs_wt_restart_eagain_cntr"
+	Set gtmtypes("sgmnt_data",454,"off")=3804
 	Set gtmtypes("sgmnt_data",454,"len")=4
 	Set gtmtypes("sgmnt_data",454,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","wcs_wt_restart_eagain_cntr")=454
+	Set gtmtypes("sgmnt_data",455,"name")="sgmnt_data.wcs_wt_restart_reinsert_cntr"
+	Set gtmtypes("sgmnt_data",455,"off")=3808
 	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 gtmtypfldindx("sgmnt_data","wcs_wt_restart_reinsert_cntr")=455
+	Set gtmtypes("sgmnt_data",456,"name")="sgmnt_data.wcs_wtstart_eagain_cntr"
+	Set gtmtypes("sgmnt_data",456,"off")=3812
+	Set gtmtypes("sgmnt_data",456,"len")=4
+	Set gtmtypes("sgmnt_data",456,"type")="int"
+	Set gtmtypfldindx("sgmnt_data","wcs_wtstart_eagain_cntr")=456
+	Set gtmtypes("sgmnt_data",457,"name")="sgmnt_data.wcs_wtstart_eagain_incrit_cntr"
+	Set gtmtypes("sgmnt_data",457,"off")=3816
+	Set gtmtypes("sgmnt_data",457,"len")=4
+	Set gtmtypes("sgmnt_data",457,"type")="int"
+	Set gtmtypfldindx("sgmnt_data","wcs_wtstart_eagain_incrit_cntr")=457
+	Set gtmtypes("sgmnt_data",458,"name")="sgmnt_data.async_restart_eagain_cntr"
+	Set gtmtypes("sgmnt_data",458,"off")=3820
 	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 gtmtypfldindx("sgmnt_data","async_restart_eagain_cntr")=458
+	Set gtmtypes("sgmnt_data",459,"name")="sgmnt_data.jnlbuff_phs2cmt_array_full_cntr"
+	Set gtmtypes("sgmnt_data",459,"off")=3824
 	Set gtmtypes("sgmnt_data",459,"len")=4
 	Set gtmtypes("sgmnt_data",459,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","jnlbuff_phs2cmt_array_full_cntr")=459
+	Set gtmtypes("sgmnt_data",460,"name")="sgmnt_data.jnl_phase2_cleanup_if_possible_cntr"
+	Set gtmtypes("sgmnt_data",460,"off")=3828
+	Set gtmtypes("sgmnt_data",460,"len")=4
+	Set gtmtypes("sgmnt_data",460,"type")="int"
+	Set gtmtypfldindx("sgmnt_data","jnl_phase2_cleanup_if_possible_cntr")=460
+	Set gtmtypes("sgmnt_data",461,"name")="sgmnt_data.jnlbuff_phs2cmt_isprcalv_cntr"
+	Set gtmtypes("sgmnt_data",461,"off")=3832
 	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_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 gtmtypfldindx("sgmnt_data","jnlbuff_phs2cmt_isprcalv_cntr")=461
+	Set gtmtypes("sgmnt_data",462,"name")="sgmnt_data.bg_trc_rec_cntr_filler"
+	Set gtmtypes("sgmnt_data",462,"off")=3836
+	Set gtmtypes("sgmnt_data",462,"len")=12
+	Set gtmtypes("sgmnt_data",462,"type")="char"
+	Set gtmtypfldindx("sgmnt_data","bg_trc_rec_cntr_filler")=462
+	Set gtmtypes("sgmnt_data",463,"name")="sgmnt_data.n_gvcst_srches"
+	Set gtmtypes("sgmnt_data",463,"off")=3848
 	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 gtmtypfldindx("sgmnt_data","n_gvcst_srches")=463
+	Set gtmtypes("sgmnt_data",464,"name")="sgmnt_data.n_gvcst_srches.curr_count"
+	Set gtmtypes("sgmnt_data",464,"off")=3848
 	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 gtmtypfldindx("sgmnt_data","n_gvcst_srches.curr_count")=464
+	Set gtmtypes("sgmnt_data",465,"name")="sgmnt_data.n_gvcst_srches.cumul_count"
+	Set gtmtypes("sgmnt_data",465,"off")=3852
 	Set gtmtypes("sgmnt_data",465,"len")=4
 	Set gtmtypes("sgmnt_data",465,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","n_gvcst_srches.cumul_count")=465
+	Set gtmtypes("sgmnt_data",466,"name")="sgmnt_data.n_gvcst_srch_clues"
+	Set gtmtypes("sgmnt_data",466,"off")=3856
 	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 gtmtypfldindx("sgmnt_data","n_gvcst_srch_clues")=466
+	Set gtmtypes("sgmnt_data",467,"name")="sgmnt_data.n_gvcst_srch_clues.curr_count"
+	Set gtmtypes("sgmnt_data",467,"off")=3856
 	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 gtmtypfldindx("sgmnt_data","n_gvcst_srch_clues.curr_count")=467
+	Set gtmtypes("sgmnt_data",468,"name")="sgmnt_data.n_gvcst_srch_clues.cumul_count"
+	Set gtmtypes("sgmnt_data",468,"off")=3860
 	Set gtmtypes("sgmnt_data",468,"len")=4
 	Set gtmtypes("sgmnt_data",468,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","n_gvcst_srch_clues.cumul_count")=468
+	Set gtmtypes("sgmnt_data",469,"name")="sgmnt_data.n_clue_used_head"
+	Set gtmtypes("sgmnt_data",469,"off")=3864
 	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 gtmtypfldindx("sgmnt_data","n_clue_used_head")=469
+	Set gtmtypes("sgmnt_data",470,"name")="sgmnt_data.n_clue_used_head.curr_count"
+	Set gtmtypes("sgmnt_data",470,"off")=3864
 	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 gtmtypfldindx("sgmnt_data","n_clue_used_head.curr_count")=470
+	Set gtmtypes("sgmnt_data",471,"name")="sgmnt_data.n_clue_used_head.cumul_count"
+	Set gtmtypes("sgmnt_data",471,"off")=3868
 	Set gtmtypes("sgmnt_data",471,"len")=4
 	Set gtmtypes("sgmnt_data",471,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","n_clue_used_head.cumul_count")=471
+	Set gtmtypes("sgmnt_data",472,"name")="sgmnt_data.n_clue_used_same"
+	Set gtmtypes("sgmnt_data",472,"off")=3872
 	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 gtmtypfldindx("sgmnt_data","n_clue_used_same")=472
+	Set gtmtypes("sgmnt_data",473,"name")="sgmnt_data.n_clue_used_same.curr_count"
+	Set gtmtypes("sgmnt_data",473,"off")=3872
 	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 gtmtypfldindx("sgmnt_data","n_clue_used_same.curr_count")=473
+	Set gtmtypes("sgmnt_data",474,"name")="sgmnt_data.n_clue_used_same.cumul_count"
+	Set gtmtypes("sgmnt_data",474,"off")=3876
 	Set gtmtypes("sgmnt_data",474,"len")=4
 	Set gtmtypes("sgmnt_data",474,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","n_clue_used_same.cumul_count")=474
+	Set gtmtypes("sgmnt_data",475,"name")="sgmnt_data.n_clue_used_tail"
+	Set gtmtypes("sgmnt_data",475,"off")=3880
 	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 gtmtypfldindx("sgmnt_data","n_clue_used_tail")=475
+	Set gtmtypes("sgmnt_data",476,"name")="sgmnt_data.n_clue_used_tail.curr_count"
+	Set gtmtypes("sgmnt_data",476,"off")=3880
 	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 gtmtypfldindx("sgmnt_data","n_clue_used_tail.curr_count")=476
+	Set gtmtypes("sgmnt_data",477,"name")="sgmnt_data.n_clue_used_tail.cumul_count"
+	Set gtmtypes("sgmnt_data",477,"off")=3884
 	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 gtmtypfldindx("sgmnt_data","n_clue_used_tail.cumul_count")=477
+	Set gtmtypes("sgmnt_data",478,"name")="sgmnt_data.n_t_qreads"
+	Set gtmtypes("sgmnt_data",478,"off")=3888
 	Set gtmtypes("sgmnt_data",478,"len")=8
 	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 gtmtypfldindx("sgmnt_data","n_t_qreads")=478
+	Set gtmtypes("sgmnt_data",479,"name")="sgmnt_data.n_t_qreads.curr_count"
+	Set gtmtypes("sgmnt_data",479,"off")=3888
 	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 gtmtypfldindx("sgmnt_data","n_t_qreads.curr_count")=479
+	Set gtmtypes("sgmnt_data",480,"name")="sgmnt_data.n_t_qreads.cumul_count"
+	Set gtmtypes("sgmnt_data",480,"off")=3892
 	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 gtmtypfldindx("sgmnt_data","n_t_qreads.cumul_count")=480
+	Set gtmtypes("sgmnt_data",481,"name")="sgmnt_data.unused_dsk_reads"
+	Set gtmtypes("sgmnt_data",481,"off")=3896
 	Set gtmtypes("sgmnt_data",481,"len")=8
 	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 gtmtypfldindx("sgmnt_data","unused_dsk_reads")=481
+	Set gtmtypes("sgmnt_data",482,"name")="sgmnt_data.unused_dsk_reads.curr_count"
+	Set gtmtypes("sgmnt_data",482,"off")=3896
 	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 gtmtypfldindx("sgmnt_data","unused_dsk_reads.curr_count")=482
+	Set gtmtypes("sgmnt_data",483,"name")="sgmnt_data.unused_dsk_reads.cumul_count"
+	Set gtmtypes("sgmnt_data",483,"off")=3900
 	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 gtmtypfldindx("sgmnt_data","unused_dsk_reads.cumul_count")=483
+	Set gtmtypes("sgmnt_data",484,"name")="sgmnt_data.n_bgmm_updates"
+	Set gtmtypes("sgmnt_data",484,"off")=3904
 	Set gtmtypes("sgmnt_data",484,"len")=8
 	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 gtmtypfldindx("sgmnt_data","n_bgmm_updates")=484
+	Set gtmtypes("sgmnt_data",485,"name")="sgmnt_data.n_bgmm_updates.curr_count"
+	Set gtmtypes("sgmnt_data",485,"off")=3904
 	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 gtmtypfldindx("sgmnt_data","n_bgmm_updates.curr_count")=485
+	Set gtmtypes("sgmnt_data",486,"name")="sgmnt_data.n_bgmm_updates.cumul_count"
+	Set gtmtypes("sgmnt_data",486,"off")=3908
 	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 gtmtypfldindx("sgmnt_data","n_bgmm_updates.cumul_count")=486
+	Set gtmtypes("sgmnt_data",487,"name")="sgmnt_data.unused_dsk_writes"
+	Set gtmtypes("sgmnt_data",487,"off")=3912
 	Set gtmtypes("sgmnt_data",487,"len")=8
 	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 gtmtypfldindx("sgmnt_data","unused_dsk_writes")=487
+	Set gtmtypes("sgmnt_data",488,"name")="sgmnt_data.unused_dsk_writes.curr_count"
+	Set gtmtypes("sgmnt_data",488,"off")=3912
 	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 gtmtypfldindx("sgmnt_data","unused_dsk_writes.curr_count")=488
+	Set gtmtypes("sgmnt_data",489,"name")="sgmnt_data.unused_dsk_writes.cumul_count"
+	Set gtmtypes("sgmnt_data",489,"off")=3916
 	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 gtmtypfldindx("sgmnt_data","unused_dsk_writes.cumul_count")=489
+	Set gtmtypes("sgmnt_data",490,"name")="sgmnt_data.n_bg_update_creates"
+	Set gtmtypes("sgmnt_data",490,"off")=3920
 	Set gtmtypes("sgmnt_data",490,"len")=8
 	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 gtmtypfldindx("sgmnt_data","n_bg_update_creates")=490
+	Set gtmtypes("sgmnt_data",491,"name")="sgmnt_data.n_bg_update_creates.curr_count"
+	Set gtmtypes("sgmnt_data",491,"off")=3920
 	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 gtmtypfldindx("sgmnt_data","n_bg_update_creates.curr_count")=491
+	Set gtmtypes("sgmnt_data",492,"name")="sgmnt_data.n_bg_update_creates.cumul_count"
+	Set gtmtypes("sgmnt_data",492,"off")=3924
 	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_set")=495
-	Set gtmtypes("sgmnt_data",496,"name")="sgmnt_data.gvstats_rec.n_kill"
-	Set gtmtypes("sgmnt_data",496,"off")=4104
+	Set gtmtypfldindx("sgmnt_data","n_bg_update_creates.cumul_count")=492
+	Set gtmtypes("sgmnt_data",493,"name")="sgmnt_data.n_db_csh_getns"
+	Set gtmtypes("sgmnt_data",493,"off")=3928
+	Set gtmtypes("sgmnt_data",493,"len")=8
+	Set gtmtypes("sgmnt_data",493,"type")="db_csh_acct_rec"
+	Set gtmtypfldindx("sgmnt_data","n_db_csh_getns")=493
+	Set gtmtypes("sgmnt_data",494,"name")="sgmnt_data.n_db_csh_getns.curr_count"
+	Set gtmtypes("sgmnt_data",494,"off")=3928
+	Set gtmtypes("sgmnt_data",494,"len")=4
+	Set gtmtypes("sgmnt_data",494,"type")="int"
+	Set gtmtypfldindx("sgmnt_data","n_db_csh_getns.curr_count")=494
+	Set gtmtypes("sgmnt_data",495,"name")="sgmnt_data.n_db_csh_getns.cumul_count"
+	Set gtmtypes("sgmnt_data",495,"off")=3932
+	Set gtmtypes("sgmnt_data",495,"len")=4
+	Set gtmtypes("sgmnt_data",495,"type")="int"
+	Set gtmtypfldindx("sgmnt_data","n_db_csh_getns.cumul_count")=495
+	Set gtmtypes("sgmnt_data",496,"name")="sgmnt_data.n_db_csh_getn_lcnt"
+	Set gtmtypes("sgmnt_data",496,"off")=3936
 	Set gtmtypes("sgmnt_data",496,"len")=8
-	Set gtmtypes("sgmnt_data",496,"type")="uint64_t"
-	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_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_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_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_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",496,"type")="db_csh_acct_rec"
+	Set gtmtypfldindx("sgmnt_data","n_db_csh_getn_lcnt")=496
+	Set gtmtypes("sgmnt_data",497,"name")="sgmnt_data.n_db_csh_getn_lcnt.curr_count"
+	Set gtmtypes("sgmnt_data",497,"off")=3936
+	Set gtmtypes("sgmnt_data",497,"len")=4
+	Set gtmtypes("sgmnt_data",497,"type")="int"
+	Set gtmtypfldindx("sgmnt_data","n_db_csh_getn_lcnt.curr_count")=497
+	Set gtmtypes("sgmnt_data",498,"name")="sgmnt_data.n_db_csh_getn_lcnt.cumul_count"
+	Set gtmtypes("sgmnt_data",498,"off")=3940
+	Set gtmtypes("sgmnt_data",498,"len")=4
+	Set gtmtypes("sgmnt_data",498,"type")="int"
+	Set gtmtypfldindx("sgmnt_data","n_db_csh_getn_lcnt.cumul_count")=498
+	Set gtmtypes("sgmnt_data",499,"name")="sgmnt_data.db_csh_acct_rec_filler_4k"
+	Set gtmtypes("sgmnt_data",499,"off")=3944
+	Set gtmtypes("sgmnt_data",499,"len")=152
+	Set gtmtypes("sgmnt_data",499,"type")="char"
+	Set gtmtypfldindx("sgmnt_data","db_csh_acct_rec_filler_4k")=499
+	Set gtmtypes("sgmnt_data",500,"name")="sgmnt_data.gvstats_rec"
+	Set gtmtypes("sgmnt_data",500,"off")=4096
+	Set gtmtypes("sgmnt_data",500,"len")=472
+	Set gtmtypes("sgmnt_data",500,"type")="gvstats_rec_t"
+	Set gtmtypfldindx("sgmnt_data","gvstats_rec")=500
+	Set gtmtypes("sgmnt_data",501,"name")="sgmnt_data.gvstats_rec.n_set"
+	Set gtmtypes("sgmnt_data",501,"off")=4096
 	Set gtmtypes("sgmnt_data",501,"len")=8
 	Set gtmtypes("sgmnt_data",501,"type")="uint64_t"
-	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 gtmtypfldindx("sgmnt_data","gvstats_rec.n_set")=501
+	Set gtmtypes("sgmnt_data",502,"name")="sgmnt_data.gvstats_rec.n_kill"
+	Set gtmtypes("sgmnt_data",502,"off")=4104
 	Set gtmtypes("sgmnt_data",502,"len")=8
 	Set gtmtypes("sgmnt_data",502,"type")="uint64_t"
-	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 gtmtypfldindx("sgmnt_data","gvstats_rec.n_kill")=502
+	Set gtmtypes("sgmnt_data",503,"name")="sgmnt_data.gvstats_rec.n_get"
+	Set gtmtypes("sgmnt_data",503,"off")=4112
 	Set gtmtypes("sgmnt_data",503,"len")=8
 	Set gtmtypes("sgmnt_data",503,"type")="uint64_t"
-	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 gtmtypfldindx("sgmnt_data","gvstats_rec.n_get")=503
+	Set gtmtypes("sgmnt_data",504,"name")="sgmnt_data.gvstats_rec.n_data"
+	Set gtmtypes("sgmnt_data",504,"off")=4120
 	Set gtmtypes("sgmnt_data",504,"len")=8
 	Set gtmtypes("sgmnt_data",504,"type")="uint64_t"
-	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 gtmtypfldindx("sgmnt_data","gvstats_rec.n_data")=504
+	Set gtmtypes("sgmnt_data",505,"name")="sgmnt_data.gvstats_rec.n_order"
+	Set gtmtypes("sgmnt_data",505,"off")=4128
 	Set gtmtypes("sgmnt_data",505,"len")=8
 	Set gtmtypes("sgmnt_data",505,"type")="uint64_t"
-	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 gtmtypfldindx("sgmnt_data","gvstats_rec.n_order")=505
+	Set gtmtypes("sgmnt_data",506,"name")="sgmnt_data.gvstats_rec.n_zprev"
+	Set gtmtypes("sgmnt_data",506,"off")=4136
 	Set gtmtypes("sgmnt_data",506,"len")=8
 	Set gtmtypes("sgmnt_data",506,"type")="uint64_t"
-	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 gtmtypfldindx("sgmnt_data","gvstats_rec.n_zprev")=506
+	Set gtmtypes("sgmnt_data",507,"name")="sgmnt_data.gvstats_rec.n_query"
+	Set gtmtypes("sgmnt_data",507,"off")=4144
 	Set gtmtypes("sgmnt_data",507,"len")=8
 	Set gtmtypes("sgmnt_data",507,"type")="uint64_t"
-	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 gtmtypfldindx("sgmnt_data","gvstats_rec.n_query")=507
+	Set gtmtypes("sgmnt_data",508,"name")="sgmnt_data.gvstats_rec.n_lock_success"
+	Set gtmtypes("sgmnt_data",508,"off")=4152
 	Set gtmtypes("sgmnt_data",508,"len")=8
 	Set gtmtypes("sgmnt_data",508,"type")="uint64_t"
-	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 gtmtypfldindx("sgmnt_data","gvstats_rec.n_lock_success")=508
+	Set gtmtypes("sgmnt_data",509,"name")="sgmnt_data.gvstats_rec.n_lock_fail"
+	Set gtmtypes("sgmnt_data",509,"off")=4160
 	Set gtmtypes("sgmnt_data",509,"len")=8
 	Set gtmtypes("sgmnt_data",509,"type")="uint64_t"
-	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 gtmtypfldindx("sgmnt_data","gvstats_rec.n_lock_fail")=509
+	Set gtmtypes("sgmnt_data",510,"name")="sgmnt_data.gvstats_rec.db_curr_tn"
+	Set gtmtypes("sgmnt_data",510,"off")=4168
 	Set gtmtypes("sgmnt_data",510,"len")=8
 	Set gtmtypes("sgmnt_data",510,"type")="uint64_t"
-	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 gtmtypfldindx("sgmnt_data","gvstats_rec.db_curr_tn")=510
+	Set gtmtypes("sgmnt_data",511,"name")="sgmnt_data.gvstats_rec.n_dsk_read"
+	Set gtmtypes("sgmnt_data",511,"off")=4176
 	Set gtmtypes("sgmnt_data",511,"len")=8
 	Set gtmtypes("sgmnt_data",511,"type")="uint64_t"
-	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 gtmtypfldindx("sgmnt_data","gvstats_rec.n_dsk_read")=511
+	Set gtmtypes("sgmnt_data",512,"name")="sgmnt_data.gvstats_rec.n_dsk_write"
+	Set gtmtypes("sgmnt_data",512,"off")=4184
 	Set gtmtypes("sgmnt_data",512,"len")=8
 	Set gtmtypes("sgmnt_data",512,"type")="uint64_t"
-	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 gtmtypfldindx("sgmnt_data","gvstats_rec.n_dsk_write")=512
+	Set gtmtypes("sgmnt_data",513,"name")="sgmnt_data.gvstats_rec.n_nontp_readwrite"
+	Set gtmtypes("sgmnt_data",513,"off")=4192
 	Set gtmtypes("sgmnt_data",513,"len")=8
 	Set gtmtypes("sgmnt_data",513,"type")="uint64_t"
-	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 gtmtypfldindx("sgmnt_data","gvstats_rec.n_nontp_readwrite")=513
+	Set gtmtypes("sgmnt_data",514,"name")="sgmnt_data.gvstats_rec.n_nontp_readonly"
+	Set gtmtypes("sgmnt_data",514,"off")=4200
 	Set gtmtypes("sgmnt_data",514,"len")=8
 	Set gtmtypes("sgmnt_data",514,"type")="uint64_t"
-	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 gtmtypfldindx("sgmnt_data","gvstats_rec.n_nontp_readonly")=514
+	Set gtmtypes("sgmnt_data",515,"name")="sgmnt_data.gvstats_rec.n_nontp_blkwrite"
+	Set gtmtypes("sgmnt_data",515,"off")=4208
 	Set gtmtypes("sgmnt_data",515,"len")=8
 	Set gtmtypes("sgmnt_data",515,"type")="uint64_t"
-	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 gtmtypfldindx("sgmnt_data","gvstats_rec.n_nontp_blkwrite")=515
+	Set gtmtypes("sgmnt_data",516,"name")="sgmnt_data.gvstats_rec.n_nontp_blkread"
+	Set gtmtypes("sgmnt_data",516,"off")=4216
 	Set gtmtypes("sgmnt_data",516,"len")=8
 	Set gtmtypes("sgmnt_data",516,"type")="uint64_t"
-	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 gtmtypfldindx("sgmnt_data","gvstats_rec.n_nontp_blkread")=516
+	Set gtmtypes("sgmnt_data",517,"name")="sgmnt_data.gvstats_rec.n_nontp_retries_0"
+	Set gtmtypes("sgmnt_data",517,"off")=4224
 	Set gtmtypes("sgmnt_data",517,"len")=8
 	Set gtmtypes("sgmnt_data",517,"type")="uint64_t"
-	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 gtmtypfldindx("sgmnt_data","gvstats_rec.n_nontp_retries_0")=517
+	Set gtmtypes("sgmnt_data",518,"name")="sgmnt_data.gvstats_rec.n_nontp_retries_1"
+	Set gtmtypes("sgmnt_data",518,"off")=4232
 	Set gtmtypes("sgmnt_data",518,"len")=8
 	Set gtmtypes("sgmnt_data",518,"type")="uint64_t"
-	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 gtmtypfldindx("sgmnt_data","gvstats_rec.n_nontp_retries_1")=518
+	Set gtmtypes("sgmnt_data",519,"name")="sgmnt_data.gvstats_rec.n_nontp_retries_2"
+	Set gtmtypes("sgmnt_data",519,"off")=4240
 	Set gtmtypes("sgmnt_data",519,"len")=8
 	Set gtmtypes("sgmnt_data",519,"type")="uint64_t"
-	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 gtmtypfldindx("sgmnt_data","gvstats_rec.n_nontp_retries_2")=519
+	Set gtmtypes("sgmnt_data",520,"name")="sgmnt_data.gvstats_rec.n_nontp_retries_3"
+	Set gtmtypes("sgmnt_data",520,"off")=4248
 	Set gtmtypes("sgmnt_data",520,"len")=8
 	Set gtmtypes("sgmnt_data",520,"type")="uint64_t"
-	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 gtmtypfldindx("sgmnt_data","gvstats_rec.n_nontp_retries_3")=520
+	Set gtmtypes("sgmnt_data",521,"name")="sgmnt_data.gvstats_rec.n_tp_readwrite"
+	Set gtmtypes("sgmnt_data",521,"off")=4256
 	Set gtmtypes("sgmnt_data",521,"len")=8
 	Set gtmtypes("sgmnt_data",521,"type")="uint64_t"
-	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 gtmtypfldindx("sgmnt_data","gvstats_rec.n_tp_readwrite")=521
+	Set gtmtypes("sgmnt_data",522,"name")="sgmnt_data.gvstats_rec.n_tp_readonly"
+	Set gtmtypes("sgmnt_data",522,"off")=4264
 	Set gtmtypes("sgmnt_data",522,"len")=8
 	Set gtmtypes("sgmnt_data",522,"type")="uint64_t"
-	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 gtmtypfldindx("sgmnt_data","gvstats_rec.n_tp_readonly")=522
+	Set gtmtypes("sgmnt_data",523,"name")="sgmnt_data.gvstats_rec.n_tp_rolledback"
+	Set gtmtypes("sgmnt_data",523,"off")=4272
 	Set gtmtypes("sgmnt_data",523,"len")=8
 	Set gtmtypes("sgmnt_data",523,"type")="uint64_t"
-	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 gtmtypfldindx("sgmnt_data","gvstats_rec.n_tp_rolledback")=523
+	Set gtmtypes("sgmnt_data",524,"name")="sgmnt_data.gvstats_rec.n_tp_blkwrite"
+	Set gtmtypes("sgmnt_data",524,"off")=4280
 	Set gtmtypes("sgmnt_data",524,"len")=8
 	Set gtmtypes("sgmnt_data",524,"type")="uint64_t"
-	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 gtmtypfldindx("sgmnt_data","gvstats_rec.n_tp_blkwrite")=524
+	Set gtmtypes("sgmnt_data",525,"name")="sgmnt_data.gvstats_rec.n_tp_blkread"
+	Set gtmtypes("sgmnt_data",525,"off")=4288
 	Set gtmtypes("sgmnt_data",525,"len")=8
 	Set gtmtypes("sgmnt_data",525,"type")="uint64_t"
-	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 gtmtypfldindx("sgmnt_data","gvstats_rec.n_tp_blkread")=525
+	Set gtmtypes("sgmnt_data",526,"name")="sgmnt_data.gvstats_rec.n_tp_tot_retries_0"
+	Set gtmtypes("sgmnt_data",526,"off")=4296
 	Set gtmtypes("sgmnt_data",526,"len")=8
 	Set gtmtypes("sgmnt_data",526,"type")="uint64_t"
-	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 gtmtypfldindx("sgmnt_data","gvstats_rec.n_tp_tot_retries_0")=526
+	Set gtmtypes("sgmnt_data",527,"name")="sgmnt_data.gvstats_rec.n_tp_tot_retries_1"
+	Set gtmtypes("sgmnt_data",527,"off")=4304
 	Set gtmtypes("sgmnt_data",527,"len")=8
 	Set gtmtypes("sgmnt_data",527,"type")="uint64_t"
-	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 gtmtypfldindx("sgmnt_data","gvstats_rec.n_tp_tot_retries_1")=527
+	Set gtmtypes("sgmnt_data",528,"name")="sgmnt_data.gvstats_rec.n_tp_tot_retries_2"
+	Set gtmtypes("sgmnt_data",528,"off")=4312
 	Set gtmtypes("sgmnt_data",528,"len")=8
 	Set gtmtypes("sgmnt_data",528,"type")="uint64_t"
-	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 gtmtypfldindx("sgmnt_data","gvstats_rec.n_tp_tot_retries_2")=528
+	Set gtmtypes("sgmnt_data",529,"name")="sgmnt_data.gvstats_rec.n_tp_tot_retries_3"
+	Set gtmtypes("sgmnt_data",529,"off")=4320
 	Set gtmtypes("sgmnt_data",529,"len")=8
 	Set gtmtypes("sgmnt_data",529,"type")="uint64_t"
-	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 gtmtypfldindx("sgmnt_data","gvstats_rec.n_tp_tot_retries_3")=529
+	Set gtmtypes("sgmnt_data",530,"name")="sgmnt_data.gvstats_rec.n_tp_tot_retries_4"
+	Set gtmtypes("sgmnt_data",530,"off")=4328
 	Set gtmtypes("sgmnt_data",530,"len")=8
 	Set gtmtypes("sgmnt_data",530,"type")="uint64_t"
-	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 gtmtypfldindx("sgmnt_data","gvstats_rec.n_tp_tot_retries_4")=530
+	Set gtmtypes("sgmnt_data",531,"name")="sgmnt_data.gvstats_rec.n_tp_cnflct_retries_0"
+	Set gtmtypes("sgmnt_data",531,"off")=4336
 	Set gtmtypes("sgmnt_data",531,"len")=8
 	Set gtmtypes("sgmnt_data",531,"type")="uint64_t"
-	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 gtmtypfldindx("sgmnt_data","gvstats_rec.n_tp_cnflct_retries_0")=531
+	Set gtmtypes("sgmnt_data",532,"name")="sgmnt_data.gvstats_rec.n_tp_cnflct_retries_1"
+	Set gtmtypes("sgmnt_data",532,"off")=4344
 	Set gtmtypes("sgmnt_data",532,"len")=8
 	Set gtmtypes("sgmnt_data",532,"type")="uint64_t"
-	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 gtmtypfldindx("sgmnt_data","gvstats_rec.n_tp_cnflct_retries_1")=532
+	Set gtmtypes("sgmnt_data",533,"name")="sgmnt_data.gvstats_rec.n_tp_cnflct_retries_2"
+	Set gtmtypes("sgmnt_data",533,"off")=4352
 	Set gtmtypes("sgmnt_data",533,"len")=8
 	Set gtmtypes("sgmnt_data",533,"type")="uint64_t"
-	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 gtmtypfldindx("sgmnt_data","gvstats_rec.n_tp_cnflct_retries_2")=533
+	Set gtmtypes("sgmnt_data",534,"name")="sgmnt_data.gvstats_rec.n_tp_cnflct_retries_3"
+	Set gtmtypes("sgmnt_data",534,"off")=4360
 	Set gtmtypes("sgmnt_data",534,"len")=8
 	Set gtmtypes("sgmnt_data",534,"type")="uint64_t"
-	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 gtmtypfldindx("sgmnt_data","gvstats_rec.n_tp_cnflct_retries_3")=534
+	Set gtmtypes("sgmnt_data",535,"name")="sgmnt_data.gvstats_rec.n_tp_cnflct_retries_4"
+	Set gtmtypes("sgmnt_data",535,"off")=4368
 	Set gtmtypes("sgmnt_data",535,"len")=8
 	Set gtmtypes("sgmnt_data",535,"type")="uint64_t"
-	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 gtmtypfldindx("sgmnt_data","gvstats_rec.n_tp_cnflct_retries_4")=535
+	Set gtmtypes("sgmnt_data",536,"name")="sgmnt_data.gvstats_rec.n_ztrigger"
+	Set gtmtypes("sgmnt_data",536,"off")=4376
 	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 gtmtypfldindx("sgmnt_data","gvstats_rec.n_ztrigger")=536
+	Set gtmtypes("sgmnt_data",537,"name")="sgmnt_data.gvstats_rec.n_db_flush"
+	Set gtmtypes("sgmnt_data",537,"off")=4384
 	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 gtmtypfldindx("sgmnt_data","gvstats_rec.n_db_flush")=537
+	Set gtmtypes("sgmnt_data",538,"name")="sgmnt_data.gvstats_rec.n_db_fsync"
+	Set gtmtypes("sgmnt_data",538,"off")=4392
 	Set gtmtypes("sgmnt_data",538,"len")=8
 	Set gtmtypes("sgmnt_data",538,"type")="uint64_t"
-	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 gtmtypfldindx("sgmnt_data","gvstats_rec.n_db_fsync")=538
+	Set gtmtypes("sgmnt_data",539,"name")="sgmnt_data.gvstats_rec.n_jnl_flush"
+	Set gtmtypes("sgmnt_data",539,"off")=4400
 	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 gtmtypfldindx("sgmnt_data","gvstats_rec.n_jnl_flush")=539
+	Set gtmtypes("sgmnt_data",540,"name")="sgmnt_data.gvstats_rec.n_jnl_fsync"
+	Set gtmtypes("sgmnt_data",540,"off")=4408
 	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 gtmtypfldindx("sgmnt_data","gvstats_rec.n_jnl_fsync")=540
+	Set gtmtypes("sgmnt_data",541,"name")="sgmnt_data.gvstats_rec.n_jbuff_bytes"
+	Set gtmtypes("sgmnt_data",541,"off")=4416
 	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 gtmtypfldindx("sgmnt_data","gvstats_rec.n_jbuff_bytes")=541
+	Set gtmtypes("sgmnt_data",542,"name")="sgmnt_data.gvstats_rec.n_jfile_bytes"
+	Set gtmtypes("sgmnt_data",542,"off")=4424
 	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 gtmtypfldindx("sgmnt_data","gvstats_rec.n_jfile_bytes")=542
+	Set gtmtypes("sgmnt_data",543,"name")="sgmnt_data.gvstats_rec.n_jfile_writes"
+	Set gtmtypes("sgmnt_data",543,"off")=4432
 	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 gtmtypfldindx("sgmnt_data","gvstats_rec.n_jfile_writes")=543
+	Set gtmtypes("sgmnt_data",544,"name")="sgmnt_data.gvstats_rec.n_jrec_logical"
+	Set gtmtypes("sgmnt_data",544,"off")=4440
 	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 gtmtypfldindx("sgmnt_data","gvstats_rec.n_jrec_logical")=544
+	Set gtmtypes("sgmnt_data",545,"name")="sgmnt_data.gvstats_rec.n_jrec_pblk"
+	Set gtmtypes("sgmnt_data",545,"off")=4448
 	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 gtmtypfldindx("sgmnt_data","gvstats_rec.n_jrec_pblk")=545
+	Set gtmtypes("sgmnt_data",546,"name")="sgmnt_data.gvstats_rec.n_jrec_epoch_regular"
+	Set gtmtypes("sgmnt_data",546,"off")=4456
 	Set gtmtypes("sgmnt_data",546,"len")=8
 	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 gtmtypfldindx("sgmnt_data","gvstats_rec.n_jrec_epoch_regular")=546
+	Set gtmtypes("sgmnt_data",547,"name")="sgmnt_data.gvstats_rec.n_jrec_epoch_idle"
+	Set gtmtypes("sgmnt_data",547,"off")=4464
 	Set gtmtypes("sgmnt_data",547,"len")=8
 	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 gtmtypfldindx("sgmnt_data","gvstats_rec.n_jrec_epoch_idle")=547
+	Set gtmtypes("sgmnt_data",548,"name")="sgmnt_data.gvstats_rec.n_jrec_other"
+	Set gtmtypes("sgmnt_data",548,"off")=4472
 	Set gtmtypes("sgmnt_data",548,"len")=8
 	Set gtmtypes("sgmnt_data",548,"type")="uint64_t"
-	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 gtmtypfldindx("sgmnt_data","gvstats_rec.n_jrec_other")=548
+	Set gtmtypes("sgmnt_data",549,"name")="sgmnt_data.gvstats_rec.n_jnl_extends"
+	Set gtmtypes("sgmnt_data",549,"off")=4480
 	Set gtmtypes("sgmnt_data",549,"len")=8
 	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 gtmtypfldindx("sgmnt_data","gvstats_rec.n_jnl_extends")=549
+	Set gtmtypes("sgmnt_data",550,"name")="sgmnt_data.gvstats_rec.n_db_extends"
+	Set gtmtypes("sgmnt_data",550,"off")=4488
 	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 gtmtypfldindx("sgmnt_data","gvstats_rec.n_db_extends")=550
+	Set gtmtypes("sgmnt_data",551,"name")="sgmnt_data.gvstats_rec.n_crit_success"
+	Set gtmtypes("sgmnt_data",551,"off")=4496
 	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 gtmtypfldindx("sgmnt_data","gvstats_rec.n_crit_success")=551
+	Set gtmtypes("sgmnt_data",552,"name")="sgmnt_data.gvstats_rec.n_crits_in_epch"
+	Set gtmtypes("sgmnt_data",552,"off")=4504
 	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 gtmtypfldindx("sgmnt_data","gvstats_rec.n_crits_in_epch")=552
+	Set gtmtypes("sgmnt_data",553,"name")="sgmnt_data.gvstats_rec.sq_crit_failed"
+	Set gtmtypes("sgmnt_data",553,"off")=4512
 	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 gtmtypfldindx("sgmnt_data","gvstats_rec.sq_crit_failed")=553
+	Set gtmtypes("sgmnt_data",554,"name")="sgmnt_data.gvstats_rec.n_crit_failed"
+	Set gtmtypes("sgmnt_data",554,"off")=4520
+	Set gtmtypes("sgmnt_data",554,"len")=8
+	Set gtmtypes("sgmnt_data",554,"type")="uint64_t"
+	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_crit_failed")=554
+	Set gtmtypes("sgmnt_data",555,"name")="sgmnt_data.gvstats_rec.sq_crit_que_slps"
+	Set gtmtypes("sgmnt_data",555,"off")=4528
+	Set gtmtypes("sgmnt_data",555,"len")=8
+	Set gtmtypes("sgmnt_data",555,"type")="uint64_t"
+	Set gtmtypfldindx("sgmnt_data","gvstats_rec.sq_crit_que_slps")=555
+	Set gtmtypes("sgmnt_data",556,"name")="sgmnt_data.gvstats_rec.n_crit_que_slps"
+	Set gtmtypes("sgmnt_data",556,"off")=4536
+	Set gtmtypes("sgmnt_data",556,"len")=8
 	Set gtmtypes("sgmnt_data",556,"type")="uint64_t"
-	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.creation_db_ver"
-	Set gtmtypes("sgmnt_data",557,"off")=5104
-	Set gtmtypes("sgmnt_data",557,"len")=4
-	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")="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")="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")="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")="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 gtmtypfldindx("sgmnt_data","gvstats_rec.n_crit_que_slps")=556
+	Set gtmtypes("sgmnt_data",557,"name")="sgmnt_data.gvstats_rec.sq_crit_yields"
+	Set gtmtypes("sgmnt_data",557,"off")=4544
+	Set gtmtypes("sgmnt_data",557,"len")=8
+	Set gtmtypes("sgmnt_data",557,"type")="uint64_t"
+	Set gtmtypfldindx("sgmnt_data","gvstats_rec.sq_crit_yields")=557
+	Set gtmtypes("sgmnt_data",558,"name")="sgmnt_data.gvstats_rec.n_crit_yields"
+	Set gtmtypes("sgmnt_data",558,"off")=4552
+	Set gtmtypes("sgmnt_data",558,"len")=8
+	Set gtmtypes("sgmnt_data",558,"type")="uint64_t"
+	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_crit_yields")=558
+	Set gtmtypes("sgmnt_data",559,"name")="sgmnt_data.gvstats_rec.n_clean2dirty"
+	Set gtmtypes("sgmnt_data",559,"off")=4560
+	Set gtmtypes("sgmnt_data",559,"len")=8
+	Set gtmtypes("sgmnt_data",559,"type")="uint64_t"
+	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_clean2dirty")=559
+	Set gtmtypes("sgmnt_data",560,"name")="sgmnt_data.gvstats_rec_filler_4k_plus_512"
+	Set gtmtypes("sgmnt_data",560,"off")=4568
+	Set gtmtypes("sgmnt_data",560,"len")=40
+	Set gtmtypes("sgmnt_data",560,"type")="char"
+	Set gtmtypfldindx("sgmnt_data","gvstats_rec_filler_4k_plus_512")=560
+	Set gtmtypes("sgmnt_data",561,"name")="sgmnt_data.filler_4k_plus_512"
+	Set gtmtypes("sgmnt_data",561,"off")=4608
+	Set gtmtypes("sgmnt_data",561,"len")=368
+	Set gtmtypes("sgmnt_data",561,"type")="char"
+	Set gtmtypfldindx("sgmnt_data","filler_4k_plus_512")=561
+	Set gtmtypes("sgmnt_data",562,"name")="sgmnt_data.intrpt_recov_resync_strm_seqno"
+	Set gtmtypes("sgmnt_data",562,"off")=4976
+	Set gtmtypes("sgmnt_data",562,"len")=128
+	Set gtmtypes("sgmnt_data",562,"type")="uint64_t"
+	Set gtmtypfldindx("sgmnt_data","intrpt_recov_resync_strm_seqno")=562
+	Set gtmtypes("sgmnt_data",562,"dim")=16
+	Set gtmtypes("sgmnt_data",563,"name")="sgmnt_data.creation_db_ver"
+	Set gtmtypes("sgmnt_data",563,"off")=5104
+	Set gtmtypes("sgmnt_data",563,"len")=4
+	Set gtmtypes("sgmnt_data",563,"type")="int"
+	Set gtmtypfldindx("sgmnt_data","creation_db_ver")=563
+	Set gtmtypes("sgmnt_data",564,"name")="sgmnt_data.creation_mdb_ver"
+	Set gtmtypes("sgmnt_data",564,"off")=5108
+	Set gtmtypes("sgmnt_data",564,"len")=4
+	Set gtmtypes("sgmnt_data",564,"type")="int"
+	Set gtmtypfldindx("sgmnt_data","creation_mdb_ver")=564
+	Set gtmtypes("sgmnt_data",565,"name")="sgmnt_data.certified_for_upgrade_to"
+	Set gtmtypes("sgmnt_data",565,"off")=5112
+	Set gtmtypes("sgmnt_data",565,"len")=4
+	Set gtmtypes("sgmnt_data",565,"type")="int"
+	Set gtmtypfldindx("sgmnt_data","certified_for_upgrade_to")=565
+	Set gtmtypes("sgmnt_data",566,"name")="sgmnt_data.filler_5k"
+	Set gtmtypes("sgmnt_data",566,"off")=5116
+	Set gtmtypes("sgmnt_data",566,"len")=4
+	Set gtmtypes("sgmnt_data",566,"type")="int"
+	Set gtmtypfldindx("sgmnt_data","filler_5k")=566
+	Set gtmtypes("sgmnt_data",567,"name")="sgmnt_data.secshr_ops_index_filler"
+	Set gtmtypes("sgmnt_data",567,"off")=5120
+	Set gtmtypes("sgmnt_data",567,"len")=4
+	Set gtmtypes("sgmnt_data",567,"type")="int"
+	Set gtmtypfldindx("sgmnt_data","secshr_ops_index_filler")=567
+	Set gtmtypes("sgmnt_data",568,"name")="sgmnt_data.secshr_ops_array_filler"
+	Set gtmtypes("sgmnt_data",568,"off")=5124
+	Set gtmtypes("sgmnt_data",568,"len")=1020
 	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 gtmtypfldindx("sgmnt_data","secshr_ops_array_filler")=568
+	Set gtmtypes("sgmnt_data",568,"dim")=255
+	Set gtmtypes("sgmnt_data",569,"name")="sgmnt_data.next_upgrd_warn"
+	Set gtmtypes("sgmnt_data",569,"off")=6144
+	Set gtmtypes("sgmnt_data",569,"len")=24
+	Set gtmtypes("sgmnt_data",569,"type")="compswap_time_field"
+	Set gtmtypfldindx("sgmnt_data","next_upgrd_warn")=569
+	Set gtmtypes("sgmnt_data",570,"name")="sgmnt_data.next_upgrd_warn.time_latch"
+	Set gtmtypes("sgmnt_data",570,"off")=6144
+	Set gtmtypes("sgmnt_data",570,"len")=8
+	Set gtmtypes("sgmnt_data",570,"type")="global_latch_t"
+	Set gtmtypfldindx("sgmnt_data","next_upgrd_warn.time_latch")=570
+	Set gtmtypes("sgmnt_data",571,"name")="sgmnt_data.next_upgrd_warn.time_latch.u"
+	Set gtmtypes("sgmnt_data",571,"off")=6144
+	Set gtmtypes("sgmnt_data",571,"len")=8
+	Set gtmtypes("sgmnt_data",571,"type")="union"
+	Set gtmtypfldindx("sgmnt_data","next_upgrd_warn.time_latch.u")=571
+	Set gtmtypes("sgmnt_data",572,"name")="sgmnt_data.next_upgrd_warn.time_latch.u.pid_imgcnt"
+	Set gtmtypes("sgmnt_data",572,"off")=6144
+	Set gtmtypes("sgmnt_data",572,"len")=8
+	Set gtmtypes("sgmnt_data",572,"type")="uint64_t"
+	Set gtmtypfldindx("sgmnt_data","next_upgrd_warn.time_latch.u.pid_imgcnt")=572
+	Set gtmtypes("sgmnt_data",573,"name")="sgmnt_data.next_upgrd_warn.time_latch.u.parts"
+	Set gtmtypes("sgmnt_data",573,"off")=6144
+	Set gtmtypes("sgmnt_data",573,"len")=8
+	Set gtmtypes("sgmnt_data",573,"type")="struct"
+	Set gtmtypfldindx("sgmnt_data","next_upgrd_warn.time_latch.u.parts")=573
+	Set gtmtypes("sgmnt_data",574,"name")="sgmnt_data.next_upgrd_warn.time_latch.u.parts.latch_pid"
+	Set gtmtypes("sgmnt_data",574,"off")=6144
+	Set gtmtypes("sgmnt_data",574,"len")=4
+	Set gtmtypes("sgmnt_data",574,"type")="int"
+	Set gtmtypfldindx("sgmnt_data","next_upgrd_warn.time_latch.u.parts.latch_pid")=574
+	Set gtmtypes("sgmnt_data",575,"name")="sgmnt_data.next_upgrd_warn.time_latch.u.parts.latch_word"
+	Set gtmtypes("sgmnt_data",575,"off")=6148
 	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",575,"type")="int"
+	Set gtmtypfldindx("sgmnt_data","next_upgrd_warn.time_latch.u.parts.latch_word")=575
+	Set gtmtypes("sgmnt_data",576,"name")="sgmnt_data.next_upgrd_warn.hp_latch_space"
+	Set gtmtypes("sgmnt_data",576,"off")=6152
+	Set gtmtypes("sgmnt_data",576,"len")=16
+	Set gtmtypes("sgmnt_data",576,"type")="int"
+	Set gtmtypfldindx("sgmnt_data","next_upgrd_warn.hp_latch_space")=576
+	Set gtmtypes("sgmnt_data",576,"dim")=4
+	Set gtmtypes("sgmnt_data",577,"name")="sgmnt_data.is_encrypted"
+	Set gtmtypes("sgmnt_data",577,"off")=6168
 	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",577,"type")="unsigned-int"
+	Set gtmtypfldindx("sgmnt_data","is_encrypted")=577
+	Set gtmtypes("sgmnt_data",578,"name")="sgmnt_data.db_trigger_cycle"
+	Set gtmtypes("sgmnt_data",578,"off")=6172
 	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",578,"type")="unsigned-int"
+	Set gtmtypfldindx("sgmnt_data","db_trigger_cycle")=578
+	Set gtmtypes("sgmnt_data",579,"name")="sgmnt_data.strm_reg_seqno"
+	Set gtmtypes("sgmnt_data",579,"off")=6176
+	Set gtmtypes("sgmnt_data",579,"len")=128
+	Set gtmtypes("sgmnt_data",579,"type")="uint64_t"
+	Set gtmtypfldindx("sgmnt_data","strm_reg_seqno")=579
+	Set gtmtypes("sgmnt_data",579,"dim")=16
+	Set gtmtypes("sgmnt_data",580,"name")="sgmnt_data.save_strm_reg_seqno"
+	Set gtmtypes("sgmnt_data",580,"off")=6304
+	Set gtmtypes("sgmnt_data",580,"len")=128
+	Set gtmtypes("sgmnt_data",580,"type")="uint64_t"
+	Set gtmtypfldindx("sgmnt_data","save_strm_reg_seqno")=580
+	Set gtmtypes("sgmnt_data",580,"dim")=16
+	Set gtmtypes("sgmnt_data",581,"name")="sgmnt_data.freeze_on_fail"
+	Set gtmtypes("sgmnt_data",581,"off")=6432
 	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 gtmtypfldindx("sgmnt_data","freeze_on_fail")=581
+	Set gtmtypes("sgmnt_data",582,"name")="sgmnt_data.span_node_absent"
+	Set gtmtypes("sgmnt_data",582,"off")=6436
 	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 gtmtypfldindx("sgmnt_data","span_node_absent")=582
+	Set gtmtypes("sgmnt_data",583,"name")="sgmnt_data.maxkeysz_assured"
+	Set gtmtypes("sgmnt_data",583,"off")=6440
 	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("sgmnt_data",583,"type")="boolean_t"
+	Set gtmtypfldindx("sgmnt_data","maxkeysz_assured")=583
+	Set gtmtypes("sgmnt_data",584,"name")="sgmnt_data.hasht_upgrade_needed"
+	Set gtmtypes("sgmnt_data",584,"off")=6444
+	Set gtmtypes("sgmnt_data",584,"len")=4
+	Set gtmtypes("sgmnt_data",584,"type")="boolean_t"
+	Set gtmtypfldindx("sgmnt_data","hasht_upgrade_needed")=584
+	Set gtmtypes("sgmnt_data",585,"name")="sgmnt_data.defer_allocate"
+	Set gtmtypes("sgmnt_data",585,"off")=6448
+	Set gtmtypes("sgmnt_data",585,"len")=4
+	Set gtmtypes("sgmnt_data",585,"type")="boolean_t"
+	Set gtmtypfldindx("sgmnt_data","defer_allocate")=585
+	Set gtmtypes("sgmnt_data",586,"name")="sgmnt_data.filler_ftok_counter_halted"
+	Set gtmtypes("sgmnt_data",586,"off")=6452
+	Set gtmtypes("sgmnt_data",586,"len")=4
+	Set gtmtypes("sgmnt_data",586,"type")="boolean_t"
+	Set gtmtypfldindx("sgmnt_data","filler_ftok_counter_halted")=586
+	Set gtmtypes("sgmnt_data",587,"name")="sgmnt_data.filler_access_counter_halted"
+	Set gtmtypes("sgmnt_data",587,"off")=6456
+	Set gtmtypes("sgmnt_data",587,"len")=4
+	Set gtmtypes("sgmnt_data",587,"type")="boolean_t"
+	Set gtmtypfldindx("sgmnt_data","filler_access_counter_halted")=587
+	Set gtmtypes("sgmnt_data",588,"name")="sgmnt_data.lock_crit_with_db"
+	Set gtmtypes("sgmnt_data",588,"off")=6460
+	Set gtmtypes("sgmnt_data",588,"len")=4
+	Set gtmtypes("sgmnt_data",588,"type")="boolean_t"
+	Set gtmtypfldindx("sgmnt_data","lock_crit_with_db")=588
+	Set gtmtypes("sgmnt_data",589,"name")="sgmnt_data.basedb_fname_len"
+	Set gtmtypes("sgmnt_data",589,"off")=6464
+	Set gtmtypes("sgmnt_data",589,"len")=4
+	Set gtmtypes("sgmnt_data",589,"type")="unsigned-int"
+	Set gtmtypfldindx("sgmnt_data","basedb_fname_len")=589
+	Set gtmtypes("sgmnt_data",590,"name")="sgmnt_data.basedb_fname"
+	Set gtmtypes("sgmnt_data",590,"off")=6468
+	Set gtmtypes("sgmnt_data",590,"len")=256
+	Set gtmtypes("sgmnt_data",590,"type")="unsigned-char"
+	Set gtmtypfldindx("sgmnt_data","basedb_fname")=590
+	Set gtmtypes("sgmnt_data",591,"name")="sgmnt_data.filler_7k"
+	Set gtmtypes("sgmnt_data",591,"off")=6724
+	Set gtmtypes("sgmnt_data",591,"len")=444
+	Set gtmtypes("sgmnt_data",591,"type")="char"
+	Set gtmtypfldindx("sgmnt_data","filler_7k")=591
+	Set gtmtypes("sgmnt_data",592,"name")="sgmnt_data.filler_8k"
+	Set gtmtypes("sgmnt_data",592,"off")=7168
+	Set gtmtypes("sgmnt_data",592,"len")=1024
+	Set gtmtypes("sgmnt_data",592,"type")="char"
+	Set gtmtypfldindx("sgmnt_data","filler_8k")=592
 	;
 	Set gtmtypes("shm_forw_multi_t")="struct"
 	Set gtmtypes("shm_forw_multi_t",0)=20
@@ -30272,7 +31256,7 @@ Init
 	Set gtmtypes("shm_reg_ctl_t",9,"dim")=3
 	;
 	Set gtmtypes("shm_snapshot_t")="struct"
-	Set gtmtypes("shm_snapshot_t",0)=608
+	Set gtmtypes("shm_snapshot_t",0)=614
 	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
@@ -31265,11 +32249,11 @@ Init
 	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.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,"name")="shm_snapshot_t.shadow_file_header.wcb_gds_rundown2_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_bgtrcrec1_tn")=197
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_gds_rundown2_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
@@ -31560,11 +32544,11 @@ Init
 	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_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,"name")="shm_snapshot_t.shadow_file_header.wcb_wcs_flu0_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_tp_grab_crit_tn")=256
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_wcs_flu0_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
@@ -31585,11 +32569,11 @@ Init
 	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_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,"name")="shm_snapshot_t.shadow_file_header.wcb_gds_rundown1_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_gds_rundown_tn")=261
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_gds_rundown1_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
@@ -31945,1391 +32929,1421 @@ Init
 	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,"name")="shm_snapshot_t.shadow_file_header.jnlbuff_phs2cmt_array_full_tn"
 	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.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.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.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",333,"len")=8
+	Set gtmtypes("shm_snapshot_t",333,"type")="uint64_t"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.jnlbuff_phs2cmt_array_full_tn")=333
+	Set gtmtypes("shm_snapshot_t",334,"name")="shm_snapshot_t.shadow_file_header.jnl_phase2_cleanup_if_possible_tn"
+	Set gtmtypes("shm_snapshot_t",334,"off")=7376
+	Set gtmtypes("shm_snapshot_t",334,"len")=8
+	Set gtmtypes("shm_snapshot_t",334,"type")="uint64_t"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.jnl_phase2_cleanup_if_possible_tn")=334
+	Set gtmtypes("shm_snapshot_t",335,"name")="shm_snapshot_t.shadow_file_header.jnlbuff_phs2cmt_isprcalv_tn"
+	Set gtmtypes("shm_snapshot_t",335,"off")=7384
+	Set gtmtypes("shm_snapshot_t",335,"len")=8
+	Set gtmtypes("shm_snapshot_t",335,"type")="uint64_t"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.jnlbuff_phs2cmt_isprcalv_tn")=335
+	Set gtmtypes("shm_snapshot_t",336,"name")="shm_snapshot_t.shadow_file_header.bg_trc_rec_tn_filler"
+	Set gtmtypes("shm_snapshot_t",336,"off")=7392
+	Set gtmtypes("shm_snapshot_t",336,"len")=24
+	Set gtmtypes("shm_snapshot_t",336,"type")="char"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.bg_trc_rec_tn_filler")=336
+	Set gtmtypes("shm_snapshot_t",337,"name")="shm_snapshot_t.shadow_file_header.total_buffer_flush_cntr"
+	Set gtmtypes("shm_snapshot_t",337,"off")=7416
 	Set gtmtypes("shm_snapshot_t",337,"len")=4
 	Set gtmtypes("shm_snapshot_t",337,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.total_buffer_flush_cntr")=337
+	Set gtmtypes("shm_snapshot_t",338,"name")="shm_snapshot_t.shadow_file_header.bufct_buffer_flush_cntr"
+	Set gtmtypes("shm_snapshot_t",338,"off")=7420
 	Set gtmtypes("shm_snapshot_t",338,"len")=4
 	Set gtmtypes("shm_snapshot_t",338,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.bufct_buffer_flush_cntr")=338
+	Set gtmtypes("shm_snapshot_t",339,"name")="shm_snapshot_t.shadow_file_header.bufct_buffer_flush_loop_cntr"
+	Set gtmtypes("shm_snapshot_t",339,"off")=7424
 	Set gtmtypes("shm_snapshot_t",339,"len")=4
 	Set gtmtypes("shm_snapshot_t",339,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.bufct_buffer_flush_loop_cntr")=339
+	Set gtmtypes("shm_snapshot_t",340,"name")="shm_snapshot_t.shadow_file_header.wrt_calls_cntr"
+	Set gtmtypes("shm_snapshot_t",340,"off")=7428
 	Set gtmtypes("shm_snapshot_t",340,"len")=4
 	Set gtmtypes("shm_snapshot_t",340,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.wrt_calls_cntr")=340
+	Set gtmtypes("shm_snapshot_t",341,"name")="shm_snapshot_t.shadow_file_header.wrt_count_cntr"
+	Set gtmtypes("shm_snapshot_t",341,"off")=7432
 	Set gtmtypes("shm_snapshot_t",341,"len")=4
 	Set gtmtypes("shm_snapshot_t",341,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.wrt_count_cntr")=341
+	Set gtmtypes("shm_snapshot_t",342,"name")="shm_snapshot_t.shadow_file_header.wrt_blocked_cntr"
+	Set gtmtypes("shm_snapshot_t",342,"off")=7436
 	Set gtmtypes("shm_snapshot_t",342,"len")=4
 	Set gtmtypes("shm_snapshot_t",342,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.wrt_blocked_cntr")=342
+	Set gtmtypes("shm_snapshot_t",343,"name")="shm_snapshot_t.shadow_file_header.wrt_busy_cntr"
+	Set gtmtypes("shm_snapshot_t",343,"off")=7440
 	Set gtmtypes("shm_snapshot_t",343,"len")=4
 	Set gtmtypes("shm_snapshot_t",343,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.wrt_busy_cntr")=343
+	Set gtmtypes("shm_snapshot_t",344,"name")="shm_snapshot_t.shadow_file_header.wrt_noblks_wrtn_cntr"
+	Set gtmtypes("shm_snapshot_t",344,"off")=7444
 	Set gtmtypes("shm_snapshot_t",344,"len")=4
 	Set gtmtypes("shm_snapshot_t",344,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.wrt_noblks_wrtn_cntr")=344
+	Set gtmtypes("shm_snapshot_t",345,"name")="shm_snapshot_t.shadow_file_header.wcb_gds_rundown2_cntr"
+	Set gtmtypes("shm_snapshot_t",345,"off")=7448
 	Set gtmtypes("shm_snapshot_t",345,"len")=4
 	Set gtmtypes("shm_snapshot_t",345,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_gds_rundown2_cntr")=345
+	Set gtmtypes("shm_snapshot_t",346,"name")="shm_snapshot_t.shadow_file_header.reserved_bgtrcrec2_cntr"
+	Set gtmtypes("shm_snapshot_t",346,"off")=7452
 	Set gtmtypes("shm_snapshot_t",346,"len")=4
 	Set gtmtypes("shm_snapshot_t",346,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.reserved_bgtrcrec2_cntr")=346
+	Set gtmtypes("shm_snapshot_t",347,"name")="shm_snapshot_t.shadow_file_header.reserved_bgtrcrec3_cntr"
+	Set gtmtypes("shm_snapshot_t",347,"off")=7456
 	Set gtmtypes("shm_snapshot_t",347,"len")=4
 	Set gtmtypes("shm_snapshot_t",347,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.reserved_bgtrcrec3_cntr")=347
+	Set gtmtypes("shm_snapshot_t",348,"name")="shm_snapshot_t.shadow_file_header.lost_block_recovery_cntr"
+	Set gtmtypes("shm_snapshot_t",348,"off")=7460
 	Set gtmtypes("shm_snapshot_t",348,"len")=4
 	Set gtmtypes("shm_snapshot_t",348,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.lost_block_recovery_cntr")=348
+	Set gtmtypes("shm_snapshot_t",349,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_onln_rlbk_cntr"
+	Set gtmtypes("shm_snapshot_t",349,"off")=7464
 	Set gtmtypes("shm_snapshot_t",349,"len")=4
 	Set gtmtypes("shm_snapshot_t",349,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_onln_rlbk_cntr")=349
+	Set gtmtypes("shm_snapshot_t",350,"name")="shm_snapshot_t.shadow_file_header.stale_cntr"
+	Set gtmtypes("shm_snapshot_t",350,"off")=7468
 	Set gtmtypes("shm_snapshot_t",350,"len")=4
 	Set gtmtypes("shm_snapshot_t",350,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.stale_cntr")=350
+	Set gtmtypes("shm_snapshot_t",351,"name")="shm_snapshot_t.shadow_file_header.starved_cntr"
+	Set gtmtypes("shm_snapshot_t",351,"off")=7472
 	Set gtmtypes("shm_snapshot_t",351,"len")=4
 	Set gtmtypes("shm_snapshot_t",351,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.starved_cntr")=351
+	Set gtmtypes("shm_snapshot_t",352,"name")="shm_snapshot_t.shadow_file_header.stale_timer_started_cntr"
+	Set gtmtypes("shm_snapshot_t",352,"off")=7476
 	Set gtmtypes("shm_snapshot_t",352,"len")=4
 	Set gtmtypes("shm_snapshot_t",352,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.stale_timer_started_cntr")=352
+	Set gtmtypes("shm_snapshot_t",353,"name")="shm_snapshot_t.shadow_file_header.stale_timer_pop_cntr"
+	Set gtmtypes("shm_snapshot_t",353,"off")=7480
 	Set gtmtypes("shm_snapshot_t",353,"len")=4
 	Set gtmtypes("shm_snapshot_t",353,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.stale_timer_pop_cntr")=353
+	Set gtmtypes("shm_snapshot_t",354,"name")="shm_snapshot_t.shadow_file_header.stale_process_defer_cntr"
+	Set gtmtypes("shm_snapshot_t",354,"off")=7484
 	Set gtmtypes("shm_snapshot_t",354,"len")=4
 	Set gtmtypes("shm_snapshot_t",354,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.stale_process_defer_cntr")=354
+	Set gtmtypes("shm_snapshot_t",355,"name")="shm_snapshot_t.shadow_file_header.stale_defer_processed_cntr"
+	Set gtmtypes("shm_snapshot_t",355,"off")=7488
 	Set gtmtypes("shm_snapshot_t",355,"len")=4
 	Set gtmtypes("shm_snapshot_t",355,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.stale_defer_processed_cntr")=355
+	Set gtmtypes("shm_snapshot_t",356,"name")="shm_snapshot_t.shadow_file_header.spcfc_buffer_flush_cntr"
+	Set gtmtypes("shm_snapshot_t",356,"off")=7492
 	Set gtmtypes("shm_snapshot_t",356,"len")=4
 	Set gtmtypes("shm_snapshot_t",356,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.spcfc_buffer_flush_cntr")=356
+	Set gtmtypes("shm_snapshot_t",357,"name")="shm_snapshot_t.shadow_file_header.spcfc_buffer_flush_loop_cntr"
+	Set gtmtypes("shm_snapshot_t",357,"off")=7496
 	Set gtmtypes("shm_snapshot_t",357,"len")=4
 	Set gtmtypes("shm_snapshot_t",357,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.spcfc_buffer_flush_loop_cntr")=357
+	Set gtmtypes("shm_snapshot_t",358,"name")="shm_snapshot_t.shadow_file_header.spcfc_buffer_flush_retries_cntr"
+	Set gtmtypes("shm_snapshot_t",358,"off")=7500
 	Set gtmtypes("shm_snapshot_t",358,"len")=4
 	Set gtmtypes("shm_snapshot_t",358,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.spcfc_buffer_flush_retries_cntr")=358
+	Set gtmtypes("shm_snapshot_t",359,"name")="shm_snapshot_t.shadow_file_header.spcfc_buffer_flushed_during_lockwait_cntr"
+	Set gtmtypes("shm_snapshot_t",359,"off")=7504
 	Set gtmtypes("shm_snapshot_t",359,"len")=4
 	Set gtmtypes("shm_snapshot_t",359,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.spcfc_buffer_flushed_during_lockwait_cntr")=359
+	Set gtmtypes("shm_snapshot_t",360,"name")="shm_snapshot_t.shadow_file_header.tp_crit_retries_cntr"
+	Set gtmtypes("shm_snapshot_t",360,"off")=7508
 	Set gtmtypes("shm_snapshot_t",360,"len")=4
 	Set gtmtypes("shm_snapshot_t",360,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.tp_crit_retries_cntr")=360
+	Set gtmtypes("shm_snapshot_t",361,"name")="shm_snapshot_t.shadow_file_header.db_csh_getn_flush_dirty_cntr"
+	Set gtmtypes("shm_snapshot_t",361,"off")=7512
 	Set gtmtypes("shm_snapshot_t",361,"len")=4
 	Set gtmtypes("shm_snapshot_t",361,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.db_csh_getn_flush_dirty_cntr")=361
+	Set gtmtypes("shm_snapshot_t",362,"name")="shm_snapshot_t.shadow_file_header.db_csh_getn_rip_wait_cntr"
+	Set gtmtypes("shm_snapshot_t",362,"off")=7516
 	Set gtmtypes("shm_snapshot_t",362,"len")=4
 	Set gtmtypes("shm_snapshot_t",362,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.db_csh_getn_rip_wait_cntr")=362
+	Set gtmtypes("shm_snapshot_t",363,"name")="shm_snapshot_t.shadow_file_header.db_csh_getn_buf_owner_stuck_cntr"
+	Set gtmtypes("shm_snapshot_t",363,"off")=7520
 	Set gtmtypes("shm_snapshot_t",363,"len")=4
 	Set gtmtypes("shm_snapshot_t",363,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.db_csh_getn_buf_owner_stuck_cntr")=363
+	Set gtmtypes("shm_snapshot_t",364,"name")="shm_snapshot_t.shadow_file_header.db_csh_getn_out_of_design_cntr"
+	Set gtmtypes("shm_snapshot_t",364,"off")=7524
 	Set gtmtypes("shm_snapshot_t",364,"len")=4
 	Set gtmtypes("shm_snapshot_t",364,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.db_csh_getn_out_of_design_cntr")=364
+	Set gtmtypes("shm_snapshot_t",365,"name")="shm_snapshot_t.shadow_file_header.t_qread_buf_owner_stuck_cntr"
+	Set gtmtypes("shm_snapshot_t",365,"off")=7528
 	Set gtmtypes("shm_snapshot_t",365,"len")=4
 	Set gtmtypes("shm_snapshot_t",365,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.t_qread_buf_owner_stuck_cntr")=365
+	Set gtmtypes("shm_snapshot_t",366,"name")="shm_snapshot_t.shadow_file_header.t_qread_out_of_design_cntr"
+	Set gtmtypes("shm_snapshot_t",366,"off")=7532
 	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_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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.t_qread_out_of_design_cntr")=366
+	Set gtmtypes("shm_snapshot_t",367,"name")="shm_snapshot_t.shadow_file_header.bt_put_flush_dirty_cntr"
+	Set gtmtypes("shm_snapshot_t",367,"off")=7536
 	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_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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.bt_put_flush_dirty_cntr")=367
+	Set gtmtypes("shm_snapshot_t",368,"name")="shm_snapshot_t.shadow_file_header.mlock_wakeups_cntr"
+	Set gtmtypes("shm_snapshot_t",368,"off")=7540
 	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_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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.mlock_wakeups_cntr")=368
+	Set gtmtypes("shm_snapshot_t",369,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_wcs_recover_invoked_cntr"
+	Set gtmtypes("shm_snapshot_t",369,"off")=7544
 	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_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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_wcs_recover_invoked_cntr")=369
+	Set gtmtypes("shm_snapshot_t",370,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_wcs_verify_passed_cntr"
+	Set gtmtypes("shm_snapshot_t",370,"off")=7548
 	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_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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_wcs_verify_passed_cntr")=370
+	Set gtmtypes("shm_snapshot_t",371,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_t_qread_db_csh_getn_invalid_blk_cntr"
+	Set gtmtypes("shm_snapshot_t",371,"off")=7552
 	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_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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_t_qread_db_csh_getn_invalid_blk_cntr")=371
+	Set gtmtypes("shm_snapshot_t",372,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_t_qread_db_csh_get_invalid_blk_cntr"
+	Set gtmtypes("shm_snapshot_t",372,"off")=7556
 	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_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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_t_qread_db_csh_get_invalid_blk_cntr")=372
+	Set gtmtypes("shm_snapshot_t",373,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_db_csh_getn_loopexceed_cntr"
+	Set gtmtypes("shm_snapshot_t",373,"off")=7560
 	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_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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_db_csh_getn_loopexceed_cntr")=373
+	Set gtmtypes("shm_snapshot_t",374,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_db_csh_getn_wcsstarvewrt_cntr"
+	Set gtmtypes("shm_snapshot_t",374,"off")=7564
 	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_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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_db_csh_getn_wcsstarvewrt_cntr")=374
+	Set gtmtypes("shm_snapshot_t",375,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_db_csh_get_cntr"
+	Set gtmtypes("shm_snapshot_t",375,"off")=7568
 	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_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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_db_csh_get_cntr")=375
+	Set gtmtypes("shm_snapshot_t",376,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_tp_tend_wcsgetspace_cntr"
+	Set gtmtypes("shm_snapshot_t",376,"off")=7572
 	Set gtmtypes("shm_snapshot_t",376,"len")=4
 	Set gtmtypes("shm_snapshot_t",376,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_tp_tend_wcsgetspace_cntr")=376
+	Set gtmtypes("shm_snapshot_t",377,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_tp_tend_t1_cntr"
+	Set gtmtypes("shm_snapshot_t",377,"off")=7576
 	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_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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_tp_tend_t1_cntr")=377
+	Set gtmtypes("shm_snapshot_t",378,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_tp_tend_bitmap_cntr"
+	Set gtmtypes("shm_snapshot_t",378,"off")=7580
 	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_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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_tp_tend_bitmap_cntr")=378
+	Set gtmtypes("shm_snapshot_t",379,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_tp_tend_jnl_cwset_cntr"
+	Set gtmtypes("shm_snapshot_t",379,"off")=7584
 	Set gtmtypes("shm_snapshot_t",379,"len")=4
 	Set gtmtypes("shm_snapshot_t",379,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_tp_tend_jnl_cwset_cntr")=379
+	Set gtmtypes("shm_snapshot_t",380,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_tp_tend_jnl_wcsflu_cntr"
+	Set gtmtypes("shm_snapshot_t",380,"off")=7588
 	Set gtmtypes("shm_snapshot_t",380,"len")=4
 	Set gtmtypes("shm_snapshot_t",380,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_tp_tend_jnl_wcsflu_cntr")=380
+	Set gtmtypes("shm_snapshot_t",381,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_t_end_hist_cntr"
+	Set gtmtypes("shm_snapshot_t",381,"off")=7592
 	Set gtmtypes("shm_snapshot_t",381,"len")=4
 	Set gtmtypes("shm_snapshot_t",381,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_t_end_hist_cntr")=381
+	Set gtmtypes("shm_snapshot_t",382,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_t_end_hist1_nullbt_cntr"
+	Set gtmtypes("shm_snapshot_t",382,"off")=7596
 	Set gtmtypes("shm_snapshot_t",382,"len")=4
 	Set gtmtypes("shm_snapshot_t",382,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_t_end_hist1_nullbt_cntr")=382
+	Set gtmtypes("shm_snapshot_t",383,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_t_end_hist1_nonnullbt_cntr"
+	Set gtmtypes("shm_snapshot_t",383,"off")=7600
 	Set gtmtypes("shm_snapshot_t",383,"len")=4
 	Set gtmtypes("shm_snapshot_t",383,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_t_end_hist1_nonnullbt_cntr")=383
+	Set gtmtypes("shm_snapshot_t",384,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_t_end_bitmap_nullbt_cntr"
+	Set gtmtypes("shm_snapshot_t",384,"off")=7604
 	Set gtmtypes("shm_snapshot_t",384,"len")=4
 	Set gtmtypes("shm_snapshot_t",384,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_t_end_bitmap_nullbt_cntr")=384
+	Set gtmtypes("shm_snapshot_t",385,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_t_end_bitmap_nonnullbt_cntr"
+	Set gtmtypes("shm_snapshot_t",385,"off")=7608
 	Set gtmtypes("shm_snapshot_t",385,"len")=4
 	Set gtmtypes("shm_snapshot_t",385,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_t_end_bitmap_nonnullbt_cntr")=385
+	Set gtmtypes("shm_snapshot_t",386,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_t_end_jnl_cwset_cntr"
+	Set gtmtypes("shm_snapshot_t",386,"off")=7612
 	Set gtmtypes("shm_snapshot_t",386,"len")=4
 	Set gtmtypes("shm_snapshot_t",386,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_t_end_jnl_cwset_cntr")=386
+	Set gtmtypes("shm_snapshot_t",387,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_t_end_jnl_wcsflu_cntr"
+	Set gtmtypes("shm_snapshot_t",387,"off")=7616
 	Set gtmtypes("shm_snapshot_t",387,"len")=4
 	Set gtmtypes("shm_snapshot_t",387,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_t_end_jnl_wcsflu_cntr")=387
+	Set gtmtypes("shm_snapshot_t",388,"name")="shm_snapshot_t.shadow_file_header.db_csh_get_too_many_loops_cntr"
+	Set gtmtypes("shm_snapshot_t",388,"off")=7620
 	Set gtmtypes("shm_snapshot_t",388,"len")=4
 	Set gtmtypes("shm_snapshot_t",388,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.db_csh_get_too_many_loops_cntr")=388
+	Set gtmtypes("shm_snapshot_t",389,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_tpckh_hist1_nullbt_cntr"
+	Set gtmtypes("shm_snapshot_t",389,"off")=7624
 	Set gtmtypes("shm_snapshot_t",389,"len")=4
 	Set gtmtypes("shm_snapshot_t",389,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_tpckh_hist1_nullbt_cntr")=389
+	Set gtmtypes("shm_snapshot_t",390,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_tpckh_hist1_nonnullbt_cntr"
+	Set gtmtypes("shm_snapshot_t",390,"off")=7628
 	Set gtmtypes("shm_snapshot_t",390,"len")=4
 	Set gtmtypes("shm_snapshot_t",390,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_tpckh_hist1_nonnullbt_cntr")=390
+	Set gtmtypes("shm_snapshot_t",391,"name")="shm_snapshot_t.shadow_file_header.jnl_blocked_writer_lost_cntr"
+	Set gtmtypes("shm_snapshot_t",391,"off")=7632
 	Set gtmtypes("shm_snapshot_t",391,"len")=4
 	Set gtmtypes("shm_snapshot_t",391,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.jnl_blocked_writer_lost_cntr")=391
+	Set gtmtypes("shm_snapshot_t",392,"name")="shm_snapshot_t.shadow_file_header.jnl_blocked_writer_stuck_cntr"
+	Set gtmtypes("shm_snapshot_t",392,"off")=7636
 	Set gtmtypes("shm_snapshot_t",392,"len")=4
 	Set gtmtypes("shm_snapshot_t",392,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.jnl_blocked_writer_stuck_cntr")=392
+	Set gtmtypes("shm_snapshot_t",393,"name")="shm_snapshot_t.shadow_file_header.jnl_blocked_writer_blocked_cntr"
+	Set gtmtypes("shm_snapshot_t",393,"off")=7640
 	Set gtmtypes("shm_snapshot_t",393,"len")=4
 	Set gtmtypes("shm_snapshot_t",393,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.jnl_blocked_writer_blocked_cntr")=393
+	Set gtmtypes("shm_snapshot_t",394,"name")="shm_snapshot_t.shadow_file_header.n_jnl_fsyncs_cntr"
+	Set gtmtypes("shm_snapshot_t",394,"off")=7644
 	Set gtmtypes("shm_snapshot_t",394,"len")=4
 	Set gtmtypes("shm_snapshot_t",394,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_jnl_fsyncs_cntr")=394
+	Set gtmtypes("shm_snapshot_t",395,"name")="shm_snapshot_t.shadow_file_header.n_jnl_fsync_tries_cntr"
+	Set gtmtypes("shm_snapshot_t",395,"off")=7648
 	Set gtmtypes("shm_snapshot_t",395,"len")=4
 	Set gtmtypes("shm_snapshot_t",395,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_jnl_fsync_tries_cntr")=395
+	Set gtmtypes("shm_snapshot_t",396,"name")="shm_snapshot_t.shadow_file_header.n_jnl_fsync_recovers_cntr"
+	Set gtmtypes("shm_snapshot_t",396,"off")=7652
 	Set gtmtypes("shm_snapshot_t",396,"len")=4
 	Set gtmtypes("shm_snapshot_t",396,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_jnl_fsync_recovers_cntr")=396
+	Set gtmtypes("shm_snapshot_t",397,"name")="shm_snapshot_t.shadow_file_header.n_db_fsyncs_cntr"
+	Set gtmtypes("shm_snapshot_t",397,"off")=7656
 	Set gtmtypes("shm_snapshot_t",397,"len")=4
 	Set gtmtypes("shm_snapshot_t",397,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_db_fsyncs_cntr")=397
+	Set gtmtypes("shm_snapshot_t",398,"name")="shm_snapshot_t.shadow_file_header.n_db_fsyncs_in_crit_cntr"
+	Set gtmtypes("shm_snapshot_t",398,"off")=7660
 	Set gtmtypes("shm_snapshot_t",398,"len")=4
 	Set gtmtypes("shm_snapshot_t",398,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_db_fsyncs_in_crit_cntr")=398
+	Set gtmtypes("shm_snapshot_t",399,"name")="shm_snapshot_t.shadow_file_header.n_dbsync_timers_cntr"
+	Set gtmtypes("shm_snapshot_t",399,"off")=7664
 	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_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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_dbsync_timers_cntr")=399
+	Set gtmtypes("shm_snapshot_t",400,"name")="shm_snapshot_t.shadow_file_header.n_dbsync_writes_cntr"
+	Set gtmtypes("shm_snapshot_t",400,"off")=7668
 	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_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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_dbsync_writes_cntr")=400
+	Set gtmtypes("shm_snapshot_t",401,"name")="shm_snapshot_t.shadow_file_header.mutex_queue_full_cntr"
+	Set gtmtypes("shm_snapshot_t",401,"off")=7672
 	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_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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.mutex_queue_full_cntr")=401
+	Set gtmtypes("shm_snapshot_t",402,"name")="shm_snapshot_t.shadow_file_header.wcb_bt_put_cntr"
+	Set gtmtypes("shm_snapshot_t",402,"off")=7676
 	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_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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_bt_put_cntr")=402
+	Set gtmtypes("shm_snapshot_t",403,"name")="shm_snapshot_t.shadow_file_header.wcb_mutex_salvage_cntr"
+	Set gtmtypes("shm_snapshot_t",403,"off")=7680
 	Set gtmtypes("shm_snapshot_t",403,"len")=4
 	Set gtmtypes("shm_snapshot_t",403,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_mutex_salvage_cntr")=403
+	Set gtmtypes("shm_snapshot_t",404,"name")="shm_snapshot_t.shadow_file_header.wcb_wcs_flu0_cntr"
+	Set gtmtypes("shm_snapshot_t",404,"off")=7684
 	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_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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_wcs_flu0_cntr")=404
+	Set gtmtypes("shm_snapshot_t",405,"name")="shm_snapshot_t.shadow_file_header.wcb_t_end_sysops_nocr_invcr_cntr"
+	Set gtmtypes("shm_snapshot_t",405,"off")=7688
 	Set gtmtypes("shm_snapshot_t",405,"len")=4
 	Set gtmtypes("shm_snapshot_t",405,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_t_end_sysops_nocr_invcr_cntr")=405
+	Set gtmtypes("shm_snapshot_t",406,"name")="shm_snapshot_t.shadow_file_header.wcb_t_end_sysops_cr_invcr_cntr"
+	Set gtmtypes("shm_snapshot_t",406,"off")=7692
 	Set gtmtypes("shm_snapshot_t",406,"len")=4
 	Set gtmtypes("shm_snapshot_t",406,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_t_end_sysops_cr_invcr_cntr")=406
+	Set gtmtypes("shm_snapshot_t",407,"name")="shm_snapshot_t.shadow_file_header.wcb_t_end_sysops_rip_wait_cntr"
+	Set gtmtypes("shm_snapshot_t",407,"off")=7696
 	Set gtmtypes("shm_snapshot_t",407,"len")=4
 	Set gtmtypes("shm_snapshot_t",407,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_t_end_sysops_rip_wait_cntr")=407
+	Set gtmtypes("shm_snapshot_t",408,"name")="shm_snapshot_t.shadow_file_header.wcb_t_end_sysops_dirtyripwait_cntr"
+	Set gtmtypes("shm_snapshot_t",408,"off")=7700
 	Set gtmtypes("shm_snapshot_t",408,"len")=4
 	Set gtmtypes("shm_snapshot_t",408,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_t_end_sysops_dirtyripwait_cntr")=408
+	Set gtmtypes("shm_snapshot_t",409,"name")="shm_snapshot_t.shadow_file_header.wcb_gds_rundown1_cntr"
+	Set gtmtypes("shm_snapshot_t",409,"off")=7704
 	Set gtmtypes("shm_snapshot_t",409,"len")=4
 	Set gtmtypes("shm_snapshot_t",409,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_gds_rundown1_cntr")=409
+	Set gtmtypes("shm_snapshot_t",410,"name")="shm_snapshot_t.shadow_file_header.wcb_wcs_flu1_cntr"
+	Set gtmtypes("shm_snapshot_t",410,"off")=7708
 	Set gtmtypes("shm_snapshot_t",410,"len")=4
 	Set gtmtypes("shm_snapshot_t",410,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_wcs_flu1_cntr")=410
+	Set gtmtypes("shm_snapshot_t",411,"name")="shm_snapshot_t.shadow_file_header.wcb_mu_back_cntr"
+	Set gtmtypes("shm_snapshot_t",411,"off")=7712
 	Set gtmtypes("shm_snapshot_t",411,"len")=4
 	Set gtmtypes("shm_snapshot_t",411,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_mu_back_cntr")=411
+	Set gtmtypes("shm_snapshot_t",412,"name")="shm_snapshot_t.shadow_file_header.wcb_t_end_sysops_dirty_invcr_cntr"
+	Set gtmtypes("shm_snapshot_t",412,"off")=7716
 	Set gtmtypes("shm_snapshot_t",412,"len")=4
 	Set gtmtypes("shm_snapshot_t",412,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_t_end_sysops_dirty_invcr_cntr")=412
+	Set gtmtypes("shm_snapshot_t",413,"name")="shm_snapshot_t.shadow_file_header.wcb_t_end_sysops_wtfini_fail_cntr"
+	Set gtmtypes("shm_snapshot_t",413,"off")=7720
 	Set gtmtypes("shm_snapshot_t",413,"len")=4
 	Set gtmtypes("shm_snapshot_t",413,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_t_end_sysops_wtfini_fail_cntr")=413
+	Set gtmtypes("shm_snapshot_t",414,"name")="shm_snapshot_t.shadow_file_header.wcb_t_end_sysops_twin_stuck_cntr"
+	Set gtmtypes("shm_snapshot_t",414,"off")=7724
 	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_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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_t_end_sysops_twin_stuck_cntr")=414
+	Set gtmtypes("shm_snapshot_t",415,"name")="shm_snapshot_t.shadow_file_header.db_csh_getn_wrt_latch_stuck_cntr"
+	Set gtmtypes("shm_snapshot_t",415,"off")=7728
 	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_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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.db_csh_getn_wrt_latch_stuck_cntr")=415
+	Set gtmtypes("shm_snapshot_t",416,"name")="shm_snapshot_t.shadow_file_header.wcb_secshr_db_clnup_now_crit_cntr"
+	Set gtmtypes("shm_snapshot_t",416,"off")=7732
 	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_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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_secshr_db_clnup_now_crit_cntr")=416
+	Set gtmtypes("shm_snapshot_t",417,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_t_qread_bad_bt_index1_cntr"
+	Set gtmtypes("shm_snapshot_t",417,"off")=7736
 	Set gtmtypes("shm_snapshot_t",417,"len")=4
 	Set gtmtypes("shm_snapshot_t",417,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_t_qread_bad_bt_index1_cntr")=417
+	Set gtmtypes("shm_snapshot_t",418,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_t_qread_bad_bt_index2_cntr"
+	Set gtmtypes("shm_snapshot_t",418,"off")=7740
 	Set gtmtypes("shm_snapshot_t",418,"len")=4
 	Set gtmtypes("shm_snapshot_t",418,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_t_qread_bad_bt_index2_cntr")=418
+	Set gtmtypes("shm_snapshot_t",419,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_t_end_crbtmismatch1_cntr"
+	Set gtmtypes("shm_snapshot_t",419,"off")=7744
 	Set gtmtypes("shm_snapshot_t",419,"len")=4
 	Set gtmtypes("shm_snapshot_t",419,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_t_end_crbtmismatch1_cntr")=419
+	Set gtmtypes("shm_snapshot_t",420,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_t_end_crbtmismatch2_cntr"
+	Set gtmtypes("shm_snapshot_t",420,"off")=7748
 	Set gtmtypes("shm_snapshot_t",420,"len")=4
 	Set gtmtypes("shm_snapshot_t",420,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_t_end_crbtmismatch2_cntr")=420
+	Set gtmtypes("shm_snapshot_t",421,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_t_end_crbtmismatch3_cntr"
+	Set gtmtypes("shm_snapshot_t",421,"off")=7752
 	Set gtmtypes("shm_snapshot_t",421,"len")=4
 	Set gtmtypes("shm_snapshot_t",421,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_t_end_crbtmismatch3_cntr")=421
+	Set gtmtypes("shm_snapshot_t",422,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_tp_tend_crbtmismatch1_cntr"
+	Set gtmtypes("shm_snapshot_t",422,"off")=7756
 	Set gtmtypes("shm_snapshot_t",422,"len")=4
 	Set gtmtypes("shm_snapshot_t",422,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_tp_tend_crbtmismatch1_cntr")=422
+	Set gtmtypes("shm_snapshot_t",423,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_tp_tend_crbtmismatch2_cntr"
+	Set gtmtypes("shm_snapshot_t",423,"off")=7760
 	Set gtmtypes("shm_snapshot_t",423,"len")=4
 	Set gtmtypes("shm_snapshot_t",423,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_tp_tend_crbtmismatch2_cntr")=423
+	Set gtmtypes("shm_snapshot_t",424,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_tp_tend_crbtmismatch3_cntr"
+	Set gtmtypes("shm_snapshot_t",424,"off")=7764
 	Set gtmtypes("shm_snapshot_t",424,"len")=4
 	Set gtmtypes("shm_snapshot_t",424,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_tp_tend_crbtmismatch3_cntr")=424
+	Set gtmtypes("shm_snapshot_t",425,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_wcs_wtstart_bad_cr_cntr"
+	Set gtmtypes("shm_snapshot_t",425,"off")=7768
 	Set gtmtypes("shm_snapshot_t",425,"len")=4
 	Set gtmtypes("shm_snapshot_t",425,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_wcs_wtstart_bad_cr_cntr")=425
+	Set gtmtypes("shm_snapshot_t",426,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_wcs_wtfini_bad_cr_cntr"
+	Set gtmtypes("shm_snapshot_t",426,"off")=7772
 	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_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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_wcs_wtfini_bad_cr_cntr")=426
+	Set gtmtypes("shm_snapshot_t",427,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_bt_get_cntr"
+	Set gtmtypes("shm_snapshot_t",427,"off")=7776
 	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_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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_bt_get_cntr")=427
+	Set gtmtypes("shm_snapshot_t",428,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_wcs_cdb_sc_final_retry_cntr"
+	Set gtmtypes("shm_snapshot_t",428,"off")=7780
 	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_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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_wcs_cdb_sc_final_retry_cntr")=428
+	Set gtmtypes("shm_snapshot_t",429,"name")="shm_snapshot_t.shadow_file_header.wcb_bg_update_lckfail1_cntr"
+	Set gtmtypes("shm_snapshot_t",429,"off")=7784
 	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_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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_bg_update_lckfail1_cntr")=429
+	Set gtmtypes("shm_snapshot_t",430,"name")="shm_snapshot_t.shadow_file_header.wcb_bg_update_lckfail2_cntr"
+	Set gtmtypes("shm_snapshot_t",430,"off")=7788
 	Set gtmtypes("shm_snapshot_t",430,"len")=4
 	Set gtmtypes("shm_snapshot_t",430,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_bg_update_lckfail2_cntr")=430
+	Set gtmtypes("shm_snapshot_t",431,"name")="shm_snapshot_t.shadow_file_header.wcb_wtstart_lckfail1_cntr"
+	Set gtmtypes("shm_snapshot_t",431,"off")=7792
 	Set gtmtypes("shm_snapshot_t",431,"len")=4
 	Set gtmtypes("shm_snapshot_t",431,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_wtstart_lckfail1_cntr")=431
+	Set gtmtypes("shm_snapshot_t",432,"name")="shm_snapshot_t.shadow_file_header.wcb_wtstart_lckfail2_cntr"
+	Set gtmtypes("shm_snapshot_t",432,"off")=7796
 	Set gtmtypes("shm_snapshot_t",432,"len")=4
 	Set gtmtypes("shm_snapshot_t",432,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_wtstart_lckfail2_cntr")=432
+	Set gtmtypes("shm_snapshot_t",433,"name")="shm_snapshot_t.shadow_file_header.wcb_wtstart_lckfail3_cntr"
+	Set gtmtypes("shm_snapshot_t",433,"off")=7800
 	Set gtmtypes("shm_snapshot_t",433,"len")=4
 	Set gtmtypes("shm_snapshot_t",433,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_wtstart_lckfail3_cntr")=433
+	Set gtmtypes("shm_snapshot_t",434,"name")="shm_snapshot_t.shadow_file_header.wcb_wtstart_lckfail4_cntr"
+	Set gtmtypes("shm_snapshot_t",434,"off")=7804
 	Set gtmtypes("shm_snapshot_t",434,"len")=4
 	Set gtmtypes("shm_snapshot_t",434,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_wtstart_lckfail4_cntr")=434
+	Set gtmtypes("shm_snapshot_t",435,"name")="shm_snapshot_t.shadow_file_header.wcb_wtfini_lckfail1_cntr"
+	Set gtmtypes("shm_snapshot_t",435,"off")=7808
 	Set gtmtypes("shm_snapshot_t",435,"len")=4
 	Set gtmtypes("shm_snapshot_t",435,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_wtfini_lckfail1_cntr")=435
+	Set gtmtypes("shm_snapshot_t",436,"name")="shm_snapshot_t.shadow_file_header.wcb_wtfini_lckfail2_cntr"
+	Set gtmtypes("shm_snapshot_t",436,"off")=7812
 	Set gtmtypes("shm_snapshot_t",436,"len")=4
 	Set gtmtypes("shm_snapshot_t",436,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_wtfini_lckfail2_cntr")=436
+	Set gtmtypes("shm_snapshot_t",437,"name")="shm_snapshot_t.shadow_file_header.wcb_wtfini_lckfail3_cntr"
+	Set gtmtypes("shm_snapshot_t",437,"off")=7816
 	Set gtmtypes("shm_snapshot_t",437,"len")=4
 	Set gtmtypes("shm_snapshot_t",437,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_wtfini_lckfail3_cntr")=437
+	Set gtmtypes("shm_snapshot_t",438,"name")="shm_snapshot_t.shadow_file_header.wcb_wtfini_lckfail4_cntr"
+	Set gtmtypes("shm_snapshot_t",438,"off")=7820
 	Set gtmtypes("shm_snapshot_t",438,"len")=4
 	Set gtmtypes("shm_snapshot_t",438,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_wtfini_lckfail4_cntr")=438
+	Set gtmtypes("shm_snapshot_t",439,"name")="shm_snapshot_t.shadow_file_header.wcb_t_end_sysops_dirtystuck1_cntr"
+	Set gtmtypes("shm_snapshot_t",439,"off")=7824
 	Set gtmtypes("shm_snapshot_t",439,"len")=4
 	Set gtmtypes("shm_snapshot_t",439,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_t_end_sysops_dirtystuck1_cntr")=439
+	Set gtmtypes("shm_snapshot_t",440,"name")="shm_snapshot_t.shadow_file_header.wcb_t_end_sysops_dirtystuck2_cntr"
+	Set gtmtypes("shm_snapshot_t",440,"off")=7828
 	Set gtmtypes("shm_snapshot_t",440,"len")=4
 	Set gtmtypes("shm_snapshot_t",440,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_t_end_sysops_dirtystuck2_cntr")=440
+	Set gtmtypes("shm_snapshot_t",441,"name")="shm_snapshot_t.shadow_file_header.wcb_secshr_db_clnup_wbuf_dqd_cntr"
+	Set gtmtypes("shm_snapshot_t",441,"off")=7832
 	Set gtmtypes("shm_snapshot_t",441,"len")=4
 	Set gtmtypes("shm_snapshot_t",441,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_secshr_db_clnup_wbuf_dqd_cntr")=441
+	Set gtmtypes("shm_snapshot_t",442,"name")="shm_snapshot_t.shadow_file_header.dwngrd_refmts_syncio_cntr"
+	Set gtmtypes("shm_snapshot_t",442,"off")=7836
 	Set gtmtypes("shm_snapshot_t",442,"len")=4
 	Set gtmtypes("shm_snapshot_t",442,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.dwngrd_refmts_syncio_cntr")=442
+	Set gtmtypes("shm_snapshot_t",443,"name")="shm_snapshot_t.shadow_file_header.dwngrd_refmts_asyncio_cntr"
+	Set gtmtypes("shm_snapshot_t",443,"off")=7840
 	Set gtmtypes("shm_snapshot_t",443,"len")=4
 	Set gtmtypes("shm_snapshot_t",443,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.dwngrd_refmts_asyncio_cntr")=443
+	Set gtmtypes("shm_snapshot_t",444,"name")="shm_snapshot_t.shadow_file_header.shmpool_refmt_harvests_cntr"
+	Set gtmtypes("shm_snapshot_t",444,"off")=7844
 	Set gtmtypes("shm_snapshot_t",444,"len")=4
 	Set gtmtypes("shm_snapshot_t",444,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.shmpool_refmt_harvests_cntr")=444
+	Set gtmtypes("shm_snapshot_t",445,"name")="shm_snapshot_t.shadow_file_header.shmpool_recovery_cntr"
+	Set gtmtypes("shm_snapshot_t",445,"off")=7848
 	Set gtmtypes("shm_snapshot_t",445,"len")=4
 	Set gtmtypes("shm_snapshot_t",445,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.shmpool_recovery_cntr")=445
+	Set gtmtypes("shm_snapshot_t",446,"name")="shm_snapshot_t.shadow_file_header.shmpool_blkd_by_sdc_cntr"
+	Set gtmtypes("shm_snapshot_t",446,"off")=7852
 	Set gtmtypes("shm_snapshot_t",446,"len")=4
 	Set gtmtypes("shm_snapshot_t",446,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.shmpool_blkd_by_sdc_cntr")=446
+	Set gtmtypes("shm_snapshot_t",447,"name")="shm_snapshot_t.shadow_file_header.shmpool_alloc_bbflush_cntr"
+	Set gtmtypes("shm_snapshot_t",447,"off")=7856
 	Set gtmtypes("shm_snapshot_t",447,"len")=4
 	Set gtmtypes("shm_snapshot_t",447,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.shmpool_alloc_bbflush_cntr")=447
+	Set gtmtypes("shm_snapshot_t",448,"name")="shm_snapshot_t.shadow_file_header.refmt_hvst_blk_released_replaced_cntr"
+	Set gtmtypes("shm_snapshot_t",448,"off")=7860
 	Set gtmtypes("shm_snapshot_t",448,"len")=4
 	Set gtmtypes("shm_snapshot_t",448,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.refmt_hvst_blk_released_replaced_cntr")=448
+	Set gtmtypes("shm_snapshot_t",449,"name")="shm_snapshot_t.shadow_file_header.refmt_hvst_blk_released_io_complete_cntr"
+	Set gtmtypes("shm_snapshot_t",449,"off")=7864
 	Set gtmtypes("shm_snapshot_t",449,"len")=4
 	Set gtmtypes("shm_snapshot_t",449,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.refmt_hvst_blk_released_io_complete_cntr")=449
+	Set gtmtypes("shm_snapshot_t",450,"name")="shm_snapshot_t.shadow_file_header.refmt_hvst_blk_kept_cntr"
+	Set gtmtypes("shm_snapshot_t",450,"off")=7868
 	Set gtmtypes("shm_snapshot_t",450,"len")=4
 	Set gtmtypes("shm_snapshot_t",450,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.refmt_hvst_blk_kept_cntr")=450
+	Set gtmtypes("shm_snapshot_t",451,"name")="shm_snapshot_t.shadow_file_header.refmt_hvst_blk_ignored_cntr"
+	Set gtmtypes("shm_snapshot_t",451,"off")=7872
 	Set gtmtypes("shm_snapshot_t",451,"len")=4
 	Set gtmtypes("shm_snapshot_t",451,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.refmt_hvst_blk_ignored_cntr")=451
+	Set gtmtypes("shm_snapshot_t",452,"name")="shm_snapshot_t.shadow_file_header.refmt_blk_chk_blk_freed_cntr"
+	Set gtmtypes("shm_snapshot_t",452,"off")=7876
 	Set gtmtypes("shm_snapshot_t",452,"len")=4
 	Set gtmtypes("shm_snapshot_t",452,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.refmt_blk_chk_blk_freed_cntr")=452
+	Set gtmtypes("shm_snapshot_t",453,"name")="shm_snapshot_t.shadow_file_header.refmt_blk_chk_blk_kept_cntr"
+	Set gtmtypes("shm_snapshot_t",453,"off")=7880
 	Set gtmtypes("shm_snapshot_t",453,"len")=4
 	Set gtmtypes("shm_snapshot_t",453,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.refmt_blk_chk_blk_kept_cntr")=453
+	Set gtmtypes("shm_snapshot_t",454,"name")="shm_snapshot_t.shadow_file_header.active_lvl_trigger_cntr"
+	Set gtmtypes("shm_snapshot_t",454,"off")=7884
 	Set gtmtypes("shm_snapshot_t",454,"len")=4
 	Set gtmtypes("shm_snapshot_t",454,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.active_lvl_trigger_cntr")=454
+	Set gtmtypes("shm_snapshot_t",455,"name")="shm_snapshot_t.shadow_file_header.new_buff_cntr"
+	Set gtmtypes("shm_snapshot_t",455,"off")=7888
 	Set gtmtypes("shm_snapshot_t",455,"len")=4
 	Set gtmtypes("shm_snapshot_t",455,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.new_buff_cntr")=455
+	Set gtmtypes("shm_snapshot_t",456,"name")="shm_snapshot_t.shadow_file_header.phase2_commit_wait_sleep_in_crit_cntr"
+	Set gtmtypes("shm_snapshot_t",456,"off")=7892
 	Set gtmtypes("shm_snapshot_t",456,"len")=4
 	Set gtmtypes("shm_snapshot_t",456,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.phase2_commit_wait_sleep_in_crit_cntr")=456
+	Set gtmtypes("shm_snapshot_t",457,"name")="shm_snapshot_t.shadow_file_header.phase2_commit_wait_sleep_no_crit_cntr"
+	Set gtmtypes("shm_snapshot_t",457,"off")=7896
 	Set gtmtypes("shm_snapshot_t",457,"len")=4
 	Set gtmtypes("shm_snapshot_t",457,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.phase2_commit_wait_sleep_no_crit_cntr")=457
+	Set gtmtypes("shm_snapshot_t",458,"name")="shm_snapshot_t.shadow_file_header.phase2_commit_wait_pidcnt_cntr"
+	Set gtmtypes("shm_snapshot_t",458,"off")=7900
 	Set gtmtypes("shm_snapshot_t",458,"len")=4
 	Set gtmtypes("shm_snapshot_t",458,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.phase2_commit_wait_pidcnt_cntr")=458
+	Set gtmtypes("shm_snapshot_t",459,"name")="shm_snapshot_t.shadow_file_header.wcb_t_end_sysops_intend_wait_cntr"
+	Set gtmtypes("shm_snapshot_t",459,"off")=7904
 	Set gtmtypes("shm_snapshot_t",459,"len")=4
 	Set gtmtypes("shm_snapshot_t",459,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_t_end_sysops_intend_wait_cntr")=459
+	Set gtmtypes("shm_snapshot_t",460,"name")="shm_snapshot_t.shadow_file_header.wcb_secshr_db_clnup_phase2_clnup_cntr"
+	Set gtmtypes("shm_snapshot_t",460,"off")=7908
 	Set gtmtypes("shm_snapshot_t",460,"len")=4
 	Set gtmtypes("shm_snapshot_t",460,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_secshr_db_clnup_phase2_clnup_cntr")=460
+	Set gtmtypes("shm_snapshot_t",461,"name")="shm_snapshot_t.shadow_file_header.wcb_phase2_commit_wait_cntr"
+	Set gtmtypes("shm_snapshot_t",461,"off")=7912
 	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_phase2_commit_wait_cntr")=461
+	Set gtmtypes("shm_snapshot_t",462,"name")="shm_snapshot_t.shadow_file_header.recompute_upd_array_calls_cntr"
+	Set gtmtypes("shm_snapshot_t",462,"off")=7916
 	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.recompute_upd_array_calls_cntr")=462
+	Set gtmtypes("shm_snapshot_t",463,"name")="shm_snapshot_t.shadow_file_header.recompute_upd_array_rip_cntr"
+	Set gtmtypes("shm_snapshot_t",463,"off")=7920
 	Set gtmtypes("shm_snapshot_t",463,"len")=4
 	Set gtmtypes("shm_snapshot_t",463,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.recompute_upd_array_rip_cntr")=463
+	Set gtmtypes("shm_snapshot_t",464,"name")="shm_snapshot_t.shadow_file_header.recompute_upd_array_in_tend_cntr"
+	Set gtmtypes("shm_snapshot_t",464,"off")=7924
 	Set gtmtypes("shm_snapshot_t",464,"len")=4
 	Set gtmtypes("shm_snapshot_t",464,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.recompute_upd_array_in_tend_cntr")=464
+	Set gtmtypes("shm_snapshot_t",465,"name")="shm_snapshot_t.shadow_file_header.recompute_upd_array_search_blk_cntr"
+	Set gtmtypes("shm_snapshot_t",465,"off")=7928
 	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.recompute_upd_array_search_blk_cntr")=465
+	Set gtmtypes("shm_snapshot_t",466,"name")="shm_snapshot_t.shadow_file_header.recompute_upd_array_new_rec_cntr"
+	Set gtmtypes("shm_snapshot_t",466,"off")=7932
 	Set gtmtypes("shm_snapshot_t",466,"len")=4
 	Set gtmtypes("shm_snapshot_t",466,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.recompute_upd_array_new_rec_cntr")=466
+	Set gtmtypes("shm_snapshot_t",467,"name")="shm_snapshot_t.shadow_file_header.recompute_upd_array_rec_size_cntr"
+	Set gtmtypes("shm_snapshot_t",467,"off")=7936
 	Set gtmtypes("shm_snapshot_t",467,"len")=4
 	Set gtmtypes("shm_snapshot_t",467,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.recompute_upd_array_rec_size_cntr")=467
+	Set gtmtypes("shm_snapshot_t",468,"name")="shm_snapshot_t.shadow_file_header.recompute_upd_array_rec_cmpc_cntr"
+	Set gtmtypes("shm_snapshot_t",468,"off")=7940
 	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.recompute_upd_array_rec_cmpc_cntr")=468
+	Set gtmtypes("shm_snapshot_t",469,"name")="shm_snapshot_t.shadow_file_header.recompute_upd_array_blk_fini_cntr"
+	Set gtmtypes("shm_snapshot_t",469,"off")=7944
 	Set gtmtypes("shm_snapshot_t",469,"len")=4
 	Set gtmtypes("shm_snapshot_t",469,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.recompute_upd_array_blk_fini_cntr")=469
+	Set gtmtypes("shm_snapshot_t",470,"name")="shm_snapshot_t.shadow_file_header.recompute_upd_array_blk_split_cntr"
+	Set gtmtypes("shm_snapshot_t",470,"off")=7948
 	Set gtmtypes("shm_snapshot_t",470,"len")=4
 	Set gtmtypes("shm_snapshot_t",470,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.recompute_upd_array_blk_split_cntr")=470
+	Set gtmtypes("shm_snapshot_t",471,"name")="shm_snapshot_t.shadow_file_header.t_qread_ripsleep_cnt_cntr"
+	Set gtmtypes("shm_snapshot_t",471,"off")=7952
 	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.t_qread_ripsleep_cnt_cntr")=471
+	Set gtmtypes("shm_snapshot_t",472,"name")="shm_snapshot_t.shadow_file_header.t_qread_ripsleep_nblks_cntr"
+	Set gtmtypes("shm_snapshot_t",472,"off")=7956
 	Set gtmtypes("shm_snapshot_t",472,"len")=4
 	Set gtmtypes("shm_snapshot_t",472,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.t_qread_ripsleep_nblks_cntr")=472
+	Set gtmtypes("shm_snapshot_t",473,"name")="shm_snapshot_t.shadow_file_header.wcs_wtfini_invoked_cntr"
+	Set gtmtypes("shm_snapshot_t",473,"off")=7960
 	Set gtmtypes("shm_snapshot_t",473,"len")=4
 	Set gtmtypes("shm_snapshot_t",473,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcs_wtfini_invoked_cntr")=473
+	Set gtmtypes("shm_snapshot_t",474,"name")="shm_snapshot_t.shadow_file_header.wcs_wterror_invoked_cntr"
+	Set gtmtypes("shm_snapshot_t",474,"off")=7964
 	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcs_wterror_invoked_cntr")=474
+	Set gtmtypes("shm_snapshot_t",475,"name")="shm_snapshot_t.shadow_file_header.wcs_wt_restart_invoked_cntr"
+	Set gtmtypes("shm_snapshot_t",475,"off")=7968
 	Set gtmtypes("shm_snapshot_t",475,"len")=4
 	Set gtmtypes("shm_snapshot_t",475,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcs_wt_restart_invoked_cntr")=475
+	Set gtmtypes("shm_snapshot_t",476,"name")="shm_snapshot_t.shadow_file_header.wcs_wt_restart_eagain_cntr"
+	Set gtmtypes("shm_snapshot_t",476,"off")=7972
 	Set gtmtypes("shm_snapshot_t",476,"len")=4
 	Set gtmtypes("shm_snapshot_t",476,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcs_wt_restart_eagain_cntr")=476
+	Set gtmtypes("shm_snapshot_t",477,"name")="shm_snapshot_t.shadow_file_header.wcs_wt_restart_reinsert_cntr"
+	Set gtmtypes("shm_snapshot_t",477,"off")=7976
 	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcs_wt_restart_reinsert_cntr")=477
+	Set gtmtypes("shm_snapshot_t",478,"name")="shm_snapshot_t.shadow_file_header.wcs_wtstart_eagain_cntr"
+	Set gtmtypes("shm_snapshot_t",478,"off")=7980
+	Set gtmtypes("shm_snapshot_t",478,"len")=4
+	Set gtmtypes("shm_snapshot_t",478,"type")="int"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcs_wtstart_eagain_cntr")=478
+	Set gtmtypes("shm_snapshot_t",479,"name")="shm_snapshot_t.shadow_file_header.wcs_wtstart_eagain_incrit_cntr"
+	Set gtmtypes("shm_snapshot_t",479,"off")=7984
+	Set gtmtypes("shm_snapshot_t",479,"len")=4
+	Set gtmtypes("shm_snapshot_t",479,"type")="int"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcs_wtstart_eagain_incrit_cntr")=479
+	Set gtmtypes("shm_snapshot_t",480,"name")="shm_snapshot_t.shadow_file_header.async_restart_eagain_cntr"
+	Set gtmtypes("shm_snapshot_t",480,"off")=7988
 	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.async_restart_eagain_cntr")=480
+	Set gtmtypes("shm_snapshot_t",481,"name")="shm_snapshot_t.shadow_file_header.jnlbuff_phs2cmt_array_full_cntr"
+	Set gtmtypes("shm_snapshot_t",481,"off")=7992
 	Set gtmtypes("shm_snapshot_t",481,"len")=4
 	Set gtmtypes("shm_snapshot_t",481,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.jnlbuff_phs2cmt_array_full_cntr")=481
+	Set gtmtypes("shm_snapshot_t",482,"name")="shm_snapshot_t.shadow_file_header.jnl_phase2_cleanup_if_possible_cntr"
+	Set gtmtypes("shm_snapshot_t",482,"off")=7996
+	Set gtmtypes("shm_snapshot_t",482,"len")=4
+	Set gtmtypes("shm_snapshot_t",482,"type")="int"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.jnl_phase2_cleanup_if_possible_cntr")=482
+	Set gtmtypes("shm_snapshot_t",483,"name")="shm_snapshot_t.shadow_file_header.jnlbuff_phs2cmt_isprcalv_cntr"
+	Set gtmtypes("shm_snapshot_t",483,"off")=8000
 	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_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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.jnlbuff_phs2cmt_isprcalv_cntr")=483
+	Set gtmtypes("shm_snapshot_t",484,"name")="shm_snapshot_t.shadow_file_header.bg_trc_rec_cntr_filler"
+	Set gtmtypes("shm_snapshot_t",484,"off")=8004
+	Set gtmtypes("shm_snapshot_t",484,"len")=12
+	Set gtmtypes("shm_snapshot_t",484,"type")="char"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.bg_trc_rec_cntr_filler")=484
+	Set gtmtypes("shm_snapshot_t",485,"name")="shm_snapshot_t.shadow_file_header.n_gvcst_srches"
+	Set gtmtypes("shm_snapshot_t",485,"off")=8016
 	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_gvcst_srches")=485
+	Set gtmtypes("shm_snapshot_t",486,"name")="shm_snapshot_t.shadow_file_header.n_gvcst_srches.curr_count"
+	Set gtmtypes("shm_snapshot_t",486,"off")=8016
 	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_gvcst_srches.curr_count")=486
+	Set gtmtypes("shm_snapshot_t",487,"name")="shm_snapshot_t.shadow_file_header.n_gvcst_srches.cumul_count"
+	Set gtmtypes("shm_snapshot_t",487,"off")=8020
 	Set gtmtypes("shm_snapshot_t",487,"len")=4
 	Set gtmtypes("shm_snapshot_t",487,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_gvcst_srches.cumul_count")=487
+	Set gtmtypes("shm_snapshot_t",488,"name")="shm_snapshot_t.shadow_file_header.n_gvcst_srch_clues"
+	Set gtmtypes("shm_snapshot_t",488,"off")=8024
 	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_gvcst_srch_clues")=488
+	Set gtmtypes("shm_snapshot_t",489,"name")="shm_snapshot_t.shadow_file_header.n_gvcst_srch_clues.curr_count"
+	Set gtmtypes("shm_snapshot_t",489,"off")=8024
 	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_gvcst_srch_clues.curr_count")=489
+	Set gtmtypes("shm_snapshot_t",490,"name")="shm_snapshot_t.shadow_file_header.n_gvcst_srch_clues.cumul_count"
+	Set gtmtypes("shm_snapshot_t",490,"off")=8028
 	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_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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_gvcst_srch_clues.cumul_count")=490
+	Set gtmtypes("shm_snapshot_t",491,"name")="shm_snapshot_t.shadow_file_header.n_clue_used_head"
+	Set gtmtypes("shm_snapshot_t",491,"off")=8032
 	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_clue_used_head")=491
+	Set gtmtypes("shm_snapshot_t",492,"name")="shm_snapshot_t.shadow_file_header.n_clue_used_head.curr_count"
+	Set gtmtypes("shm_snapshot_t",492,"off")=8032
 	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_clue_used_head.curr_count")=492
+	Set gtmtypes("shm_snapshot_t",493,"name")="shm_snapshot_t.shadow_file_header.n_clue_used_head.cumul_count"
+	Set gtmtypes("shm_snapshot_t",493,"off")=8036
 	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_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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_clue_used_head.cumul_count")=493
+	Set gtmtypes("shm_snapshot_t",494,"name")="shm_snapshot_t.shadow_file_header.n_clue_used_same"
+	Set gtmtypes("shm_snapshot_t",494,"off")=8040
 	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_clue_used_same")=494
+	Set gtmtypes("shm_snapshot_t",495,"name")="shm_snapshot_t.shadow_file_header.n_clue_used_same.curr_count"
+	Set gtmtypes("shm_snapshot_t",495,"off")=8040
 	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_clue_used_same.curr_count")=495
+	Set gtmtypes("shm_snapshot_t",496,"name")="shm_snapshot_t.shadow_file_header.n_clue_used_same.cumul_count"
+	Set gtmtypes("shm_snapshot_t",496,"off")=8044
 	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_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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_clue_used_same.cumul_count")=496
+	Set gtmtypes("shm_snapshot_t",497,"name")="shm_snapshot_t.shadow_file_header.n_clue_used_tail"
+	Set gtmtypes("shm_snapshot_t",497,"off")=8048
 	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_clue_used_tail")=497
+	Set gtmtypes("shm_snapshot_t",498,"name")="shm_snapshot_t.shadow_file_header.n_clue_used_tail.curr_count"
+	Set gtmtypes("shm_snapshot_t",498,"off")=8048
 	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_clue_used_tail.curr_count")=498
+	Set gtmtypes("shm_snapshot_t",499,"name")="shm_snapshot_t.shadow_file_header.n_clue_used_tail.cumul_count"
+	Set gtmtypes("shm_snapshot_t",499,"off")=8052
 	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_clue_used_tail.cumul_count")=499
+	Set gtmtypes("shm_snapshot_t",500,"name")="shm_snapshot_t.shadow_file_header.n_t_qreads"
+	Set gtmtypes("shm_snapshot_t",500,"off")=8056
 	Set gtmtypes("shm_snapshot_t",500,"len")=8
 	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_t_qreads")=500
+	Set gtmtypes("shm_snapshot_t",501,"name")="shm_snapshot_t.shadow_file_header.n_t_qreads.curr_count"
+	Set gtmtypes("shm_snapshot_t",501,"off")=8056
 	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_t_qreads.curr_count")=501
+	Set gtmtypes("shm_snapshot_t",502,"name")="shm_snapshot_t.shadow_file_header.n_t_qreads.cumul_count"
+	Set gtmtypes("shm_snapshot_t",502,"off")=8060
 	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_t_qreads.cumul_count")=502
+	Set gtmtypes("shm_snapshot_t",503,"name")="shm_snapshot_t.shadow_file_header.unused_dsk_reads"
+	Set gtmtypes("shm_snapshot_t",503,"off")=8064
 	Set gtmtypes("shm_snapshot_t",503,"len")=8
 	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.unused_dsk_reads")=503
+	Set gtmtypes("shm_snapshot_t",504,"name")="shm_snapshot_t.shadow_file_header.unused_dsk_reads.curr_count"
+	Set gtmtypes("shm_snapshot_t",504,"off")=8064
 	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.unused_dsk_reads.curr_count")=504
+	Set gtmtypes("shm_snapshot_t",505,"name")="shm_snapshot_t.shadow_file_header.unused_dsk_reads.cumul_count"
+	Set gtmtypes("shm_snapshot_t",505,"off")=8068
 	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.unused_dsk_reads.cumul_count")=505
+	Set gtmtypes("shm_snapshot_t",506,"name")="shm_snapshot_t.shadow_file_header.n_bgmm_updates"
+	Set gtmtypes("shm_snapshot_t",506,"off")=8072
 	Set gtmtypes("shm_snapshot_t",506,"len")=8
 	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_bgmm_updates")=506
+	Set gtmtypes("shm_snapshot_t",507,"name")="shm_snapshot_t.shadow_file_header.n_bgmm_updates.curr_count"
+	Set gtmtypes("shm_snapshot_t",507,"off")=8072
 	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_bgmm_updates.curr_count")=507
+	Set gtmtypes("shm_snapshot_t",508,"name")="shm_snapshot_t.shadow_file_header.n_bgmm_updates.cumul_count"
+	Set gtmtypes("shm_snapshot_t",508,"off")=8076
 	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_bgmm_updates.cumul_count")=508
+	Set gtmtypes("shm_snapshot_t",509,"name")="shm_snapshot_t.shadow_file_header.unused_dsk_writes"
+	Set gtmtypes("shm_snapshot_t",509,"off")=8080
 	Set gtmtypes("shm_snapshot_t",509,"len")=8
 	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.unused_dsk_writes")=509
+	Set gtmtypes("shm_snapshot_t",510,"name")="shm_snapshot_t.shadow_file_header.unused_dsk_writes.curr_count"
+	Set gtmtypes("shm_snapshot_t",510,"off")=8080
 	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.unused_dsk_writes.curr_count")=510
+	Set gtmtypes("shm_snapshot_t",511,"name")="shm_snapshot_t.shadow_file_header.unused_dsk_writes.cumul_count"
+	Set gtmtypes("shm_snapshot_t",511,"off")=8084
 	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.unused_dsk_writes.cumul_count")=511
+	Set gtmtypes("shm_snapshot_t",512,"name")="shm_snapshot_t.shadow_file_header.n_bg_update_creates"
+	Set gtmtypes("shm_snapshot_t",512,"off")=8088
 	Set gtmtypes("shm_snapshot_t",512,"len")=8
 	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_bg_update_creates")=512
+	Set gtmtypes("shm_snapshot_t",513,"name")="shm_snapshot_t.shadow_file_header.n_bg_update_creates.curr_count"
+	Set gtmtypes("shm_snapshot_t",513,"off")=8088
 	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_bg_update_creates.curr_count")=513
+	Set gtmtypes("shm_snapshot_t",514,"name")="shm_snapshot_t.shadow_file_header.n_bg_update_creates.cumul_count"
+	Set gtmtypes("shm_snapshot_t",514,"off")=8092
 	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_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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_bg_update_creates.cumul_count")=514
+	Set gtmtypes("shm_snapshot_t",515,"name")="shm_snapshot_t.shadow_file_header.n_db_csh_getns"
+	Set gtmtypes("shm_snapshot_t",515,"off")=8096
+	Set gtmtypes("shm_snapshot_t",515,"len")=8
+	Set gtmtypes("shm_snapshot_t",515,"type")="db_csh_acct_rec"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_db_csh_getns")=515
+	Set gtmtypes("shm_snapshot_t",516,"name")="shm_snapshot_t.shadow_file_header.n_db_csh_getns.curr_count"
+	Set gtmtypes("shm_snapshot_t",516,"off")=8096
+	Set gtmtypes("shm_snapshot_t",516,"len")=4
+	Set gtmtypes("shm_snapshot_t",516,"type")="int"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_db_csh_getns.curr_count")=516
+	Set gtmtypes("shm_snapshot_t",517,"name")="shm_snapshot_t.shadow_file_header.n_db_csh_getns.cumul_count"
+	Set gtmtypes("shm_snapshot_t",517,"off")=8100
+	Set gtmtypes("shm_snapshot_t",517,"len")=4
+	Set gtmtypes("shm_snapshot_t",517,"type")="int"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_db_csh_getns.cumul_count")=517
+	Set gtmtypes("shm_snapshot_t",518,"name")="shm_snapshot_t.shadow_file_header.n_db_csh_getn_lcnt"
+	Set gtmtypes("shm_snapshot_t",518,"off")=8104
 	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_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_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_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_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_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",518,"type")="db_csh_acct_rec"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_db_csh_getn_lcnt")=518
+	Set gtmtypes("shm_snapshot_t",519,"name")="shm_snapshot_t.shadow_file_header.n_db_csh_getn_lcnt.curr_count"
+	Set gtmtypes("shm_snapshot_t",519,"off")=8104
+	Set gtmtypes("shm_snapshot_t",519,"len")=4
+	Set gtmtypes("shm_snapshot_t",519,"type")="int"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_db_csh_getn_lcnt.curr_count")=519
+	Set gtmtypes("shm_snapshot_t",520,"name")="shm_snapshot_t.shadow_file_header.n_db_csh_getn_lcnt.cumul_count"
+	Set gtmtypes("shm_snapshot_t",520,"off")=8108
+	Set gtmtypes("shm_snapshot_t",520,"len")=4
+	Set gtmtypes("shm_snapshot_t",520,"type")="int"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_db_csh_getn_lcnt.cumul_count")=520
+	Set gtmtypes("shm_snapshot_t",521,"name")="shm_snapshot_t.shadow_file_header.db_csh_acct_rec_filler_4k"
+	Set gtmtypes("shm_snapshot_t",521,"off")=8112
+	Set gtmtypes("shm_snapshot_t",521,"len")=152
+	Set gtmtypes("shm_snapshot_t",521,"type")="char"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.db_csh_acct_rec_filler_4k")=521
+	Set gtmtypes("shm_snapshot_t",522,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec"
+	Set gtmtypes("shm_snapshot_t",522,"off")=8264
+	Set gtmtypes("shm_snapshot_t",522,"len")=472
+	Set gtmtypes("shm_snapshot_t",522,"type")="gvstats_rec_t"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec")=522
+	Set gtmtypes("shm_snapshot_t",523,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_set"
+	Set gtmtypes("shm_snapshot_t",523,"off")=8264
 	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_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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_set")=523
+	Set gtmtypes("shm_snapshot_t",524,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_kill"
+	Set gtmtypes("shm_snapshot_t",524,"off")=8272
 	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_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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_kill")=524
+	Set gtmtypes("shm_snapshot_t",525,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_get"
+	Set gtmtypes("shm_snapshot_t",525,"off")=8280
 	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_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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_get")=525
+	Set gtmtypes("shm_snapshot_t",526,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_data"
+	Set gtmtypes("shm_snapshot_t",526,"off")=8288
 	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.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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_data")=526
+	Set gtmtypes("shm_snapshot_t",527,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_order"
+	Set gtmtypes("shm_snapshot_t",527,"off")=8296
 	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_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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_order")=527
+	Set gtmtypes("shm_snapshot_t",528,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_zprev"
+	Set gtmtypes("shm_snapshot_t",528,"off")=8304
 	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_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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_zprev")=528
+	Set gtmtypes("shm_snapshot_t",529,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_query"
+	Set gtmtypes("shm_snapshot_t",529,"off")=8312
 	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_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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_query")=529
+	Set gtmtypes("shm_snapshot_t",530,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_lock_success"
+	Set gtmtypes("shm_snapshot_t",530,"off")=8320
 	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_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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_lock_success")=530
+	Set gtmtypes("shm_snapshot_t",531,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_lock_fail"
+	Set gtmtypes("shm_snapshot_t",531,"off")=8328
 	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_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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_lock_fail")=531
+	Set gtmtypes("shm_snapshot_t",532,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.db_curr_tn"
+	Set gtmtypes("shm_snapshot_t",532,"off")=8336
 	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_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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.db_curr_tn")=532
+	Set gtmtypes("shm_snapshot_t",533,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_dsk_read"
+	Set gtmtypes("shm_snapshot_t",533,"off")=8344
 	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_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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_dsk_read")=533
+	Set gtmtypes("shm_snapshot_t",534,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_dsk_write"
+	Set gtmtypes("shm_snapshot_t",534,"off")=8352
 	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_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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_dsk_write")=534
+	Set gtmtypes("shm_snapshot_t",535,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_nontp_readwrite"
+	Set gtmtypes("shm_snapshot_t",535,"off")=8360
 	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_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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_nontp_readwrite")=535
+	Set gtmtypes("shm_snapshot_t",536,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_nontp_readonly"
+	Set gtmtypes("shm_snapshot_t",536,"off")=8368
 	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_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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_nontp_readonly")=536
+	Set gtmtypes("shm_snapshot_t",537,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_nontp_blkwrite"
+	Set gtmtypes("shm_snapshot_t",537,"off")=8376
 	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_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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_nontp_blkwrite")=537
+	Set gtmtypes("shm_snapshot_t",538,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_nontp_blkread"
+	Set gtmtypes("shm_snapshot_t",538,"off")=8384
 	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_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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_nontp_blkread")=538
+	Set gtmtypes("shm_snapshot_t",539,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_nontp_retries_0"
+	Set gtmtypes("shm_snapshot_t",539,"off")=8392
 	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_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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_nontp_retries_0")=539
+	Set gtmtypes("shm_snapshot_t",540,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_nontp_retries_1"
+	Set gtmtypes("shm_snapshot_t",540,"off")=8400
 	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_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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_nontp_retries_1")=540
+	Set gtmtypes("shm_snapshot_t",541,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_nontp_retries_2"
+	Set gtmtypes("shm_snapshot_t",541,"off")=8408
 	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_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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_nontp_retries_2")=541
+	Set gtmtypes("shm_snapshot_t",542,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_nontp_retries_3"
+	Set gtmtypes("shm_snapshot_t",542,"off")=8416
 	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_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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_nontp_retries_3")=542
+	Set gtmtypes("shm_snapshot_t",543,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_tp_readwrite"
+	Set gtmtypes("shm_snapshot_t",543,"off")=8424
 	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_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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_tp_readwrite")=543
+	Set gtmtypes("shm_snapshot_t",544,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_tp_readonly"
+	Set gtmtypes("shm_snapshot_t",544,"off")=8432
 	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_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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_tp_readonly")=544
+	Set gtmtypes("shm_snapshot_t",545,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_tp_rolledback"
+	Set gtmtypes("shm_snapshot_t",545,"off")=8440
 	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_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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_tp_rolledback")=545
+	Set gtmtypes("shm_snapshot_t",546,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_tp_blkwrite"
+	Set gtmtypes("shm_snapshot_t",546,"off")=8448
 	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_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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_tp_blkwrite")=546
+	Set gtmtypes("shm_snapshot_t",547,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_tp_blkread"
+	Set gtmtypes("shm_snapshot_t",547,"off")=8456
 	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_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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_tp_blkread")=547
+	Set gtmtypes("shm_snapshot_t",548,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_tp_tot_retries_0"
+	Set gtmtypes("shm_snapshot_t",548,"off")=8464
 	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_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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_tp_tot_retries_0")=548
+	Set gtmtypes("shm_snapshot_t",549,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_tp_tot_retries_1"
+	Set gtmtypes("shm_snapshot_t",549,"off")=8472
 	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_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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_tp_tot_retries_1")=549
+	Set gtmtypes("shm_snapshot_t",550,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_tp_tot_retries_2"
+	Set gtmtypes("shm_snapshot_t",550,"off")=8480
 	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_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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_tp_tot_retries_2")=550
+	Set gtmtypes("shm_snapshot_t",551,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_tp_tot_retries_3"
+	Set gtmtypes("shm_snapshot_t",551,"off")=8488
 	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_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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_tp_tot_retries_3")=551
+	Set gtmtypes("shm_snapshot_t",552,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_tp_tot_retries_4"
+	Set gtmtypes("shm_snapshot_t",552,"off")=8496
 	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.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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_tp_tot_retries_4")=552
+	Set gtmtypes("shm_snapshot_t",553,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_tp_cnflct_retries_0"
+	Set gtmtypes("shm_snapshot_t",553,"off")=8504
 	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_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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_tp_cnflct_retries_0")=553
+	Set gtmtypes("shm_snapshot_t",554,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_tp_cnflct_retries_1"
+	Set gtmtypes("shm_snapshot_t",554,"off")=8512
 	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.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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_tp_cnflct_retries_1")=554
+	Set gtmtypes("shm_snapshot_t",555,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_tp_cnflct_retries_2"
+	Set gtmtypes("shm_snapshot_t",555,"off")=8520
 	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_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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_tp_cnflct_retries_2")=555
+	Set gtmtypes("shm_snapshot_t",556,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_tp_cnflct_retries_3"
+	Set gtmtypes("shm_snapshot_t",556,"off")=8528
 	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.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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_tp_cnflct_retries_3")=556
+	Set gtmtypes("shm_snapshot_t",557,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_tp_cnflct_retries_4"
+	Set gtmtypes("shm_snapshot_t",557,"off")=8536
 	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_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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_tp_cnflct_retries_4")=557
+	Set gtmtypes("shm_snapshot_t",558,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_ztrigger"
+	Set gtmtypes("shm_snapshot_t",558,"off")=8544
 	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_ztrigger")=558
+	Set gtmtypes("shm_snapshot_t",559,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_db_flush"
+	Set gtmtypes("shm_snapshot_t",559,"off")=8552
 	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_db_flush")=559
+	Set gtmtypes("shm_snapshot_t",560,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_db_fsync"
+	Set gtmtypes("shm_snapshot_t",560,"off")=8560
 	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.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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_db_fsync")=560
+	Set gtmtypes("shm_snapshot_t",561,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_jnl_flush"
+	Set gtmtypes("shm_snapshot_t",561,"off")=8568
 	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_jnl_flush")=561
+	Set gtmtypes("shm_snapshot_t",562,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_jnl_fsync"
+	Set gtmtypes("shm_snapshot_t",562,"off")=8576
 	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_jnl_fsync")=562
+	Set gtmtypes("shm_snapshot_t",563,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_jbuff_bytes"
+	Set gtmtypes("shm_snapshot_t",563,"off")=8584
 	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_jbuff_bytes")=563
+	Set gtmtypes("shm_snapshot_t",564,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_jfile_bytes"
+	Set gtmtypes("shm_snapshot_t",564,"off")=8592
 	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_jfile_bytes")=564
+	Set gtmtypes("shm_snapshot_t",565,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_jfile_writes"
+	Set gtmtypes("shm_snapshot_t",565,"off")=8600
 	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_jfile_writes")=565
+	Set gtmtypes("shm_snapshot_t",566,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_jrec_logical"
+	Set gtmtypes("shm_snapshot_t",566,"off")=8608
 	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_jrec_logical")=566
+	Set gtmtypes("shm_snapshot_t",567,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_jrec_pblk"
+	Set gtmtypes("shm_snapshot_t",567,"off")=8616
 	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_jrec_pblk")=567
+	Set gtmtypes("shm_snapshot_t",568,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_jrec_epoch_regular"
+	Set gtmtypes("shm_snapshot_t",568,"off")=8624
 	Set gtmtypes("shm_snapshot_t",568,"len")=8
 	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_jrec_epoch_regular")=568
+	Set gtmtypes("shm_snapshot_t",569,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_jrec_epoch_idle"
+	Set gtmtypes("shm_snapshot_t",569,"off")=8632
 	Set gtmtypes("shm_snapshot_t",569,"len")=8
 	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_jrec_epoch_idle")=569
+	Set gtmtypes("shm_snapshot_t",570,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_jrec_other"
+	Set gtmtypes("shm_snapshot_t",570,"off")=8640
 	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.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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_jrec_other")=570
+	Set gtmtypes("shm_snapshot_t",571,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_jnl_extends"
+	Set gtmtypes("shm_snapshot_t",571,"off")=8648
 	Set gtmtypes("shm_snapshot_t",571,"len")=8
 	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_jnl_extends")=571
+	Set gtmtypes("shm_snapshot_t",572,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_db_extends"
+	Set gtmtypes("shm_snapshot_t",572,"off")=8656
 	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_db_extends")=572
+	Set gtmtypes("shm_snapshot_t",573,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_crit_success"
+	Set gtmtypes("shm_snapshot_t",573,"off")=8664
 	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_crit_success")=573
+	Set gtmtypes("shm_snapshot_t",574,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_crits_in_epch"
+	Set gtmtypes("shm_snapshot_t",574,"off")=8672
 	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_crits_in_epch")=574
+	Set gtmtypes("shm_snapshot_t",575,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.sq_crit_failed"
+	Set gtmtypes("shm_snapshot_t",575,"off")=8680
 	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.sq_crit_failed")=575
+	Set gtmtypes("shm_snapshot_t",576,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_crit_failed"
+	Set gtmtypes("shm_snapshot_t",576,"off")=8688
+	Set gtmtypes("shm_snapshot_t",576,"len")=8
+	Set gtmtypes("shm_snapshot_t",576,"type")="uint64_t"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_crit_failed")=576
+	Set gtmtypes("shm_snapshot_t",577,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.sq_crit_que_slps"
+	Set gtmtypes("shm_snapshot_t",577,"off")=8696
+	Set gtmtypes("shm_snapshot_t",577,"len")=8
+	Set gtmtypes("shm_snapshot_t",577,"type")="uint64_t"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.sq_crit_que_slps")=577
+	Set gtmtypes("shm_snapshot_t",578,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_crit_que_slps"
+	Set gtmtypes("shm_snapshot_t",578,"off")=8704
+	Set gtmtypes("shm_snapshot_t",578,"len")=8
 	Set gtmtypes("shm_snapshot_t",578,"type")="uint64_t"
-	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.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")="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")="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")="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")="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")="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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_crit_que_slps")=578
+	Set gtmtypes("shm_snapshot_t",579,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.sq_crit_yields"
+	Set gtmtypes("shm_snapshot_t",579,"off")=8712
+	Set gtmtypes("shm_snapshot_t",579,"len")=8
+	Set gtmtypes("shm_snapshot_t",579,"type")="uint64_t"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.sq_crit_yields")=579
+	Set gtmtypes("shm_snapshot_t",580,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_crit_yields"
+	Set gtmtypes("shm_snapshot_t",580,"off")=8720
+	Set gtmtypes("shm_snapshot_t",580,"len")=8
+	Set gtmtypes("shm_snapshot_t",580,"type")="uint64_t"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_crit_yields")=580
+	Set gtmtypes("shm_snapshot_t",581,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_clean2dirty"
+	Set gtmtypes("shm_snapshot_t",581,"off")=8728
+	Set gtmtypes("shm_snapshot_t",581,"len")=8
+	Set gtmtypes("shm_snapshot_t",581,"type")="uint64_t"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_clean2dirty")=581
+	Set gtmtypes("shm_snapshot_t",582,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec_filler_4k_plus_512"
+	Set gtmtypes("shm_snapshot_t",582,"off")=8736
+	Set gtmtypes("shm_snapshot_t",582,"len")=40
+	Set gtmtypes("shm_snapshot_t",582,"type")="char"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec_filler_4k_plus_512")=582
+	Set gtmtypes("shm_snapshot_t",583,"name")="shm_snapshot_t.shadow_file_header.filler_4k_plus_512"
+	Set gtmtypes("shm_snapshot_t",583,"off")=8776
+	Set gtmtypes("shm_snapshot_t",583,"len")=368
+	Set gtmtypes("shm_snapshot_t",583,"type")="char"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.filler_4k_plus_512")=583
+	Set gtmtypes("shm_snapshot_t",584,"name")="shm_snapshot_t.shadow_file_header.intrpt_recov_resync_strm_seqno"
+	Set gtmtypes("shm_snapshot_t",584,"off")=9144
+	Set gtmtypes("shm_snapshot_t",584,"len")=128
+	Set gtmtypes("shm_snapshot_t",584,"type")="uint64_t"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.intrpt_recov_resync_strm_seqno")=584
+	Set gtmtypes("shm_snapshot_t",584,"dim")=16
+	Set gtmtypes("shm_snapshot_t",585,"name")="shm_snapshot_t.shadow_file_header.creation_db_ver"
+	Set gtmtypes("shm_snapshot_t",585,"off")=9272
+	Set gtmtypes("shm_snapshot_t",585,"len")=4
+	Set gtmtypes("shm_snapshot_t",585,"type")="int"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.creation_db_ver")=585
+	Set gtmtypes("shm_snapshot_t",586,"name")="shm_snapshot_t.shadow_file_header.creation_mdb_ver"
+	Set gtmtypes("shm_snapshot_t",586,"off")=9276
+	Set gtmtypes("shm_snapshot_t",586,"len")=4
+	Set gtmtypes("shm_snapshot_t",586,"type")="int"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.creation_mdb_ver")=586
+	Set gtmtypes("shm_snapshot_t",587,"name")="shm_snapshot_t.shadow_file_header.certified_for_upgrade_to"
+	Set gtmtypes("shm_snapshot_t",587,"off")=9280
+	Set gtmtypes("shm_snapshot_t",587,"len")=4
+	Set gtmtypes("shm_snapshot_t",587,"type")="int"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.certified_for_upgrade_to")=587
+	Set gtmtypes("shm_snapshot_t",588,"name")="shm_snapshot_t.shadow_file_header.filler_5k"
+	Set gtmtypes("shm_snapshot_t",588,"off")=9284
+	Set gtmtypes("shm_snapshot_t",588,"len")=4
+	Set gtmtypes("shm_snapshot_t",588,"type")="int"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.filler_5k")=588
+	Set gtmtypes("shm_snapshot_t",589,"name")="shm_snapshot_t.shadow_file_header.secshr_ops_index_filler"
+	Set gtmtypes("shm_snapshot_t",589,"off")=9288
+	Set gtmtypes("shm_snapshot_t",589,"len")=4
+	Set gtmtypes("shm_snapshot_t",589,"type")="int"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.secshr_ops_index_filler")=589
+	Set gtmtypes("shm_snapshot_t",590,"name")="shm_snapshot_t.shadow_file_header.secshr_ops_array_filler"
+	Set gtmtypes("shm_snapshot_t",590,"off")=9292
+	Set gtmtypes("shm_snapshot_t",590,"len")=1020
 	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.secshr_ops_array_filler")=590
+	Set gtmtypes("shm_snapshot_t",590,"dim")=255
+	Set gtmtypes("shm_snapshot_t",591,"name")="shm_snapshot_t.shadow_file_header.next_upgrd_warn"
+	Set gtmtypes("shm_snapshot_t",591,"off")=10312
+	Set gtmtypes("shm_snapshot_t",591,"len")=24
+	Set gtmtypes("shm_snapshot_t",591,"type")="compswap_time_field"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.next_upgrd_warn")=591
+	Set gtmtypes("shm_snapshot_t",592,"name")="shm_snapshot_t.shadow_file_header.next_upgrd_warn.time_latch"
+	Set gtmtypes("shm_snapshot_t",592,"off")=10312
+	Set gtmtypes("shm_snapshot_t",592,"len")=8
+	Set gtmtypes("shm_snapshot_t",592,"type")="global_latch_t"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.next_upgrd_warn.time_latch")=592
+	Set gtmtypes("shm_snapshot_t",593,"name")="shm_snapshot_t.shadow_file_header.next_upgrd_warn.time_latch.u"
+	Set gtmtypes("shm_snapshot_t",593,"off")=10312
+	Set gtmtypes("shm_snapshot_t",593,"len")=8
+	Set gtmtypes("shm_snapshot_t",593,"type")="union"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.next_upgrd_warn.time_latch.u")=593
+	Set gtmtypes("shm_snapshot_t",594,"name")="shm_snapshot_t.shadow_file_header.next_upgrd_warn.time_latch.u.pid_imgcnt"
+	Set gtmtypes("shm_snapshot_t",594,"off")=10312
+	Set gtmtypes("shm_snapshot_t",594,"len")=8
+	Set gtmtypes("shm_snapshot_t",594,"type")="uint64_t"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.next_upgrd_warn.time_latch.u.pid_imgcnt")=594
+	Set gtmtypes("shm_snapshot_t",595,"name")="shm_snapshot_t.shadow_file_header.next_upgrd_warn.time_latch.u.parts"
+	Set gtmtypes("shm_snapshot_t",595,"off")=10312
+	Set gtmtypes("shm_snapshot_t",595,"len")=8
+	Set gtmtypes("shm_snapshot_t",595,"type")="struct"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.next_upgrd_warn.time_latch.u.parts")=595
+	Set gtmtypes("shm_snapshot_t",596,"name")="shm_snapshot_t.shadow_file_header.next_upgrd_warn.time_latch.u.parts.latch_pid"
+	Set gtmtypes("shm_snapshot_t",596,"off")=10312
+	Set gtmtypes("shm_snapshot_t",596,"len")=4
+	Set gtmtypes("shm_snapshot_t",596,"type")="int"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.next_upgrd_warn.time_latch.u.parts.latch_pid")=596
+	Set gtmtypes("shm_snapshot_t",597,"name")="shm_snapshot_t.shadow_file_header.next_upgrd_warn.time_latch.u.parts.latch_word"
+	Set gtmtypes("shm_snapshot_t",597,"off")=10316
 	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",597,"type")="int"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.next_upgrd_warn.time_latch.u.parts.latch_word")=597
+	Set gtmtypes("shm_snapshot_t",598,"name")="shm_snapshot_t.shadow_file_header.next_upgrd_warn.hp_latch_space"
+	Set gtmtypes("shm_snapshot_t",598,"off")=10320
+	Set gtmtypes("shm_snapshot_t",598,"len")=16
+	Set gtmtypes("shm_snapshot_t",598,"type")="int"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.next_upgrd_warn.hp_latch_space")=598
+	Set gtmtypes("shm_snapshot_t",598,"dim")=4
+	Set gtmtypes("shm_snapshot_t",599,"name")="shm_snapshot_t.shadow_file_header.is_encrypted"
+	Set gtmtypes("shm_snapshot_t",599,"off")=10336
 	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",599,"type")="unsigned-int"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.is_encrypted")=599
+	Set gtmtypes("shm_snapshot_t",600,"name")="shm_snapshot_t.shadow_file_header.db_trigger_cycle"
+	Set gtmtypes("shm_snapshot_t",600,"off")=10340
 	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",600,"type")="unsigned-int"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.db_trigger_cycle")=600
+	Set gtmtypes("shm_snapshot_t",601,"name")="shm_snapshot_t.shadow_file_header.strm_reg_seqno"
+	Set gtmtypes("shm_snapshot_t",601,"off")=10344
+	Set gtmtypes("shm_snapshot_t",601,"len")=128
+	Set gtmtypes("shm_snapshot_t",601,"type")="uint64_t"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.strm_reg_seqno")=601
+	Set gtmtypes("shm_snapshot_t",601,"dim")=16
+	Set gtmtypes("shm_snapshot_t",602,"name")="shm_snapshot_t.shadow_file_header.save_strm_reg_seqno"
+	Set gtmtypes("shm_snapshot_t",602,"off")=10472
+	Set gtmtypes("shm_snapshot_t",602,"len")=128
+	Set gtmtypes("shm_snapshot_t",602,"type")="uint64_t"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.save_strm_reg_seqno")=602
+	Set gtmtypes("shm_snapshot_t",602,"dim")=16
+	Set gtmtypes("shm_snapshot_t",603,"name")="shm_snapshot_t.shadow_file_header.freeze_on_fail"
+	Set gtmtypes("shm_snapshot_t",603,"off")=10600
 	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.freeze_on_fail")=603
+	Set gtmtypes("shm_snapshot_t",604,"name")="shm_snapshot_t.shadow_file_header.span_node_absent"
+	Set gtmtypes("shm_snapshot_t",604,"off")=10604
 	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.span_node_absent")=604
+	Set gtmtypes("shm_snapshot_t",605,"name")="shm_snapshot_t.shadow_file_header.maxkeysz_assured"
+	Set gtmtypes("shm_snapshot_t",605,"off")=10608
 	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("shm_snapshot_t",605,"type")="boolean_t"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.maxkeysz_assured")=605
+	Set gtmtypes("shm_snapshot_t",606,"name")="shm_snapshot_t.shadow_file_header.hasht_upgrade_needed"
+	Set gtmtypes("shm_snapshot_t",606,"off")=10612
+	Set gtmtypes("shm_snapshot_t",606,"len")=4
+	Set gtmtypes("shm_snapshot_t",606,"type")="boolean_t"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.hasht_upgrade_needed")=606
+	Set gtmtypes("shm_snapshot_t",607,"name")="shm_snapshot_t.shadow_file_header.defer_allocate"
+	Set gtmtypes("shm_snapshot_t",607,"off")=10616
+	Set gtmtypes("shm_snapshot_t",607,"len")=4
+	Set gtmtypes("shm_snapshot_t",607,"type")="boolean_t"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.defer_allocate")=607
+	Set gtmtypes("shm_snapshot_t",608,"name")="shm_snapshot_t.shadow_file_header.filler_ftok_counter_halted"
+	Set gtmtypes("shm_snapshot_t",608,"off")=10620
+	Set gtmtypes("shm_snapshot_t",608,"len")=4
+	Set gtmtypes("shm_snapshot_t",608,"type")="boolean_t"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.filler_ftok_counter_halted")=608
+	Set gtmtypes("shm_snapshot_t",609,"name")="shm_snapshot_t.shadow_file_header.filler_access_counter_halted"
+	Set gtmtypes("shm_snapshot_t",609,"off")=10624
+	Set gtmtypes("shm_snapshot_t",609,"len")=4
+	Set gtmtypes("shm_snapshot_t",609,"type")="boolean_t"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.filler_access_counter_halted")=609
+	Set gtmtypes("shm_snapshot_t",610,"name")="shm_snapshot_t.shadow_file_header.lock_crit_with_db"
+	Set gtmtypes("shm_snapshot_t",610,"off")=10628
+	Set gtmtypes("shm_snapshot_t",610,"len")=4
+	Set gtmtypes("shm_snapshot_t",610,"type")="boolean_t"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.lock_crit_with_db")=610
+	Set gtmtypes("shm_snapshot_t",611,"name")="shm_snapshot_t.shadow_file_header.basedb_fname_len"
+	Set gtmtypes("shm_snapshot_t",611,"off")=10632
+	Set gtmtypes("shm_snapshot_t",611,"len")=4
+	Set gtmtypes("shm_snapshot_t",611,"type")="unsigned-int"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.basedb_fname_len")=611
+	Set gtmtypes("shm_snapshot_t",612,"name")="shm_snapshot_t.shadow_file_header.basedb_fname"
+	Set gtmtypes("shm_snapshot_t",612,"off")=10636
+	Set gtmtypes("shm_snapshot_t",612,"len")=256
+	Set gtmtypes("shm_snapshot_t",612,"type")="unsigned-char"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.basedb_fname")=612
+	Set gtmtypes("shm_snapshot_t",613,"name")="shm_snapshot_t.shadow_file_header.filler_7k"
+	Set gtmtypes("shm_snapshot_t",613,"off")=10892
+	Set gtmtypes("shm_snapshot_t",613,"len")=444
+	Set gtmtypes("shm_snapshot_t",613,"type")="char"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.filler_7k")=613
+	Set gtmtypes("shm_snapshot_t",614,"name")="shm_snapshot_t.shadow_file_header.filler_8k"
+	Set gtmtypes("shm_snapshot_t",614,"off")=11336
+	Set gtmtypes("shm_snapshot_t",614,"len")=1024
+	Set gtmtypes("shm_snapshot_t",614,"type")="char"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.filler_8k")=614
 	;
 	Set gtmtypes("shmpool_blk_hdr")="struct"
 	Set gtmtypes("shmpool_blk_hdr",0)=11
@@ -33391,7 +34405,7 @@ Init
 	Set gtmtypfldindx("shmpool_blk_hdr","image_count")=11
 	;
 	Set gtmtypes("shmpool_buff_hdr")="struct"
-	Set gtmtypes("shmpool_buff_hdr",0)=615
+	Set gtmtypes("shmpool_buff_hdr",0)=621
 	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
@@ -34419,11 +35433,11 @@ Init
 	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.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,"name")="shmpool_buff_hdr.shadow_file_header.wcb_gds_rundown2_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_bgtrcrec1_tn")=204
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_gds_rundown2_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
@@ -34714,11 +35728,11 @@ Init
 	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_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,"name")="shmpool_buff_hdr.shadow_file_header.wcb_wcs_flu0_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_tp_grab_crit_tn")=263
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_wcs_flu0_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
@@ -34739,11 +35753,11 @@ Init
 	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_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,"name")="shmpool_buff_hdr.shadow_file_header.wcb_gds_rundown1_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_gds_rundown_tn")=268
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_gds_rundown1_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
@@ -35099,1391 +36113,1421 @@ Init
 	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,"name")="shmpool_buff_hdr.shadow_file_header.jnlbuff_phs2cmt_array_full_tn"
 	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.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.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.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",340,"len")=8
+	Set gtmtypes("shmpool_buff_hdr",340,"type")="uint64_t"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.jnlbuff_phs2cmt_array_full_tn")=340
+	Set gtmtypes("shmpool_buff_hdr",341,"name")="shmpool_buff_hdr.shadow_file_header.jnl_phase2_cleanup_if_possible_tn"
+	Set gtmtypes("shmpool_buff_hdr",341,"off")=3560
+	Set gtmtypes("shmpool_buff_hdr",341,"len")=8
+	Set gtmtypes("shmpool_buff_hdr",341,"type")="uint64_t"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.jnl_phase2_cleanup_if_possible_tn")=341
+	Set gtmtypes("shmpool_buff_hdr",342,"name")="shmpool_buff_hdr.shadow_file_header.jnlbuff_phs2cmt_isprcalv_tn"
+	Set gtmtypes("shmpool_buff_hdr",342,"off")=3568
+	Set gtmtypes("shmpool_buff_hdr",342,"len")=8
+	Set gtmtypes("shmpool_buff_hdr",342,"type")="uint64_t"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.jnlbuff_phs2cmt_isprcalv_tn")=342
+	Set gtmtypes("shmpool_buff_hdr",343,"name")="shmpool_buff_hdr.shadow_file_header.bg_trc_rec_tn_filler"
+	Set gtmtypes("shmpool_buff_hdr",343,"off")=3576
+	Set gtmtypes("shmpool_buff_hdr",343,"len")=24
+	Set gtmtypes("shmpool_buff_hdr",343,"type")="char"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.bg_trc_rec_tn_filler")=343
+	Set gtmtypes("shmpool_buff_hdr",344,"name")="shmpool_buff_hdr.shadow_file_header.total_buffer_flush_cntr"
+	Set gtmtypes("shmpool_buff_hdr",344,"off")=3600
 	Set gtmtypes("shmpool_buff_hdr",344,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",344,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.total_buffer_flush_cntr")=344
+	Set gtmtypes("shmpool_buff_hdr",345,"name")="shmpool_buff_hdr.shadow_file_header.bufct_buffer_flush_cntr"
+	Set gtmtypes("shmpool_buff_hdr",345,"off")=3604
 	Set gtmtypes("shmpool_buff_hdr",345,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",345,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.bufct_buffer_flush_cntr")=345
+	Set gtmtypes("shmpool_buff_hdr",346,"name")="shmpool_buff_hdr.shadow_file_header.bufct_buffer_flush_loop_cntr"
+	Set gtmtypes("shmpool_buff_hdr",346,"off")=3608
 	Set gtmtypes("shmpool_buff_hdr",346,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",346,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.bufct_buffer_flush_loop_cntr")=346
+	Set gtmtypes("shmpool_buff_hdr",347,"name")="shmpool_buff_hdr.shadow_file_header.wrt_calls_cntr"
+	Set gtmtypes("shmpool_buff_hdr",347,"off")=3612
 	Set gtmtypes("shmpool_buff_hdr",347,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",347,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wrt_calls_cntr")=347
+	Set gtmtypes("shmpool_buff_hdr",348,"name")="shmpool_buff_hdr.shadow_file_header.wrt_count_cntr"
+	Set gtmtypes("shmpool_buff_hdr",348,"off")=3616
 	Set gtmtypes("shmpool_buff_hdr",348,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",348,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wrt_count_cntr")=348
+	Set gtmtypes("shmpool_buff_hdr",349,"name")="shmpool_buff_hdr.shadow_file_header.wrt_blocked_cntr"
+	Set gtmtypes("shmpool_buff_hdr",349,"off")=3620
 	Set gtmtypes("shmpool_buff_hdr",349,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",349,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wrt_blocked_cntr")=349
+	Set gtmtypes("shmpool_buff_hdr",350,"name")="shmpool_buff_hdr.shadow_file_header.wrt_busy_cntr"
+	Set gtmtypes("shmpool_buff_hdr",350,"off")=3624
 	Set gtmtypes("shmpool_buff_hdr",350,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",350,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wrt_busy_cntr")=350
+	Set gtmtypes("shmpool_buff_hdr",351,"name")="shmpool_buff_hdr.shadow_file_header.wrt_noblks_wrtn_cntr"
+	Set gtmtypes("shmpool_buff_hdr",351,"off")=3628
 	Set gtmtypes("shmpool_buff_hdr",351,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",351,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wrt_noblks_wrtn_cntr")=351
+	Set gtmtypes("shmpool_buff_hdr",352,"name")="shmpool_buff_hdr.shadow_file_header.wcb_gds_rundown2_cntr"
+	Set gtmtypes("shmpool_buff_hdr",352,"off")=3632
 	Set gtmtypes("shmpool_buff_hdr",352,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",352,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_gds_rundown2_cntr")=352
+	Set gtmtypes("shmpool_buff_hdr",353,"name")="shmpool_buff_hdr.shadow_file_header.reserved_bgtrcrec2_cntr"
+	Set gtmtypes("shmpool_buff_hdr",353,"off")=3636
 	Set gtmtypes("shmpool_buff_hdr",353,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",353,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.reserved_bgtrcrec2_cntr")=353
+	Set gtmtypes("shmpool_buff_hdr",354,"name")="shmpool_buff_hdr.shadow_file_header.reserved_bgtrcrec3_cntr"
+	Set gtmtypes("shmpool_buff_hdr",354,"off")=3640
 	Set gtmtypes("shmpool_buff_hdr",354,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",354,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.reserved_bgtrcrec3_cntr")=354
+	Set gtmtypes("shmpool_buff_hdr",355,"name")="shmpool_buff_hdr.shadow_file_header.lost_block_recovery_cntr"
+	Set gtmtypes("shmpool_buff_hdr",355,"off")=3644
 	Set gtmtypes("shmpool_buff_hdr",355,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",355,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.lost_block_recovery_cntr")=355
+	Set gtmtypes("shmpool_buff_hdr",356,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_onln_rlbk_cntr"
+	Set gtmtypes("shmpool_buff_hdr",356,"off")=3648
 	Set gtmtypes("shmpool_buff_hdr",356,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",356,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_onln_rlbk_cntr")=356
+	Set gtmtypes("shmpool_buff_hdr",357,"name")="shmpool_buff_hdr.shadow_file_header.stale_cntr"
+	Set gtmtypes("shmpool_buff_hdr",357,"off")=3652
 	Set gtmtypes("shmpool_buff_hdr",357,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",357,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.stale_cntr")=357
+	Set gtmtypes("shmpool_buff_hdr",358,"name")="shmpool_buff_hdr.shadow_file_header.starved_cntr"
+	Set gtmtypes("shmpool_buff_hdr",358,"off")=3656
 	Set gtmtypes("shmpool_buff_hdr",358,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",358,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.starved_cntr")=358
+	Set gtmtypes("shmpool_buff_hdr",359,"name")="shmpool_buff_hdr.shadow_file_header.stale_timer_started_cntr"
+	Set gtmtypes("shmpool_buff_hdr",359,"off")=3660
 	Set gtmtypes("shmpool_buff_hdr",359,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",359,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.stale_timer_started_cntr")=359
+	Set gtmtypes("shmpool_buff_hdr",360,"name")="shmpool_buff_hdr.shadow_file_header.stale_timer_pop_cntr"
+	Set gtmtypes("shmpool_buff_hdr",360,"off")=3664
 	Set gtmtypes("shmpool_buff_hdr",360,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",360,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.stale_timer_pop_cntr")=360
+	Set gtmtypes("shmpool_buff_hdr",361,"name")="shmpool_buff_hdr.shadow_file_header.stale_process_defer_cntr"
+	Set gtmtypes("shmpool_buff_hdr",361,"off")=3668
 	Set gtmtypes("shmpool_buff_hdr",361,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",361,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.stale_process_defer_cntr")=361
+	Set gtmtypes("shmpool_buff_hdr",362,"name")="shmpool_buff_hdr.shadow_file_header.stale_defer_processed_cntr"
+	Set gtmtypes("shmpool_buff_hdr",362,"off")=3672
 	Set gtmtypes("shmpool_buff_hdr",362,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",362,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.stale_defer_processed_cntr")=362
+	Set gtmtypes("shmpool_buff_hdr",363,"name")="shmpool_buff_hdr.shadow_file_header.spcfc_buffer_flush_cntr"
+	Set gtmtypes("shmpool_buff_hdr",363,"off")=3676
 	Set gtmtypes("shmpool_buff_hdr",363,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",363,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.spcfc_buffer_flush_cntr")=363
+	Set gtmtypes("shmpool_buff_hdr",364,"name")="shmpool_buff_hdr.shadow_file_header.spcfc_buffer_flush_loop_cntr"
+	Set gtmtypes("shmpool_buff_hdr",364,"off")=3680
 	Set gtmtypes("shmpool_buff_hdr",364,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",364,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.spcfc_buffer_flush_loop_cntr")=364
+	Set gtmtypes("shmpool_buff_hdr",365,"name")="shmpool_buff_hdr.shadow_file_header.spcfc_buffer_flush_retries_cntr"
+	Set gtmtypes("shmpool_buff_hdr",365,"off")=3684
 	Set gtmtypes("shmpool_buff_hdr",365,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",365,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.spcfc_buffer_flush_retries_cntr")=365
+	Set gtmtypes("shmpool_buff_hdr",366,"name")="shmpool_buff_hdr.shadow_file_header.spcfc_buffer_flushed_during_lockwait_cntr"
+	Set gtmtypes("shmpool_buff_hdr",366,"off")=3688
 	Set gtmtypes("shmpool_buff_hdr",366,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",366,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.spcfc_buffer_flushed_during_lockwait_cntr")=366
+	Set gtmtypes("shmpool_buff_hdr",367,"name")="shmpool_buff_hdr.shadow_file_header.tp_crit_retries_cntr"
+	Set gtmtypes("shmpool_buff_hdr",367,"off")=3692
 	Set gtmtypes("shmpool_buff_hdr",367,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",367,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.tp_crit_retries_cntr")=367
+	Set gtmtypes("shmpool_buff_hdr",368,"name")="shmpool_buff_hdr.shadow_file_header.db_csh_getn_flush_dirty_cntr"
+	Set gtmtypes("shmpool_buff_hdr",368,"off")=3696
 	Set gtmtypes("shmpool_buff_hdr",368,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",368,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.db_csh_getn_flush_dirty_cntr")=368
+	Set gtmtypes("shmpool_buff_hdr",369,"name")="shmpool_buff_hdr.shadow_file_header.db_csh_getn_rip_wait_cntr"
+	Set gtmtypes("shmpool_buff_hdr",369,"off")=3700
 	Set gtmtypes("shmpool_buff_hdr",369,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",369,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.db_csh_getn_rip_wait_cntr")=369
+	Set gtmtypes("shmpool_buff_hdr",370,"name")="shmpool_buff_hdr.shadow_file_header.db_csh_getn_buf_owner_stuck_cntr"
+	Set gtmtypes("shmpool_buff_hdr",370,"off")=3704
 	Set gtmtypes("shmpool_buff_hdr",370,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",370,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.db_csh_getn_buf_owner_stuck_cntr")=370
+	Set gtmtypes("shmpool_buff_hdr",371,"name")="shmpool_buff_hdr.shadow_file_header.db_csh_getn_out_of_design_cntr"
+	Set gtmtypes("shmpool_buff_hdr",371,"off")=3708
 	Set gtmtypes("shmpool_buff_hdr",371,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",371,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.db_csh_getn_out_of_design_cntr")=371
+	Set gtmtypes("shmpool_buff_hdr",372,"name")="shmpool_buff_hdr.shadow_file_header.t_qread_buf_owner_stuck_cntr"
+	Set gtmtypes("shmpool_buff_hdr",372,"off")=3712
 	Set gtmtypes("shmpool_buff_hdr",372,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",372,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.t_qread_buf_owner_stuck_cntr")=372
+	Set gtmtypes("shmpool_buff_hdr",373,"name")="shmpool_buff_hdr.shadow_file_header.t_qread_out_of_design_cntr"
+	Set gtmtypes("shmpool_buff_hdr",373,"off")=3716
 	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_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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.t_qread_out_of_design_cntr")=373
+	Set gtmtypes("shmpool_buff_hdr",374,"name")="shmpool_buff_hdr.shadow_file_header.bt_put_flush_dirty_cntr"
+	Set gtmtypes("shmpool_buff_hdr",374,"off")=3720
 	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_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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.bt_put_flush_dirty_cntr")=374
+	Set gtmtypes("shmpool_buff_hdr",375,"name")="shmpool_buff_hdr.shadow_file_header.mlock_wakeups_cntr"
+	Set gtmtypes("shmpool_buff_hdr",375,"off")=3724
 	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_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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.mlock_wakeups_cntr")=375
+	Set gtmtypes("shmpool_buff_hdr",376,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_wcs_recover_invoked_cntr"
+	Set gtmtypes("shmpool_buff_hdr",376,"off")=3728
 	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_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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_wcs_recover_invoked_cntr")=376
+	Set gtmtypes("shmpool_buff_hdr",377,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_wcs_verify_passed_cntr"
+	Set gtmtypes("shmpool_buff_hdr",377,"off")=3732
 	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_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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_wcs_verify_passed_cntr")=377
+	Set gtmtypes("shmpool_buff_hdr",378,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_t_qread_db_csh_getn_invalid_blk_cntr"
+	Set gtmtypes("shmpool_buff_hdr",378,"off")=3736
 	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_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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_t_qread_db_csh_getn_invalid_blk_cntr")=378
+	Set gtmtypes("shmpool_buff_hdr",379,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_t_qread_db_csh_get_invalid_blk_cntr"
+	Set gtmtypes("shmpool_buff_hdr",379,"off")=3740
 	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_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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_t_qread_db_csh_get_invalid_blk_cntr")=379
+	Set gtmtypes("shmpool_buff_hdr",380,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_db_csh_getn_loopexceed_cntr"
+	Set gtmtypes("shmpool_buff_hdr",380,"off")=3744
 	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_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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_db_csh_getn_loopexceed_cntr")=380
+	Set gtmtypes("shmpool_buff_hdr",381,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_db_csh_getn_wcsstarvewrt_cntr"
+	Set gtmtypes("shmpool_buff_hdr",381,"off")=3748
 	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_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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_db_csh_getn_wcsstarvewrt_cntr")=381
+	Set gtmtypes("shmpool_buff_hdr",382,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_db_csh_get_cntr"
+	Set gtmtypes("shmpool_buff_hdr",382,"off")=3752
 	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_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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_db_csh_get_cntr")=382
+	Set gtmtypes("shmpool_buff_hdr",383,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_tp_tend_wcsgetspace_cntr"
+	Set gtmtypes("shmpool_buff_hdr",383,"off")=3756
 	Set gtmtypes("shmpool_buff_hdr",383,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",383,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_tp_tend_wcsgetspace_cntr")=383
+	Set gtmtypes("shmpool_buff_hdr",384,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_tp_tend_t1_cntr"
+	Set gtmtypes("shmpool_buff_hdr",384,"off")=3760
 	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_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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_tp_tend_t1_cntr")=384
+	Set gtmtypes("shmpool_buff_hdr",385,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_tp_tend_bitmap_cntr"
+	Set gtmtypes("shmpool_buff_hdr",385,"off")=3764
 	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_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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_tp_tend_bitmap_cntr")=385
+	Set gtmtypes("shmpool_buff_hdr",386,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_tp_tend_jnl_cwset_cntr"
+	Set gtmtypes("shmpool_buff_hdr",386,"off")=3768
 	Set gtmtypes("shmpool_buff_hdr",386,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",386,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_tp_tend_jnl_cwset_cntr")=386
+	Set gtmtypes("shmpool_buff_hdr",387,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_tp_tend_jnl_wcsflu_cntr"
+	Set gtmtypes("shmpool_buff_hdr",387,"off")=3772
 	Set gtmtypes("shmpool_buff_hdr",387,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",387,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_tp_tend_jnl_wcsflu_cntr")=387
+	Set gtmtypes("shmpool_buff_hdr",388,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_t_end_hist_cntr"
+	Set gtmtypes("shmpool_buff_hdr",388,"off")=3776
 	Set gtmtypes("shmpool_buff_hdr",388,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",388,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_t_end_hist_cntr")=388
+	Set gtmtypes("shmpool_buff_hdr",389,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_t_end_hist1_nullbt_cntr"
+	Set gtmtypes("shmpool_buff_hdr",389,"off")=3780
 	Set gtmtypes("shmpool_buff_hdr",389,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",389,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_t_end_hist1_nullbt_cntr")=389
+	Set gtmtypes("shmpool_buff_hdr",390,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_t_end_hist1_nonnullbt_cntr"
+	Set gtmtypes("shmpool_buff_hdr",390,"off")=3784
 	Set gtmtypes("shmpool_buff_hdr",390,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",390,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_t_end_hist1_nonnullbt_cntr")=390
+	Set gtmtypes("shmpool_buff_hdr",391,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_t_end_bitmap_nullbt_cntr"
+	Set gtmtypes("shmpool_buff_hdr",391,"off")=3788
 	Set gtmtypes("shmpool_buff_hdr",391,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",391,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_t_end_bitmap_nullbt_cntr")=391
+	Set gtmtypes("shmpool_buff_hdr",392,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_t_end_bitmap_nonnullbt_cntr"
+	Set gtmtypes("shmpool_buff_hdr",392,"off")=3792
 	Set gtmtypes("shmpool_buff_hdr",392,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",392,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_t_end_bitmap_nonnullbt_cntr")=392
+	Set gtmtypes("shmpool_buff_hdr",393,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_t_end_jnl_cwset_cntr"
+	Set gtmtypes("shmpool_buff_hdr",393,"off")=3796
 	Set gtmtypes("shmpool_buff_hdr",393,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",393,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_t_end_jnl_cwset_cntr")=393
+	Set gtmtypes("shmpool_buff_hdr",394,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_t_end_jnl_wcsflu_cntr"
+	Set gtmtypes("shmpool_buff_hdr",394,"off")=3800
 	Set gtmtypes("shmpool_buff_hdr",394,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",394,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_t_end_jnl_wcsflu_cntr")=394
+	Set gtmtypes("shmpool_buff_hdr",395,"name")="shmpool_buff_hdr.shadow_file_header.db_csh_get_too_many_loops_cntr"
+	Set gtmtypes("shmpool_buff_hdr",395,"off")=3804
 	Set gtmtypes("shmpool_buff_hdr",395,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",395,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.db_csh_get_too_many_loops_cntr")=395
+	Set gtmtypes("shmpool_buff_hdr",396,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_tpckh_hist1_nullbt_cntr"
+	Set gtmtypes("shmpool_buff_hdr",396,"off")=3808
 	Set gtmtypes("shmpool_buff_hdr",396,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",396,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_tpckh_hist1_nullbt_cntr")=396
+	Set gtmtypes("shmpool_buff_hdr",397,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_tpckh_hist1_nonnullbt_cntr"
+	Set gtmtypes("shmpool_buff_hdr",397,"off")=3812
 	Set gtmtypes("shmpool_buff_hdr",397,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",397,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_tpckh_hist1_nonnullbt_cntr")=397
+	Set gtmtypes("shmpool_buff_hdr",398,"name")="shmpool_buff_hdr.shadow_file_header.jnl_blocked_writer_lost_cntr"
+	Set gtmtypes("shmpool_buff_hdr",398,"off")=3816
 	Set gtmtypes("shmpool_buff_hdr",398,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",398,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.jnl_blocked_writer_lost_cntr")=398
+	Set gtmtypes("shmpool_buff_hdr",399,"name")="shmpool_buff_hdr.shadow_file_header.jnl_blocked_writer_stuck_cntr"
+	Set gtmtypes("shmpool_buff_hdr",399,"off")=3820
 	Set gtmtypes("shmpool_buff_hdr",399,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",399,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.jnl_blocked_writer_stuck_cntr")=399
+	Set gtmtypes("shmpool_buff_hdr",400,"name")="shmpool_buff_hdr.shadow_file_header.jnl_blocked_writer_blocked_cntr"
+	Set gtmtypes("shmpool_buff_hdr",400,"off")=3824
 	Set gtmtypes("shmpool_buff_hdr",400,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",400,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.jnl_blocked_writer_blocked_cntr")=400
+	Set gtmtypes("shmpool_buff_hdr",401,"name")="shmpool_buff_hdr.shadow_file_header.n_jnl_fsyncs_cntr"
+	Set gtmtypes("shmpool_buff_hdr",401,"off")=3828
 	Set gtmtypes("shmpool_buff_hdr",401,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",401,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_jnl_fsyncs_cntr")=401
+	Set gtmtypes("shmpool_buff_hdr",402,"name")="shmpool_buff_hdr.shadow_file_header.n_jnl_fsync_tries_cntr"
+	Set gtmtypes("shmpool_buff_hdr",402,"off")=3832
 	Set gtmtypes("shmpool_buff_hdr",402,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",402,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_jnl_fsync_tries_cntr")=402
+	Set gtmtypes("shmpool_buff_hdr",403,"name")="shmpool_buff_hdr.shadow_file_header.n_jnl_fsync_recovers_cntr"
+	Set gtmtypes("shmpool_buff_hdr",403,"off")=3836
 	Set gtmtypes("shmpool_buff_hdr",403,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",403,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_jnl_fsync_recovers_cntr")=403
+	Set gtmtypes("shmpool_buff_hdr",404,"name")="shmpool_buff_hdr.shadow_file_header.n_db_fsyncs_cntr"
+	Set gtmtypes("shmpool_buff_hdr",404,"off")=3840
 	Set gtmtypes("shmpool_buff_hdr",404,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",404,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_db_fsyncs_cntr")=404
+	Set gtmtypes("shmpool_buff_hdr",405,"name")="shmpool_buff_hdr.shadow_file_header.n_db_fsyncs_in_crit_cntr"
+	Set gtmtypes("shmpool_buff_hdr",405,"off")=3844
 	Set gtmtypes("shmpool_buff_hdr",405,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",405,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_db_fsyncs_in_crit_cntr")=405
+	Set gtmtypes("shmpool_buff_hdr",406,"name")="shmpool_buff_hdr.shadow_file_header.n_dbsync_timers_cntr"
+	Set gtmtypes("shmpool_buff_hdr",406,"off")=3848
 	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_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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_dbsync_timers_cntr")=406
+	Set gtmtypes("shmpool_buff_hdr",407,"name")="shmpool_buff_hdr.shadow_file_header.n_dbsync_writes_cntr"
+	Set gtmtypes("shmpool_buff_hdr",407,"off")=3852
 	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_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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_dbsync_writes_cntr")=407
+	Set gtmtypes("shmpool_buff_hdr",408,"name")="shmpool_buff_hdr.shadow_file_header.mutex_queue_full_cntr"
+	Set gtmtypes("shmpool_buff_hdr",408,"off")=3856
 	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_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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.mutex_queue_full_cntr")=408
+	Set gtmtypes("shmpool_buff_hdr",409,"name")="shmpool_buff_hdr.shadow_file_header.wcb_bt_put_cntr"
+	Set gtmtypes("shmpool_buff_hdr",409,"off")=3860
 	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_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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_bt_put_cntr")=409
+	Set gtmtypes("shmpool_buff_hdr",410,"name")="shmpool_buff_hdr.shadow_file_header.wcb_mutex_salvage_cntr"
+	Set gtmtypes("shmpool_buff_hdr",410,"off")=3864
 	Set gtmtypes("shmpool_buff_hdr",410,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",410,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_mutex_salvage_cntr")=410
+	Set gtmtypes("shmpool_buff_hdr",411,"name")="shmpool_buff_hdr.shadow_file_header.wcb_wcs_flu0_cntr"
+	Set gtmtypes("shmpool_buff_hdr",411,"off")=3868
 	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_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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_wcs_flu0_cntr")=411
+	Set gtmtypes("shmpool_buff_hdr",412,"name")="shmpool_buff_hdr.shadow_file_header.wcb_t_end_sysops_nocr_invcr_cntr"
+	Set gtmtypes("shmpool_buff_hdr",412,"off")=3872
 	Set gtmtypes("shmpool_buff_hdr",412,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",412,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_t_end_sysops_nocr_invcr_cntr")=412
+	Set gtmtypes("shmpool_buff_hdr",413,"name")="shmpool_buff_hdr.shadow_file_header.wcb_t_end_sysops_cr_invcr_cntr"
+	Set gtmtypes("shmpool_buff_hdr",413,"off")=3876
 	Set gtmtypes("shmpool_buff_hdr",413,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",413,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_t_end_sysops_cr_invcr_cntr")=413
+	Set gtmtypes("shmpool_buff_hdr",414,"name")="shmpool_buff_hdr.shadow_file_header.wcb_t_end_sysops_rip_wait_cntr"
+	Set gtmtypes("shmpool_buff_hdr",414,"off")=3880
 	Set gtmtypes("shmpool_buff_hdr",414,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",414,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_t_end_sysops_rip_wait_cntr")=414
+	Set gtmtypes("shmpool_buff_hdr",415,"name")="shmpool_buff_hdr.shadow_file_header.wcb_t_end_sysops_dirtyripwait_cntr"
+	Set gtmtypes("shmpool_buff_hdr",415,"off")=3884
 	Set gtmtypes("shmpool_buff_hdr",415,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",415,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_t_end_sysops_dirtyripwait_cntr")=415
+	Set gtmtypes("shmpool_buff_hdr",416,"name")="shmpool_buff_hdr.shadow_file_header.wcb_gds_rundown1_cntr"
+	Set gtmtypes("shmpool_buff_hdr",416,"off")=3888
 	Set gtmtypes("shmpool_buff_hdr",416,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",416,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_gds_rundown1_cntr")=416
+	Set gtmtypes("shmpool_buff_hdr",417,"name")="shmpool_buff_hdr.shadow_file_header.wcb_wcs_flu1_cntr"
+	Set gtmtypes("shmpool_buff_hdr",417,"off")=3892
 	Set gtmtypes("shmpool_buff_hdr",417,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",417,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_wcs_flu1_cntr")=417
+	Set gtmtypes("shmpool_buff_hdr",418,"name")="shmpool_buff_hdr.shadow_file_header.wcb_mu_back_cntr"
+	Set gtmtypes("shmpool_buff_hdr",418,"off")=3896
 	Set gtmtypes("shmpool_buff_hdr",418,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",418,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_mu_back_cntr")=418
+	Set gtmtypes("shmpool_buff_hdr",419,"name")="shmpool_buff_hdr.shadow_file_header.wcb_t_end_sysops_dirty_invcr_cntr"
+	Set gtmtypes("shmpool_buff_hdr",419,"off")=3900
 	Set gtmtypes("shmpool_buff_hdr",419,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",419,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_t_end_sysops_dirty_invcr_cntr")=419
+	Set gtmtypes("shmpool_buff_hdr",420,"name")="shmpool_buff_hdr.shadow_file_header.wcb_t_end_sysops_wtfini_fail_cntr"
+	Set gtmtypes("shmpool_buff_hdr",420,"off")=3904
 	Set gtmtypes("shmpool_buff_hdr",420,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",420,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_t_end_sysops_wtfini_fail_cntr")=420
+	Set gtmtypes("shmpool_buff_hdr",421,"name")="shmpool_buff_hdr.shadow_file_header.wcb_t_end_sysops_twin_stuck_cntr"
+	Set gtmtypes("shmpool_buff_hdr",421,"off")=3908
 	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_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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_t_end_sysops_twin_stuck_cntr")=421
+	Set gtmtypes("shmpool_buff_hdr",422,"name")="shmpool_buff_hdr.shadow_file_header.db_csh_getn_wrt_latch_stuck_cntr"
+	Set gtmtypes("shmpool_buff_hdr",422,"off")=3912
 	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_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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.db_csh_getn_wrt_latch_stuck_cntr")=422
+	Set gtmtypes("shmpool_buff_hdr",423,"name")="shmpool_buff_hdr.shadow_file_header.wcb_secshr_db_clnup_now_crit_cntr"
+	Set gtmtypes("shmpool_buff_hdr",423,"off")=3916
 	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_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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_secshr_db_clnup_now_crit_cntr")=423
+	Set gtmtypes("shmpool_buff_hdr",424,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_t_qread_bad_bt_index1_cntr"
+	Set gtmtypes("shmpool_buff_hdr",424,"off")=3920
 	Set gtmtypes("shmpool_buff_hdr",424,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",424,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_t_qread_bad_bt_index1_cntr")=424
+	Set gtmtypes("shmpool_buff_hdr",425,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_t_qread_bad_bt_index2_cntr"
+	Set gtmtypes("shmpool_buff_hdr",425,"off")=3924
 	Set gtmtypes("shmpool_buff_hdr",425,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",425,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_t_qread_bad_bt_index2_cntr")=425
+	Set gtmtypes("shmpool_buff_hdr",426,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_t_end_crbtmismatch1_cntr"
+	Set gtmtypes("shmpool_buff_hdr",426,"off")=3928
 	Set gtmtypes("shmpool_buff_hdr",426,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",426,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_t_end_crbtmismatch1_cntr")=426
+	Set gtmtypes("shmpool_buff_hdr",427,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_t_end_crbtmismatch2_cntr"
+	Set gtmtypes("shmpool_buff_hdr",427,"off")=3932
 	Set gtmtypes("shmpool_buff_hdr",427,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",427,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_t_end_crbtmismatch2_cntr")=427
+	Set gtmtypes("shmpool_buff_hdr",428,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_t_end_crbtmismatch3_cntr"
+	Set gtmtypes("shmpool_buff_hdr",428,"off")=3936
 	Set gtmtypes("shmpool_buff_hdr",428,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",428,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_t_end_crbtmismatch3_cntr")=428
+	Set gtmtypes("shmpool_buff_hdr",429,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_tp_tend_crbtmismatch1_cntr"
+	Set gtmtypes("shmpool_buff_hdr",429,"off")=3940
 	Set gtmtypes("shmpool_buff_hdr",429,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",429,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_tp_tend_crbtmismatch1_cntr")=429
+	Set gtmtypes("shmpool_buff_hdr",430,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_tp_tend_crbtmismatch2_cntr"
+	Set gtmtypes("shmpool_buff_hdr",430,"off")=3944
 	Set gtmtypes("shmpool_buff_hdr",430,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",430,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_tp_tend_crbtmismatch2_cntr")=430
+	Set gtmtypes("shmpool_buff_hdr",431,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_tp_tend_crbtmismatch3_cntr"
+	Set gtmtypes("shmpool_buff_hdr",431,"off")=3948
 	Set gtmtypes("shmpool_buff_hdr",431,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",431,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_tp_tend_crbtmismatch3_cntr")=431
+	Set gtmtypes("shmpool_buff_hdr",432,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_wcs_wtstart_bad_cr_cntr"
+	Set gtmtypes("shmpool_buff_hdr",432,"off")=3952
 	Set gtmtypes("shmpool_buff_hdr",432,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",432,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_wcs_wtstart_bad_cr_cntr")=432
+	Set gtmtypes("shmpool_buff_hdr",433,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_wcs_wtfini_bad_cr_cntr"
+	Set gtmtypes("shmpool_buff_hdr",433,"off")=3956
 	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_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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_wcs_wtfini_bad_cr_cntr")=433
+	Set gtmtypes("shmpool_buff_hdr",434,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_bt_get_cntr"
+	Set gtmtypes("shmpool_buff_hdr",434,"off")=3960
 	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_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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_bt_get_cntr")=434
+	Set gtmtypes("shmpool_buff_hdr",435,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_wcs_cdb_sc_final_retry_cntr"
+	Set gtmtypes("shmpool_buff_hdr",435,"off")=3964
 	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_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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_wcs_cdb_sc_final_retry_cntr")=435
+	Set gtmtypes("shmpool_buff_hdr",436,"name")="shmpool_buff_hdr.shadow_file_header.wcb_bg_update_lckfail1_cntr"
+	Set gtmtypes("shmpool_buff_hdr",436,"off")=3968
 	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_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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_bg_update_lckfail1_cntr")=436
+	Set gtmtypes("shmpool_buff_hdr",437,"name")="shmpool_buff_hdr.shadow_file_header.wcb_bg_update_lckfail2_cntr"
+	Set gtmtypes("shmpool_buff_hdr",437,"off")=3972
 	Set gtmtypes("shmpool_buff_hdr",437,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",437,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_bg_update_lckfail2_cntr")=437
+	Set gtmtypes("shmpool_buff_hdr",438,"name")="shmpool_buff_hdr.shadow_file_header.wcb_wtstart_lckfail1_cntr"
+	Set gtmtypes("shmpool_buff_hdr",438,"off")=3976
 	Set gtmtypes("shmpool_buff_hdr",438,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",438,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_wtstart_lckfail1_cntr")=438
+	Set gtmtypes("shmpool_buff_hdr",439,"name")="shmpool_buff_hdr.shadow_file_header.wcb_wtstart_lckfail2_cntr"
+	Set gtmtypes("shmpool_buff_hdr",439,"off")=3980
 	Set gtmtypes("shmpool_buff_hdr",439,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",439,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_wtstart_lckfail2_cntr")=439
+	Set gtmtypes("shmpool_buff_hdr",440,"name")="shmpool_buff_hdr.shadow_file_header.wcb_wtstart_lckfail3_cntr"
+	Set gtmtypes("shmpool_buff_hdr",440,"off")=3984
 	Set gtmtypes("shmpool_buff_hdr",440,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",440,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_wtstart_lckfail3_cntr")=440
+	Set gtmtypes("shmpool_buff_hdr",441,"name")="shmpool_buff_hdr.shadow_file_header.wcb_wtstart_lckfail4_cntr"
+	Set gtmtypes("shmpool_buff_hdr",441,"off")=3988
 	Set gtmtypes("shmpool_buff_hdr",441,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",441,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_wtstart_lckfail4_cntr")=441
+	Set gtmtypes("shmpool_buff_hdr",442,"name")="shmpool_buff_hdr.shadow_file_header.wcb_wtfini_lckfail1_cntr"
+	Set gtmtypes("shmpool_buff_hdr",442,"off")=3992
 	Set gtmtypes("shmpool_buff_hdr",442,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",442,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_wtfini_lckfail1_cntr")=442
+	Set gtmtypes("shmpool_buff_hdr",443,"name")="shmpool_buff_hdr.shadow_file_header.wcb_wtfini_lckfail2_cntr"
+	Set gtmtypes("shmpool_buff_hdr",443,"off")=3996
 	Set gtmtypes("shmpool_buff_hdr",443,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",443,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_wtfini_lckfail2_cntr")=443
+	Set gtmtypes("shmpool_buff_hdr",444,"name")="shmpool_buff_hdr.shadow_file_header.wcb_wtfini_lckfail3_cntr"
+	Set gtmtypes("shmpool_buff_hdr",444,"off")=4000
 	Set gtmtypes("shmpool_buff_hdr",444,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",444,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_wtfini_lckfail3_cntr")=444
+	Set gtmtypes("shmpool_buff_hdr",445,"name")="shmpool_buff_hdr.shadow_file_header.wcb_wtfini_lckfail4_cntr"
+	Set gtmtypes("shmpool_buff_hdr",445,"off")=4004
 	Set gtmtypes("shmpool_buff_hdr",445,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",445,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_wtfini_lckfail4_cntr")=445
+	Set gtmtypes("shmpool_buff_hdr",446,"name")="shmpool_buff_hdr.shadow_file_header.wcb_t_end_sysops_dirtystuck1_cntr"
+	Set gtmtypes("shmpool_buff_hdr",446,"off")=4008
 	Set gtmtypes("shmpool_buff_hdr",446,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",446,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_t_end_sysops_dirtystuck1_cntr")=446
+	Set gtmtypes("shmpool_buff_hdr",447,"name")="shmpool_buff_hdr.shadow_file_header.wcb_t_end_sysops_dirtystuck2_cntr"
+	Set gtmtypes("shmpool_buff_hdr",447,"off")=4012
 	Set gtmtypes("shmpool_buff_hdr",447,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",447,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_t_end_sysops_dirtystuck2_cntr")=447
+	Set gtmtypes("shmpool_buff_hdr",448,"name")="shmpool_buff_hdr.shadow_file_header.wcb_secshr_db_clnup_wbuf_dqd_cntr"
+	Set gtmtypes("shmpool_buff_hdr",448,"off")=4016
 	Set gtmtypes("shmpool_buff_hdr",448,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",448,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_secshr_db_clnup_wbuf_dqd_cntr")=448
+	Set gtmtypes("shmpool_buff_hdr",449,"name")="shmpool_buff_hdr.shadow_file_header.dwngrd_refmts_syncio_cntr"
+	Set gtmtypes("shmpool_buff_hdr",449,"off")=4020
 	Set gtmtypes("shmpool_buff_hdr",449,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",449,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.dwngrd_refmts_syncio_cntr")=449
+	Set gtmtypes("shmpool_buff_hdr",450,"name")="shmpool_buff_hdr.shadow_file_header.dwngrd_refmts_asyncio_cntr"
+	Set gtmtypes("shmpool_buff_hdr",450,"off")=4024
 	Set gtmtypes("shmpool_buff_hdr",450,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",450,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.dwngrd_refmts_asyncio_cntr")=450
+	Set gtmtypes("shmpool_buff_hdr",451,"name")="shmpool_buff_hdr.shadow_file_header.shmpool_refmt_harvests_cntr"
+	Set gtmtypes("shmpool_buff_hdr",451,"off")=4028
 	Set gtmtypes("shmpool_buff_hdr",451,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",451,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.shmpool_refmt_harvests_cntr")=451
+	Set gtmtypes("shmpool_buff_hdr",452,"name")="shmpool_buff_hdr.shadow_file_header.shmpool_recovery_cntr"
+	Set gtmtypes("shmpool_buff_hdr",452,"off")=4032
 	Set gtmtypes("shmpool_buff_hdr",452,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",452,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.shmpool_recovery_cntr")=452
+	Set gtmtypes("shmpool_buff_hdr",453,"name")="shmpool_buff_hdr.shadow_file_header.shmpool_blkd_by_sdc_cntr"
+	Set gtmtypes("shmpool_buff_hdr",453,"off")=4036
 	Set gtmtypes("shmpool_buff_hdr",453,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",453,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.shmpool_blkd_by_sdc_cntr")=453
+	Set gtmtypes("shmpool_buff_hdr",454,"name")="shmpool_buff_hdr.shadow_file_header.shmpool_alloc_bbflush_cntr"
+	Set gtmtypes("shmpool_buff_hdr",454,"off")=4040
 	Set gtmtypes("shmpool_buff_hdr",454,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",454,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.shmpool_alloc_bbflush_cntr")=454
+	Set gtmtypes("shmpool_buff_hdr",455,"name")="shmpool_buff_hdr.shadow_file_header.refmt_hvst_blk_released_replaced_cntr"
+	Set gtmtypes("shmpool_buff_hdr",455,"off")=4044
 	Set gtmtypes("shmpool_buff_hdr",455,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",455,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.refmt_hvst_blk_released_replaced_cntr")=455
+	Set gtmtypes("shmpool_buff_hdr",456,"name")="shmpool_buff_hdr.shadow_file_header.refmt_hvst_blk_released_io_complete_cntr"
+	Set gtmtypes("shmpool_buff_hdr",456,"off")=4048
 	Set gtmtypes("shmpool_buff_hdr",456,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",456,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.refmt_hvst_blk_released_io_complete_cntr")=456
+	Set gtmtypes("shmpool_buff_hdr",457,"name")="shmpool_buff_hdr.shadow_file_header.refmt_hvst_blk_kept_cntr"
+	Set gtmtypes("shmpool_buff_hdr",457,"off")=4052
 	Set gtmtypes("shmpool_buff_hdr",457,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",457,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.refmt_hvst_blk_kept_cntr")=457
+	Set gtmtypes("shmpool_buff_hdr",458,"name")="shmpool_buff_hdr.shadow_file_header.refmt_hvst_blk_ignored_cntr"
+	Set gtmtypes("shmpool_buff_hdr",458,"off")=4056
 	Set gtmtypes("shmpool_buff_hdr",458,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",458,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.refmt_hvst_blk_ignored_cntr")=458
+	Set gtmtypes("shmpool_buff_hdr",459,"name")="shmpool_buff_hdr.shadow_file_header.refmt_blk_chk_blk_freed_cntr"
+	Set gtmtypes("shmpool_buff_hdr",459,"off")=4060
 	Set gtmtypes("shmpool_buff_hdr",459,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",459,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.refmt_blk_chk_blk_freed_cntr")=459
+	Set gtmtypes("shmpool_buff_hdr",460,"name")="shmpool_buff_hdr.shadow_file_header.refmt_blk_chk_blk_kept_cntr"
+	Set gtmtypes("shmpool_buff_hdr",460,"off")=4064
 	Set gtmtypes("shmpool_buff_hdr",460,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",460,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.refmt_blk_chk_blk_kept_cntr")=460
+	Set gtmtypes("shmpool_buff_hdr",461,"name")="shmpool_buff_hdr.shadow_file_header.active_lvl_trigger_cntr"
+	Set gtmtypes("shmpool_buff_hdr",461,"off")=4068
 	Set gtmtypes("shmpool_buff_hdr",461,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",461,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.active_lvl_trigger_cntr")=461
+	Set gtmtypes("shmpool_buff_hdr",462,"name")="shmpool_buff_hdr.shadow_file_header.new_buff_cntr"
+	Set gtmtypes("shmpool_buff_hdr",462,"off")=4072
 	Set gtmtypes("shmpool_buff_hdr",462,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",462,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.new_buff_cntr")=462
+	Set gtmtypes("shmpool_buff_hdr",463,"name")="shmpool_buff_hdr.shadow_file_header.phase2_commit_wait_sleep_in_crit_cntr"
+	Set gtmtypes("shmpool_buff_hdr",463,"off")=4076
 	Set gtmtypes("shmpool_buff_hdr",463,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",463,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.phase2_commit_wait_sleep_in_crit_cntr")=463
+	Set gtmtypes("shmpool_buff_hdr",464,"name")="shmpool_buff_hdr.shadow_file_header.phase2_commit_wait_sleep_no_crit_cntr"
+	Set gtmtypes("shmpool_buff_hdr",464,"off")=4080
 	Set gtmtypes("shmpool_buff_hdr",464,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",464,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.phase2_commit_wait_sleep_no_crit_cntr")=464
+	Set gtmtypes("shmpool_buff_hdr",465,"name")="shmpool_buff_hdr.shadow_file_header.phase2_commit_wait_pidcnt_cntr"
+	Set gtmtypes("shmpool_buff_hdr",465,"off")=4084
 	Set gtmtypes("shmpool_buff_hdr",465,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",465,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.phase2_commit_wait_pidcnt_cntr")=465
+	Set gtmtypes("shmpool_buff_hdr",466,"name")="shmpool_buff_hdr.shadow_file_header.wcb_t_end_sysops_intend_wait_cntr"
+	Set gtmtypes("shmpool_buff_hdr",466,"off")=4088
 	Set gtmtypes("shmpool_buff_hdr",466,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",466,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_t_end_sysops_intend_wait_cntr")=466
+	Set gtmtypes("shmpool_buff_hdr",467,"name")="shmpool_buff_hdr.shadow_file_header.wcb_secshr_db_clnup_phase2_clnup_cntr"
+	Set gtmtypes("shmpool_buff_hdr",467,"off")=4092
 	Set gtmtypes("shmpool_buff_hdr",467,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",467,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_secshr_db_clnup_phase2_clnup_cntr")=467
+	Set gtmtypes("shmpool_buff_hdr",468,"name")="shmpool_buff_hdr.shadow_file_header.wcb_phase2_commit_wait_cntr"
+	Set gtmtypes("shmpool_buff_hdr",468,"off")=4096
 	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_phase2_commit_wait_cntr")=468
+	Set gtmtypes("shmpool_buff_hdr",469,"name")="shmpool_buff_hdr.shadow_file_header.recompute_upd_array_calls_cntr"
+	Set gtmtypes("shmpool_buff_hdr",469,"off")=4100
 	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.recompute_upd_array_calls_cntr")=469
+	Set gtmtypes("shmpool_buff_hdr",470,"name")="shmpool_buff_hdr.shadow_file_header.recompute_upd_array_rip_cntr"
+	Set gtmtypes("shmpool_buff_hdr",470,"off")=4104
 	Set gtmtypes("shmpool_buff_hdr",470,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",470,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.recompute_upd_array_rip_cntr")=470
+	Set gtmtypes("shmpool_buff_hdr",471,"name")="shmpool_buff_hdr.shadow_file_header.recompute_upd_array_in_tend_cntr"
+	Set gtmtypes("shmpool_buff_hdr",471,"off")=4108
 	Set gtmtypes("shmpool_buff_hdr",471,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",471,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.recompute_upd_array_in_tend_cntr")=471
+	Set gtmtypes("shmpool_buff_hdr",472,"name")="shmpool_buff_hdr.shadow_file_header.recompute_upd_array_search_blk_cntr"
+	Set gtmtypes("shmpool_buff_hdr",472,"off")=4112
 	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.recompute_upd_array_search_blk_cntr")=472
+	Set gtmtypes("shmpool_buff_hdr",473,"name")="shmpool_buff_hdr.shadow_file_header.recompute_upd_array_new_rec_cntr"
+	Set gtmtypes("shmpool_buff_hdr",473,"off")=4116
 	Set gtmtypes("shmpool_buff_hdr",473,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",473,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.recompute_upd_array_new_rec_cntr")=473
+	Set gtmtypes("shmpool_buff_hdr",474,"name")="shmpool_buff_hdr.shadow_file_header.recompute_upd_array_rec_size_cntr"
+	Set gtmtypes("shmpool_buff_hdr",474,"off")=4120
 	Set gtmtypes("shmpool_buff_hdr",474,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",474,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.recompute_upd_array_rec_size_cntr")=474
+	Set gtmtypes("shmpool_buff_hdr",475,"name")="shmpool_buff_hdr.shadow_file_header.recompute_upd_array_rec_cmpc_cntr"
+	Set gtmtypes("shmpool_buff_hdr",475,"off")=4124
 	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.recompute_upd_array_rec_cmpc_cntr")=475
+	Set gtmtypes("shmpool_buff_hdr",476,"name")="shmpool_buff_hdr.shadow_file_header.recompute_upd_array_blk_fini_cntr"
+	Set gtmtypes("shmpool_buff_hdr",476,"off")=4128
 	Set gtmtypes("shmpool_buff_hdr",476,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",476,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.recompute_upd_array_blk_fini_cntr")=476
+	Set gtmtypes("shmpool_buff_hdr",477,"name")="shmpool_buff_hdr.shadow_file_header.recompute_upd_array_blk_split_cntr"
+	Set gtmtypes("shmpool_buff_hdr",477,"off")=4132
 	Set gtmtypes("shmpool_buff_hdr",477,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",477,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.recompute_upd_array_blk_split_cntr")=477
+	Set gtmtypes("shmpool_buff_hdr",478,"name")="shmpool_buff_hdr.shadow_file_header.t_qread_ripsleep_cnt_cntr"
+	Set gtmtypes("shmpool_buff_hdr",478,"off")=4136
 	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.t_qread_ripsleep_cnt_cntr")=478
+	Set gtmtypes("shmpool_buff_hdr",479,"name")="shmpool_buff_hdr.shadow_file_header.t_qread_ripsleep_nblks_cntr"
+	Set gtmtypes("shmpool_buff_hdr",479,"off")=4140
 	Set gtmtypes("shmpool_buff_hdr",479,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",479,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.t_qread_ripsleep_nblks_cntr")=479
+	Set gtmtypes("shmpool_buff_hdr",480,"name")="shmpool_buff_hdr.shadow_file_header.wcs_wtfini_invoked_cntr"
+	Set gtmtypes("shmpool_buff_hdr",480,"off")=4144
 	Set gtmtypes("shmpool_buff_hdr",480,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",480,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcs_wtfini_invoked_cntr")=480
+	Set gtmtypes("shmpool_buff_hdr",481,"name")="shmpool_buff_hdr.shadow_file_header.wcs_wterror_invoked_cntr"
+	Set gtmtypes("shmpool_buff_hdr",481,"off")=4148
 	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcs_wterror_invoked_cntr")=481
+	Set gtmtypes("shmpool_buff_hdr",482,"name")="shmpool_buff_hdr.shadow_file_header.wcs_wt_restart_invoked_cntr"
+	Set gtmtypes("shmpool_buff_hdr",482,"off")=4152
 	Set gtmtypes("shmpool_buff_hdr",482,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",482,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcs_wt_restart_invoked_cntr")=482
+	Set gtmtypes("shmpool_buff_hdr",483,"name")="shmpool_buff_hdr.shadow_file_header.wcs_wt_restart_eagain_cntr"
+	Set gtmtypes("shmpool_buff_hdr",483,"off")=4156
 	Set gtmtypes("shmpool_buff_hdr",483,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",483,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcs_wt_restart_eagain_cntr")=483
+	Set gtmtypes("shmpool_buff_hdr",484,"name")="shmpool_buff_hdr.shadow_file_header.wcs_wt_restart_reinsert_cntr"
+	Set gtmtypes("shmpool_buff_hdr",484,"off")=4160
 	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcs_wt_restart_reinsert_cntr")=484
+	Set gtmtypes("shmpool_buff_hdr",485,"name")="shmpool_buff_hdr.shadow_file_header.wcs_wtstart_eagain_cntr"
+	Set gtmtypes("shmpool_buff_hdr",485,"off")=4164
+	Set gtmtypes("shmpool_buff_hdr",485,"len")=4
+	Set gtmtypes("shmpool_buff_hdr",485,"type")="int"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcs_wtstart_eagain_cntr")=485
+	Set gtmtypes("shmpool_buff_hdr",486,"name")="shmpool_buff_hdr.shadow_file_header.wcs_wtstart_eagain_incrit_cntr"
+	Set gtmtypes("shmpool_buff_hdr",486,"off")=4168
+	Set gtmtypes("shmpool_buff_hdr",486,"len")=4
+	Set gtmtypes("shmpool_buff_hdr",486,"type")="int"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcs_wtstart_eagain_incrit_cntr")=486
+	Set gtmtypes("shmpool_buff_hdr",487,"name")="shmpool_buff_hdr.shadow_file_header.async_restart_eagain_cntr"
+	Set gtmtypes("shmpool_buff_hdr",487,"off")=4172
 	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.async_restart_eagain_cntr")=487
+	Set gtmtypes("shmpool_buff_hdr",488,"name")="shmpool_buff_hdr.shadow_file_header.jnlbuff_phs2cmt_array_full_cntr"
+	Set gtmtypes("shmpool_buff_hdr",488,"off")=4176
 	Set gtmtypes("shmpool_buff_hdr",488,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",488,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.jnlbuff_phs2cmt_array_full_cntr")=488
+	Set gtmtypes("shmpool_buff_hdr",489,"name")="shmpool_buff_hdr.shadow_file_header.jnl_phase2_cleanup_if_possible_cntr"
+	Set gtmtypes("shmpool_buff_hdr",489,"off")=4180
+	Set gtmtypes("shmpool_buff_hdr",489,"len")=4
+	Set gtmtypes("shmpool_buff_hdr",489,"type")="int"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.jnl_phase2_cleanup_if_possible_cntr")=489
+	Set gtmtypes("shmpool_buff_hdr",490,"name")="shmpool_buff_hdr.shadow_file_header.jnlbuff_phs2cmt_isprcalv_cntr"
+	Set gtmtypes("shmpool_buff_hdr",490,"off")=4184
 	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_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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.jnlbuff_phs2cmt_isprcalv_cntr")=490
+	Set gtmtypes("shmpool_buff_hdr",491,"name")="shmpool_buff_hdr.shadow_file_header.bg_trc_rec_cntr_filler"
+	Set gtmtypes("shmpool_buff_hdr",491,"off")=4188
+	Set gtmtypes("shmpool_buff_hdr",491,"len")=12
+	Set gtmtypes("shmpool_buff_hdr",491,"type")="char"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.bg_trc_rec_cntr_filler")=491
+	Set gtmtypes("shmpool_buff_hdr",492,"name")="shmpool_buff_hdr.shadow_file_header.n_gvcst_srches"
+	Set gtmtypes("shmpool_buff_hdr",492,"off")=4200
 	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_gvcst_srches")=492
+	Set gtmtypes("shmpool_buff_hdr",493,"name")="shmpool_buff_hdr.shadow_file_header.n_gvcst_srches.curr_count"
+	Set gtmtypes("shmpool_buff_hdr",493,"off")=4200
 	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_gvcst_srches.curr_count")=493
+	Set gtmtypes("shmpool_buff_hdr",494,"name")="shmpool_buff_hdr.shadow_file_header.n_gvcst_srches.cumul_count"
+	Set gtmtypes("shmpool_buff_hdr",494,"off")=4204
 	Set gtmtypes("shmpool_buff_hdr",494,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",494,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_gvcst_srches.cumul_count")=494
+	Set gtmtypes("shmpool_buff_hdr",495,"name")="shmpool_buff_hdr.shadow_file_header.n_gvcst_srch_clues"
+	Set gtmtypes("shmpool_buff_hdr",495,"off")=4208
 	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_gvcst_srch_clues")=495
+	Set gtmtypes("shmpool_buff_hdr",496,"name")="shmpool_buff_hdr.shadow_file_header.n_gvcst_srch_clues.curr_count"
+	Set gtmtypes("shmpool_buff_hdr",496,"off")=4208
 	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_gvcst_srch_clues.curr_count")=496
+	Set gtmtypes("shmpool_buff_hdr",497,"name")="shmpool_buff_hdr.shadow_file_header.n_gvcst_srch_clues.cumul_count"
+	Set gtmtypes("shmpool_buff_hdr",497,"off")=4212
 	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_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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_gvcst_srch_clues.cumul_count")=497
+	Set gtmtypes("shmpool_buff_hdr",498,"name")="shmpool_buff_hdr.shadow_file_header.n_clue_used_head"
+	Set gtmtypes("shmpool_buff_hdr",498,"off")=4216
 	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_clue_used_head")=498
+	Set gtmtypes("shmpool_buff_hdr",499,"name")="shmpool_buff_hdr.shadow_file_header.n_clue_used_head.curr_count"
+	Set gtmtypes("shmpool_buff_hdr",499,"off")=4216
 	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_clue_used_head.curr_count")=499
+	Set gtmtypes("shmpool_buff_hdr",500,"name")="shmpool_buff_hdr.shadow_file_header.n_clue_used_head.cumul_count"
+	Set gtmtypes("shmpool_buff_hdr",500,"off")=4220
 	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_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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_clue_used_head.cumul_count")=500
+	Set gtmtypes("shmpool_buff_hdr",501,"name")="shmpool_buff_hdr.shadow_file_header.n_clue_used_same"
+	Set gtmtypes("shmpool_buff_hdr",501,"off")=4224
 	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_clue_used_same")=501
+	Set gtmtypes("shmpool_buff_hdr",502,"name")="shmpool_buff_hdr.shadow_file_header.n_clue_used_same.curr_count"
+	Set gtmtypes("shmpool_buff_hdr",502,"off")=4224
 	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_clue_used_same.curr_count")=502
+	Set gtmtypes("shmpool_buff_hdr",503,"name")="shmpool_buff_hdr.shadow_file_header.n_clue_used_same.cumul_count"
+	Set gtmtypes("shmpool_buff_hdr",503,"off")=4228
 	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_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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_clue_used_same.cumul_count")=503
+	Set gtmtypes("shmpool_buff_hdr",504,"name")="shmpool_buff_hdr.shadow_file_header.n_clue_used_tail"
+	Set gtmtypes("shmpool_buff_hdr",504,"off")=4232
 	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_clue_used_tail")=504
+	Set gtmtypes("shmpool_buff_hdr",505,"name")="shmpool_buff_hdr.shadow_file_header.n_clue_used_tail.curr_count"
+	Set gtmtypes("shmpool_buff_hdr",505,"off")=4232
 	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_clue_used_tail.curr_count")=505
+	Set gtmtypes("shmpool_buff_hdr",506,"name")="shmpool_buff_hdr.shadow_file_header.n_clue_used_tail.cumul_count"
+	Set gtmtypes("shmpool_buff_hdr",506,"off")=4236
 	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_clue_used_tail.cumul_count")=506
+	Set gtmtypes("shmpool_buff_hdr",507,"name")="shmpool_buff_hdr.shadow_file_header.n_t_qreads"
+	Set gtmtypes("shmpool_buff_hdr",507,"off")=4240
 	Set gtmtypes("shmpool_buff_hdr",507,"len")=8
 	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_t_qreads")=507
+	Set gtmtypes("shmpool_buff_hdr",508,"name")="shmpool_buff_hdr.shadow_file_header.n_t_qreads.curr_count"
+	Set gtmtypes("shmpool_buff_hdr",508,"off")=4240
 	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_t_qreads.curr_count")=508
+	Set gtmtypes("shmpool_buff_hdr",509,"name")="shmpool_buff_hdr.shadow_file_header.n_t_qreads.cumul_count"
+	Set gtmtypes("shmpool_buff_hdr",509,"off")=4244
 	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_t_qreads.cumul_count")=509
+	Set gtmtypes("shmpool_buff_hdr",510,"name")="shmpool_buff_hdr.shadow_file_header.unused_dsk_reads"
+	Set gtmtypes("shmpool_buff_hdr",510,"off")=4248
 	Set gtmtypes("shmpool_buff_hdr",510,"len")=8
 	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.unused_dsk_reads")=510
+	Set gtmtypes("shmpool_buff_hdr",511,"name")="shmpool_buff_hdr.shadow_file_header.unused_dsk_reads.curr_count"
+	Set gtmtypes("shmpool_buff_hdr",511,"off")=4248
 	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.unused_dsk_reads.curr_count")=511
+	Set gtmtypes("shmpool_buff_hdr",512,"name")="shmpool_buff_hdr.shadow_file_header.unused_dsk_reads.cumul_count"
+	Set gtmtypes("shmpool_buff_hdr",512,"off")=4252
 	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.unused_dsk_reads.cumul_count")=512
+	Set gtmtypes("shmpool_buff_hdr",513,"name")="shmpool_buff_hdr.shadow_file_header.n_bgmm_updates"
+	Set gtmtypes("shmpool_buff_hdr",513,"off")=4256
 	Set gtmtypes("shmpool_buff_hdr",513,"len")=8
 	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_bgmm_updates")=513
+	Set gtmtypes("shmpool_buff_hdr",514,"name")="shmpool_buff_hdr.shadow_file_header.n_bgmm_updates.curr_count"
+	Set gtmtypes("shmpool_buff_hdr",514,"off")=4256
 	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_bgmm_updates.curr_count")=514
+	Set gtmtypes("shmpool_buff_hdr",515,"name")="shmpool_buff_hdr.shadow_file_header.n_bgmm_updates.cumul_count"
+	Set gtmtypes("shmpool_buff_hdr",515,"off")=4260
 	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_bgmm_updates.cumul_count")=515
+	Set gtmtypes("shmpool_buff_hdr",516,"name")="shmpool_buff_hdr.shadow_file_header.unused_dsk_writes"
+	Set gtmtypes("shmpool_buff_hdr",516,"off")=4264
 	Set gtmtypes("shmpool_buff_hdr",516,"len")=8
 	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.unused_dsk_writes")=516
+	Set gtmtypes("shmpool_buff_hdr",517,"name")="shmpool_buff_hdr.shadow_file_header.unused_dsk_writes.curr_count"
+	Set gtmtypes("shmpool_buff_hdr",517,"off")=4264
 	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.unused_dsk_writes.curr_count")=517
+	Set gtmtypes("shmpool_buff_hdr",518,"name")="shmpool_buff_hdr.shadow_file_header.unused_dsk_writes.cumul_count"
+	Set gtmtypes("shmpool_buff_hdr",518,"off")=4268
 	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.unused_dsk_writes.cumul_count")=518
+	Set gtmtypes("shmpool_buff_hdr",519,"name")="shmpool_buff_hdr.shadow_file_header.n_bg_update_creates"
+	Set gtmtypes("shmpool_buff_hdr",519,"off")=4272
 	Set gtmtypes("shmpool_buff_hdr",519,"len")=8
 	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_bg_update_creates")=519
+	Set gtmtypes("shmpool_buff_hdr",520,"name")="shmpool_buff_hdr.shadow_file_header.n_bg_update_creates.curr_count"
+	Set gtmtypes("shmpool_buff_hdr",520,"off")=4272
 	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_bg_update_creates.curr_count")=520
+	Set gtmtypes("shmpool_buff_hdr",521,"name")="shmpool_buff_hdr.shadow_file_header.n_bg_update_creates.cumul_count"
+	Set gtmtypes("shmpool_buff_hdr",521,"off")=4276
 	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_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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_bg_update_creates.cumul_count")=521
+	Set gtmtypes("shmpool_buff_hdr",522,"name")="shmpool_buff_hdr.shadow_file_header.n_db_csh_getns"
+	Set gtmtypes("shmpool_buff_hdr",522,"off")=4280
+	Set gtmtypes("shmpool_buff_hdr",522,"len")=8
+	Set gtmtypes("shmpool_buff_hdr",522,"type")="db_csh_acct_rec"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_db_csh_getns")=522
+	Set gtmtypes("shmpool_buff_hdr",523,"name")="shmpool_buff_hdr.shadow_file_header.n_db_csh_getns.curr_count"
+	Set gtmtypes("shmpool_buff_hdr",523,"off")=4280
+	Set gtmtypes("shmpool_buff_hdr",523,"len")=4
+	Set gtmtypes("shmpool_buff_hdr",523,"type")="int"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_db_csh_getns.curr_count")=523
+	Set gtmtypes("shmpool_buff_hdr",524,"name")="shmpool_buff_hdr.shadow_file_header.n_db_csh_getns.cumul_count"
+	Set gtmtypes("shmpool_buff_hdr",524,"off")=4284
+	Set gtmtypes("shmpool_buff_hdr",524,"len")=4
+	Set gtmtypes("shmpool_buff_hdr",524,"type")="int"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_db_csh_getns.cumul_count")=524
+	Set gtmtypes("shmpool_buff_hdr",525,"name")="shmpool_buff_hdr.shadow_file_header.n_db_csh_getn_lcnt"
+	Set gtmtypes("shmpool_buff_hdr",525,"off")=4288
 	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_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_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_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_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_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",525,"type")="db_csh_acct_rec"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_db_csh_getn_lcnt")=525
+	Set gtmtypes("shmpool_buff_hdr",526,"name")="shmpool_buff_hdr.shadow_file_header.n_db_csh_getn_lcnt.curr_count"
+	Set gtmtypes("shmpool_buff_hdr",526,"off")=4288
+	Set gtmtypes("shmpool_buff_hdr",526,"len")=4
+	Set gtmtypes("shmpool_buff_hdr",526,"type")="int"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_db_csh_getn_lcnt.curr_count")=526
+	Set gtmtypes("shmpool_buff_hdr",527,"name")="shmpool_buff_hdr.shadow_file_header.n_db_csh_getn_lcnt.cumul_count"
+	Set gtmtypes("shmpool_buff_hdr",527,"off")=4292
+	Set gtmtypes("shmpool_buff_hdr",527,"len")=4
+	Set gtmtypes("shmpool_buff_hdr",527,"type")="int"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_db_csh_getn_lcnt.cumul_count")=527
+	Set gtmtypes("shmpool_buff_hdr",528,"name")="shmpool_buff_hdr.shadow_file_header.db_csh_acct_rec_filler_4k"
+	Set gtmtypes("shmpool_buff_hdr",528,"off")=4296
+	Set gtmtypes("shmpool_buff_hdr",528,"len")=152
+	Set gtmtypes("shmpool_buff_hdr",528,"type")="char"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.db_csh_acct_rec_filler_4k")=528
+	Set gtmtypes("shmpool_buff_hdr",529,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec"
+	Set gtmtypes("shmpool_buff_hdr",529,"off")=4448
+	Set gtmtypes("shmpool_buff_hdr",529,"len")=472
+	Set gtmtypes("shmpool_buff_hdr",529,"type")="gvstats_rec_t"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec")=529
+	Set gtmtypes("shmpool_buff_hdr",530,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_set"
+	Set gtmtypes("shmpool_buff_hdr",530,"off")=4448
 	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_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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_set")=530
+	Set gtmtypes("shmpool_buff_hdr",531,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_kill"
+	Set gtmtypes("shmpool_buff_hdr",531,"off")=4456
 	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_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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_kill")=531
+	Set gtmtypes("shmpool_buff_hdr",532,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_get"
+	Set gtmtypes("shmpool_buff_hdr",532,"off")=4464
 	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_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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_get")=532
+	Set gtmtypes("shmpool_buff_hdr",533,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_data"
+	Set gtmtypes("shmpool_buff_hdr",533,"off")=4472
 	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.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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_data")=533
+	Set gtmtypes("shmpool_buff_hdr",534,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_order"
+	Set gtmtypes("shmpool_buff_hdr",534,"off")=4480
 	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_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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_order")=534
+	Set gtmtypes("shmpool_buff_hdr",535,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_zprev"
+	Set gtmtypes("shmpool_buff_hdr",535,"off")=4488
 	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_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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_zprev")=535
+	Set gtmtypes("shmpool_buff_hdr",536,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_query"
+	Set gtmtypes("shmpool_buff_hdr",536,"off")=4496
 	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_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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_query")=536
+	Set gtmtypes("shmpool_buff_hdr",537,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_lock_success"
+	Set gtmtypes("shmpool_buff_hdr",537,"off")=4504
 	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_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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_lock_success")=537
+	Set gtmtypes("shmpool_buff_hdr",538,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_lock_fail"
+	Set gtmtypes("shmpool_buff_hdr",538,"off")=4512
 	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_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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_lock_fail")=538
+	Set gtmtypes("shmpool_buff_hdr",539,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.db_curr_tn"
+	Set gtmtypes("shmpool_buff_hdr",539,"off")=4520
 	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_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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.db_curr_tn")=539
+	Set gtmtypes("shmpool_buff_hdr",540,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_dsk_read"
+	Set gtmtypes("shmpool_buff_hdr",540,"off")=4528
 	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_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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_dsk_read")=540
+	Set gtmtypes("shmpool_buff_hdr",541,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_dsk_write"
+	Set gtmtypes("shmpool_buff_hdr",541,"off")=4536
 	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_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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_dsk_write")=541
+	Set gtmtypes("shmpool_buff_hdr",542,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_nontp_readwrite"
+	Set gtmtypes("shmpool_buff_hdr",542,"off")=4544
 	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_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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_nontp_readwrite")=542
+	Set gtmtypes("shmpool_buff_hdr",543,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_nontp_readonly"
+	Set gtmtypes("shmpool_buff_hdr",543,"off")=4552
 	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_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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_nontp_readonly")=543
+	Set gtmtypes("shmpool_buff_hdr",544,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_nontp_blkwrite"
+	Set gtmtypes("shmpool_buff_hdr",544,"off")=4560
 	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_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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_nontp_blkwrite")=544
+	Set gtmtypes("shmpool_buff_hdr",545,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_nontp_blkread"
+	Set gtmtypes("shmpool_buff_hdr",545,"off")=4568
 	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_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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_nontp_blkread")=545
+	Set gtmtypes("shmpool_buff_hdr",546,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_nontp_retries_0"
+	Set gtmtypes("shmpool_buff_hdr",546,"off")=4576
 	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_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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_nontp_retries_0")=546
+	Set gtmtypes("shmpool_buff_hdr",547,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_nontp_retries_1"
+	Set gtmtypes("shmpool_buff_hdr",547,"off")=4584
 	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_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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_nontp_retries_1")=547
+	Set gtmtypes("shmpool_buff_hdr",548,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_nontp_retries_2"
+	Set gtmtypes("shmpool_buff_hdr",548,"off")=4592
 	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_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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_nontp_retries_2")=548
+	Set gtmtypes("shmpool_buff_hdr",549,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_nontp_retries_3"
+	Set gtmtypes("shmpool_buff_hdr",549,"off")=4600
 	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_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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_nontp_retries_3")=549
+	Set gtmtypes("shmpool_buff_hdr",550,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_tp_readwrite"
+	Set gtmtypes("shmpool_buff_hdr",550,"off")=4608
 	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_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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_tp_readwrite")=550
+	Set gtmtypes("shmpool_buff_hdr",551,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_tp_readonly"
+	Set gtmtypes("shmpool_buff_hdr",551,"off")=4616
 	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_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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_tp_readonly")=551
+	Set gtmtypes("shmpool_buff_hdr",552,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_tp_rolledback"
+	Set gtmtypes("shmpool_buff_hdr",552,"off")=4624
 	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_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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_tp_rolledback")=552
+	Set gtmtypes("shmpool_buff_hdr",553,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_tp_blkwrite"
+	Set gtmtypes("shmpool_buff_hdr",553,"off")=4632
 	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_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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_tp_blkwrite")=553
+	Set gtmtypes("shmpool_buff_hdr",554,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_tp_blkread"
+	Set gtmtypes("shmpool_buff_hdr",554,"off")=4640
 	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_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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_tp_blkread")=554
+	Set gtmtypes("shmpool_buff_hdr",555,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_tp_tot_retries_0"
+	Set gtmtypes("shmpool_buff_hdr",555,"off")=4648
 	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_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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_tp_tot_retries_0")=555
+	Set gtmtypes("shmpool_buff_hdr",556,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_tp_tot_retries_1"
+	Set gtmtypes("shmpool_buff_hdr",556,"off")=4656
 	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_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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_tp_tot_retries_1")=556
+	Set gtmtypes("shmpool_buff_hdr",557,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_tp_tot_retries_2"
+	Set gtmtypes("shmpool_buff_hdr",557,"off")=4664
 	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_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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_tp_tot_retries_2")=557
+	Set gtmtypes("shmpool_buff_hdr",558,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_tp_tot_retries_3"
+	Set gtmtypes("shmpool_buff_hdr",558,"off")=4672
 	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_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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_tp_tot_retries_3")=558
+	Set gtmtypes("shmpool_buff_hdr",559,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_tp_tot_retries_4"
+	Set gtmtypes("shmpool_buff_hdr",559,"off")=4680
 	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.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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_tp_tot_retries_4")=559
+	Set gtmtypes("shmpool_buff_hdr",560,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_tp_cnflct_retries_0"
+	Set gtmtypes("shmpool_buff_hdr",560,"off")=4688
 	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_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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_tp_cnflct_retries_0")=560
+	Set gtmtypes("shmpool_buff_hdr",561,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_tp_cnflct_retries_1"
+	Set gtmtypes("shmpool_buff_hdr",561,"off")=4696
 	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.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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_tp_cnflct_retries_1")=561
+	Set gtmtypes("shmpool_buff_hdr",562,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_tp_cnflct_retries_2"
+	Set gtmtypes("shmpool_buff_hdr",562,"off")=4704
 	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_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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_tp_cnflct_retries_2")=562
+	Set gtmtypes("shmpool_buff_hdr",563,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_tp_cnflct_retries_3"
+	Set gtmtypes("shmpool_buff_hdr",563,"off")=4712
 	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.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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_tp_cnflct_retries_3")=563
+	Set gtmtypes("shmpool_buff_hdr",564,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_tp_cnflct_retries_4"
+	Set gtmtypes("shmpool_buff_hdr",564,"off")=4720
 	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_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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_tp_cnflct_retries_4")=564
+	Set gtmtypes("shmpool_buff_hdr",565,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_ztrigger"
+	Set gtmtypes("shmpool_buff_hdr",565,"off")=4728
 	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_ztrigger")=565
+	Set gtmtypes("shmpool_buff_hdr",566,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_db_flush"
+	Set gtmtypes("shmpool_buff_hdr",566,"off")=4736
 	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_db_flush")=566
+	Set gtmtypes("shmpool_buff_hdr",567,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_db_fsync"
+	Set gtmtypes("shmpool_buff_hdr",567,"off")=4744
 	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.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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_db_fsync")=567
+	Set gtmtypes("shmpool_buff_hdr",568,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_jnl_flush"
+	Set gtmtypes("shmpool_buff_hdr",568,"off")=4752
 	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_jnl_flush")=568
+	Set gtmtypes("shmpool_buff_hdr",569,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_jnl_fsync"
+	Set gtmtypes("shmpool_buff_hdr",569,"off")=4760
 	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_jnl_fsync")=569
+	Set gtmtypes("shmpool_buff_hdr",570,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_jbuff_bytes"
+	Set gtmtypes("shmpool_buff_hdr",570,"off")=4768
 	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_jbuff_bytes")=570
+	Set gtmtypes("shmpool_buff_hdr",571,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_jfile_bytes"
+	Set gtmtypes("shmpool_buff_hdr",571,"off")=4776
 	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_jfile_bytes")=571
+	Set gtmtypes("shmpool_buff_hdr",572,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_jfile_writes"
+	Set gtmtypes("shmpool_buff_hdr",572,"off")=4784
 	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_jfile_writes")=572
+	Set gtmtypes("shmpool_buff_hdr",573,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_jrec_logical"
+	Set gtmtypes("shmpool_buff_hdr",573,"off")=4792
 	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_jrec_logical")=573
+	Set gtmtypes("shmpool_buff_hdr",574,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_jrec_pblk"
+	Set gtmtypes("shmpool_buff_hdr",574,"off")=4800
 	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_jrec_pblk")=574
+	Set gtmtypes("shmpool_buff_hdr",575,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_jrec_epoch_regular"
+	Set gtmtypes("shmpool_buff_hdr",575,"off")=4808
 	Set gtmtypes("shmpool_buff_hdr",575,"len")=8
 	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_jrec_epoch_regular")=575
+	Set gtmtypes("shmpool_buff_hdr",576,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_jrec_epoch_idle"
+	Set gtmtypes("shmpool_buff_hdr",576,"off")=4816
 	Set gtmtypes("shmpool_buff_hdr",576,"len")=8
 	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_jrec_epoch_idle")=576
+	Set gtmtypes("shmpool_buff_hdr",577,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_jrec_other"
+	Set gtmtypes("shmpool_buff_hdr",577,"off")=4824
 	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.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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_jrec_other")=577
+	Set gtmtypes("shmpool_buff_hdr",578,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_jnl_extends"
+	Set gtmtypes("shmpool_buff_hdr",578,"off")=4832
 	Set gtmtypes("shmpool_buff_hdr",578,"len")=8
 	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_jnl_extends")=578
+	Set gtmtypes("shmpool_buff_hdr",579,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_db_extends"
+	Set gtmtypes("shmpool_buff_hdr",579,"off")=4840
 	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_db_extends")=579
+	Set gtmtypes("shmpool_buff_hdr",580,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_crit_success"
+	Set gtmtypes("shmpool_buff_hdr",580,"off")=4848
 	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_crit_success")=580
+	Set gtmtypes("shmpool_buff_hdr",581,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_crits_in_epch"
+	Set gtmtypes("shmpool_buff_hdr",581,"off")=4856
 	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_crits_in_epch")=581
+	Set gtmtypes("shmpool_buff_hdr",582,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.sq_crit_failed"
+	Set gtmtypes("shmpool_buff_hdr",582,"off")=4864
 	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.sq_crit_failed")=582
+	Set gtmtypes("shmpool_buff_hdr",583,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_crit_failed"
+	Set gtmtypes("shmpool_buff_hdr",583,"off")=4872
+	Set gtmtypes("shmpool_buff_hdr",583,"len")=8
+	Set gtmtypes("shmpool_buff_hdr",583,"type")="uint64_t"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_crit_failed")=583
+	Set gtmtypes("shmpool_buff_hdr",584,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.sq_crit_que_slps"
+	Set gtmtypes("shmpool_buff_hdr",584,"off")=4880
+	Set gtmtypes("shmpool_buff_hdr",584,"len")=8
+	Set gtmtypes("shmpool_buff_hdr",584,"type")="uint64_t"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.sq_crit_que_slps")=584
+	Set gtmtypes("shmpool_buff_hdr",585,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_crit_que_slps"
+	Set gtmtypes("shmpool_buff_hdr",585,"off")=4888
+	Set gtmtypes("shmpool_buff_hdr",585,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",585,"type")="uint64_t"
-	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.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")="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")="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")="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")="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")="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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_crit_que_slps")=585
+	Set gtmtypes("shmpool_buff_hdr",586,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.sq_crit_yields"
+	Set gtmtypes("shmpool_buff_hdr",586,"off")=4896
+	Set gtmtypes("shmpool_buff_hdr",586,"len")=8
+	Set gtmtypes("shmpool_buff_hdr",586,"type")="uint64_t"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.sq_crit_yields")=586
+	Set gtmtypes("shmpool_buff_hdr",587,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_crit_yields"
+	Set gtmtypes("shmpool_buff_hdr",587,"off")=4904
+	Set gtmtypes("shmpool_buff_hdr",587,"len")=8
+	Set gtmtypes("shmpool_buff_hdr",587,"type")="uint64_t"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_crit_yields")=587
+	Set gtmtypes("shmpool_buff_hdr",588,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_clean2dirty"
+	Set gtmtypes("shmpool_buff_hdr",588,"off")=4912
+	Set gtmtypes("shmpool_buff_hdr",588,"len")=8
+	Set gtmtypes("shmpool_buff_hdr",588,"type")="uint64_t"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_clean2dirty")=588
+	Set gtmtypes("shmpool_buff_hdr",589,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec_filler_4k_plus_512"
+	Set gtmtypes("shmpool_buff_hdr",589,"off")=4920
+	Set gtmtypes("shmpool_buff_hdr",589,"len")=40
+	Set gtmtypes("shmpool_buff_hdr",589,"type")="char"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec_filler_4k_plus_512")=589
+	Set gtmtypes("shmpool_buff_hdr",590,"name")="shmpool_buff_hdr.shadow_file_header.filler_4k_plus_512"
+	Set gtmtypes("shmpool_buff_hdr",590,"off")=4960
+	Set gtmtypes("shmpool_buff_hdr",590,"len")=368
+	Set gtmtypes("shmpool_buff_hdr",590,"type")="char"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.filler_4k_plus_512")=590
+	Set gtmtypes("shmpool_buff_hdr",591,"name")="shmpool_buff_hdr.shadow_file_header.intrpt_recov_resync_strm_seqno"
+	Set gtmtypes("shmpool_buff_hdr",591,"off")=5328
+	Set gtmtypes("shmpool_buff_hdr",591,"len")=128
+	Set gtmtypes("shmpool_buff_hdr",591,"type")="uint64_t"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.intrpt_recov_resync_strm_seqno")=591
+	Set gtmtypes("shmpool_buff_hdr",591,"dim")=16
+	Set gtmtypes("shmpool_buff_hdr",592,"name")="shmpool_buff_hdr.shadow_file_header.creation_db_ver"
+	Set gtmtypes("shmpool_buff_hdr",592,"off")=5456
+	Set gtmtypes("shmpool_buff_hdr",592,"len")=4
+	Set gtmtypes("shmpool_buff_hdr",592,"type")="int"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.creation_db_ver")=592
+	Set gtmtypes("shmpool_buff_hdr",593,"name")="shmpool_buff_hdr.shadow_file_header.creation_mdb_ver"
+	Set gtmtypes("shmpool_buff_hdr",593,"off")=5460
+	Set gtmtypes("shmpool_buff_hdr",593,"len")=4
+	Set gtmtypes("shmpool_buff_hdr",593,"type")="int"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.creation_mdb_ver")=593
+	Set gtmtypes("shmpool_buff_hdr",594,"name")="shmpool_buff_hdr.shadow_file_header.certified_for_upgrade_to"
+	Set gtmtypes("shmpool_buff_hdr",594,"off")=5464
+	Set gtmtypes("shmpool_buff_hdr",594,"len")=4
+	Set gtmtypes("shmpool_buff_hdr",594,"type")="int"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.certified_for_upgrade_to")=594
+	Set gtmtypes("shmpool_buff_hdr",595,"name")="shmpool_buff_hdr.shadow_file_header.filler_5k"
+	Set gtmtypes("shmpool_buff_hdr",595,"off")=5468
+	Set gtmtypes("shmpool_buff_hdr",595,"len")=4
+	Set gtmtypes("shmpool_buff_hdr",595,"type")="int"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.filler_5k")=595
+	Set gtmtypes("shmpool_buff_hdr",596,"name")="shmpool_buff_hdr.shadow_file_header.secshr_ops_index_filler"
+	Set gtmtypes("shmpool_buff_hdr",596,"off")=5472
+	Set gtmtypes("shmpool_buff_hdr",596,"len")=4
+	Set gtmtypes("shmpool_buff_hdr",596,"type")="int"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.secshr_ops_index_filler")=596
+	Set gtmtypes("shmpool_buff_hdr",597,"name")="shmpool_buff_hdr.shadow_file_header.secshr_ops_array_filler"
+	Set gtmtypes("shmpool_buff_hdr",597,"off")=5476
+	Set gtmtypes("shmpool_buff_hdr",597,"len")=1020
 	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.secshr_ops_array_filler")=597
+	Set gtmtypes("shmpool_buff_hdr",597,"dim")=255
+	Set gtmtypes("shmpool_buff_hdr",598,"name")="shmpool_buff_hdr.shadow_file_header.next_upgrd_warn"
+	Set gtmtypes("shmpool_buff_hdr",598,"off")=6496
+	Set gtmtypes("shmpool_buff_hdr",598,"len")=24
+	Set gtmtypes("shmpool_buff_hdr",598,"type")="compswap_time_field"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.next_upgrd_warn")=598
+	Set gtmtypes("shmpool_buff_hdr",599,"name")="shmpool_buff_hdr.shadow_file_header.next_upgrd_warn.time_latch"
+	Set gtmtypes("shmpool_buff_hdr",599,"off")=6496
+	Set gtmtypes("shmpool_buff_hdr",599,"len")=8
+	Set gtmtypes("shmpool_buff_hdr",599,"type")="global_latch_t"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.next_upgrd_warn.time_latch")=599
+	Set gtmtypes("shmpool_buff_hdr",600,"name")="shmpool_buff_hdr.shadow_file_header.next_upgrd_warn.time_latch.u"
+	Set gtmtypes("shmpool_buff_hdr",600,"off")=6496
+	Set gtmtypes("shmpool_buff_hdr",600,"len")=8
+	Set gtmtypes("shmpool_buff_hdr",600,"type")="union"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.next_upgrd_warn.time_latch.u")=600
+	Set gtmtypes("shmpool_buff_hdr",601,"name")="shmpool_buff_hdr.shadow_file_header.next_upgrd_warn.time_latch.u.pid_imgcnt"
+	Set gtmtypes("shmpool_buff_hdr",601,"off")=6496
+	Set gtmtypes("shmpool_buff_hdr",601,"len")=8
+	Set gtmtypes("shmpool_buff_hdr",601,"type")="uint64_t"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.next_upgrd_warn.time_latch.u.pid_imgcnt")=601
+	Set gtmtypes("shmpool_buff_hdr",602,"name")="shmpool_buff_hdr.shadow_file_header.next_upgrd_warn.time_latch.u.parts"
+	Set gtmtypes("shmpool_buff_hdr",602,"off")=6496
+	Set gtmtypes("shmpool_buff_hdr",602,"len")=8
+	Set gtmtypes("shmpool_buff_hdr",602,"type")="struct"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.next_upgrd_warn.time_latch.u.parts")=602
+	Set gtmtypes("shmpool_buff_hdr",603,"name")="shmpool_buff_hdr.shadow_file_header.next_upgrd_warn.time_latch.u.parts.latch_pid"
+	Set gtmtypes("shmpool_buff_hdr",603,"off")=6496
+	Set gtmtypes("shmpool_buff_hdr",603,"len")=4
+	Set gtmtypes("shmpool_buff_hdr",603,"type")="int"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.next_upgrd_warn.time_latch.u.parts.latch_pid")=603
+	Set gtmtypes("shmpool_buff_hdr",604,"name")="shmpool_buff_hdr.shadow_file_header.next_upgrd_warn.time_latch.u.parts.latch_word"
+	Set gtmtypes("shmpool_buff_hdr",604,"off")=6500
 	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",604,"type")="int"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.next_upgrd_warn.time_latch.u.parts.latch_word")=604
+	Set gtmtypes("shmpool_buff_hdr",605,"name")="shmpool_buff_hdr.shadow_file_header.next_upgrd_warn.hp_latch_space"
+	Set gtmtypes("shmpool_buff_hdr",605,"off")=6504
+	Set gtmtypes("shmpool_buff_hdr",605,"len")=16
+	Set gtmtypes("shmpool_buff_hdr",605,"type")="int"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.next_upgrd_warn.hp_latch_space")=605
+	Set gtmtypes("shmpool_buff_hdr",605,"dim")=4
+	Set gtmtypes("shmpool_buff_hdr",606,"name")="shmpool_buff_hdr.shadow_file_header.is_encrypted"
+	Set gtmtypes("shmpool_buff_hdr",606,"off")=6520
 	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",606,"type")="unsigned-int"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.is_encrypted")=606
+	Set gtmtypes("shmpool_buff_hdr",607,"name")="shmpool_buff_hdr.shadow_file_header.db_trigger_cycle"
+	Set gtmtypes("shmpool_buff_hdr",607,"off")=6524
 	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",607,"type")="unsigned-int"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.db_trigger_cycle")=607
+	Set gtmtypes("shmpool_buff_hdr",608,"name")="shmpool_buff_hdr.shadow_file_header.strm_reg_seqno"
+	Set gtmtypes("shmpool_buff_hdr",608,"off")=6528
+	Set gtmtypes("shmpool_buff_hdr",608,"len")=128
+	Set gtmtypes("shmpool_buff_hdr",608,"type")="uint64_t"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.strm_reg_seqno")=608
+	Set gtmtypes("shmpool_buff_hdr",608,"dim")=16
+	Set gtmtypes("shmpool_buff_hdr",609,"name")="shmpool_buff_hdr.shadow_file_header.save_strm_reg_seqno"
+	Set gtmtypes("shmpool_buff_hdr",609,"off")=6656
+	Set gtmtypes("shmpool_buff_hdr",609,"len")=128
+	Set gtmtypes("shmpool_buff_hdr",609,"type")="uint64_t"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.save_strm_reg_seqno")=609
+	Set gtmtypes("shmpool_buff_hdr",609,"dim")=16
+	Set gtmtypes("shmpool_buff_hdr",610,"name")="shmpool_buff_hdr.shadow_file_header.freeze_on_fail"
+	Set gtmtypes("shmpool_buff_hdr",610,"off")=6784
 	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.freeze_on_fail")=610
+	Set gtmtypes("shmpool_buff_hdr",611,"name")="shmpool_buff_hdr.shadow_file_header.span_node_absent"
+	Set gtmtypes("shmpool_buff_hdr",611,"off")=6788
 	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.span_node_absent")=611
+	Set gtmtypes("shmpool_buff_hdr",612,"name")="shmpool_buff_hdr.shadow_file_header.maxkeysz_assured"
+	Set gtmtypes("shmpool_buff_hdr",612,"off")=6792
 	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("shmpool_buff_hdr",612,"type")="boolean_t"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.maxkeysz_assured")=612
+	Set gtmtypes("shmpool_buff_hdr",613,"name")="shmpool_buff_hdr.shadow_file_header.hasht_upgrade_needed"
+	Set gtmtypes("shmpool_buff_hdr",613,"off")=6796
+	Set gtmtypes("shmpool_buff_hdr",613,"len")=4
+	Set gtmtypes("shmpool_buff_hdr",613,"type")="boolean_t"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.hasht_upgrade_needed")=613
+	Set gtmtypes("shmpool_buff_hdr",614,"name")="shmpool_buff_hdr.shadow_file_header.defer_allocate"
+	Set gtmtypes("shmpool_buff_hdr",614,"off")=6800
+	Set gtmtypes("shmpool_buff_hdr",614,"len")=4
+	Set gtmtypes("shmpool_buff_hdr",614,"type")="boolean_t"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.defer_allocate")=614
+	Set gtmtypes("shmpool_buff_hdr",615,"name")="shmpool_buff_hdr.shadow_file_header.filler_ftok_counter_halted"
+	Set gtmtypes("shmpool_buff_hdr",615,"off")=6804
+	Set gtmtypes("shmpool_buff_hdr",615,"len")=4
+	Set gtmtypes("shmpool_buff_hdr",615,"type")="boolean_t"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.filler_ftok_counter_halted")=615
+	Set gtmtypes("shmpool_buff_hdr",616,"name")="shmpool_buff_hdr.shadow_file_header.filler_access_counter_halted"
+	Set gtmtypes("shmpool_buff_hdr",616,"off")=6808
+	Set gtmtypes("shmpool_buff_hdr",616,"len")=4
+	Set gtmtypes("shmpool_buff_hdr",616,"type")="boolean_t"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.filler_access_counter_halted")=616
+	Set gtmtypes("shmpool_buff_hdr",617,"name")="shmpool_buff_hdr.shadow_file_header.lock_crit_with_db"
+	Set gtmtypes("shmpool_buff_hdr",617,"off")=6812
+	Set gtmtypes("shmpool_buff_hdr",617,"len")=4
+	Set gtmtypes("shmpool_buff_hdr",617,"type")="boolean_t"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.lock_crit_with_db")=617
+	Set gtmtypes("shmpool_buff_hdr",618,"name")="shmpool_buff_hdr.shadow_file_header.basedb_fname_len"
+	Set gtmtypes("shmpool_buff_hdr",618,"off")=6816
+	Set gtmtypes("shmpool_buff_hdr",618,"len")=4
+	Set gtmtypes("shmpool_buff_hdr",618,"type")="unsigned-int"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.basedb_fname_len")=618
+	Set gtmtypes("shmpool_buff_hdr",619,"name")="shmpool_buff_hdr.shadow_file_header.basedb_fname"
+	Set gtmtypes("shmpool_buff_hdr",619,"off")=6820
+	Set gtmtypes("shmpool_buff_hdr",619,"len")=256
+	Set gtmtypes("shmpool_buff_hdr",619,"type")="unsigned-char"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.basedb_fname")=619
+	Set gtmtypes("shmpool_buff_hdr",620,"name")="shmpool_buff_hdr.shadow_file_header.filler_7k"
+	Set gtmtypes("shmpool_buff_hdr",620,"off")=7076
+	Set gtmtypes("shmpool_buff_hdr",620,"len")=444
+	Set gtmtypes("shmpool_buff_hdr",620,"type")="char"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.filler_7k")=620
+	Set gtmtypes("shmpool_buff_hdr",621,"name")="shmpool_buff_hdr.shadow_file_header.filler_8k"
+	Set gtmtypes("shmpool_buff_hdr",621,"off")=7520
+	Set gtmtypes("shmpool_buff_hdr",621,"len")=1024
+	Set gtmtypes("shmpool_buff_hdr",621,"type")="char"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.filler_8k")=621
 	;
 	Set gtmtypes("show_reply")="struct"
 	Set gtmtypes("show_reply",0)=2
@@ -37857,43 +38901,18 @@ Init
 	Set gtmtypfldindx("stringkey","hash_code")=5
 	;
 	Set gtmtypes("struct_jrec_align")="struct"
-	Set gtmtypes("struct_jrec_align",0)=7
-	Set gtmtypes("struct_jrec_align","len")=32
-	Set gtmtypes("struct_jrec_align",1,"name")="struct_jrec_align.prefix"
-	Set gtmtypes("struct_jrec_align",1,"off")=0
-	Set gtmtypes("struct_jrec_align",1,"len")=24
-	Set gtmtypes("struct_jrec_align",1,"type")="jrec_prefix"
-	Set gtmtypfldindx("struct_jrec_align","prefix")=1
-	Set gtmtypes("struct_jrec_align",2,"name")="struct_jrec_align.prefix.pini_addr"
-	Set gtmtypes("struct_jrec_align",2,"off")=4
+	Set gtmtypes("struct_jrec_align",0)=2
+	Set gtmtypes("struct_jrec_align","len")=12
+	Set gtmtypes("struct_jrec_align",1,"name")="struct_jrec_align.checksum"
+	Set gtmtypes("struct_jrec_align",1,"off")=4
+	Set gtmtypes("struct_jrec_align",1,"len")=4
+	Set gtmtypes("struct_jrec_align",1,"type")="unsigned-int"
+	Set gtmtypfldindx("struct_jrec_align","checksum")=1
+	Set gtmtypes("struct_jrec_align",2,"name")="struct_jrec_align.time"
+	Set gtmtypes("struct_jrec_align",2,"off")=8
 	Set gtmtypes("struct_jrec_align",2,"len")=4
 	Set gtmtypes("struct_jrec_align",2,"type")="unsigned-int"
-	Set gtmtypfldindx("struct_jrec_align","prefix.pini_addr")=2
-	Set gtmtypes("struct_jrec_align",3,"name")="struct_jrec_align.prefix.time"
-	Set gtmtypes("struct_jrec_align",3,"off")=8
-	Set gtmtypes("struct_jrec_align",3,"len")=4
-	Set gtmtypes("struct_jrec_align",3,"type")="unsigned-int"
-	Set gtmtypfldindx("struct_jrec_align","prefix.time")=3
-	Set gtmtypes("struct_jrec_align",4,"name")="struct_jrec_align.prefix.checksum"
-	Set gtmtypes("struct_jrec_align",4,"off")=12
-	Set gtmtypes("struct_jrec_align",4,"len")=4
-	Set gtmtypes("struct_jrec_align",4,"type")="unsigned-int"
-	Set gtmtypfldindx("struct_jrec_align","prefix.checksum")=4
-	Set gtmtypes("struct_jrec_align",5,"name")="struct_jrec_align.prefix.tn"
-	Set gtmtypes("struct_jrec_align",5,"off")=16
-	Set gtmtypes("struct_jrec_align",5,"len")=8
-	Set gtmtypes("struct_jrec_align",5,"type")="uint64_t"
-	Set gtmtypfldindx("struct_jrec_align","prefix.tn")=5
-	Set gtmtypes("struct_jrec_align",6,"name")="struct_jrec_align.align_str"
-	Set gtmtypes("struct_jrec_align",6,"off")=24
-	Set gtmtypes("struct_jrec_align",6,"len")=8
-	Set gtmtypes("struct_jrec_align",6,"type")="jnl_string"
-	Set gtmtypfldindx("struct_jrec_align","align_str")=6
-	Set gtmtypes("struct_jrec_align",7,"name")="struct_jrec_align.align_str.text"
-	Set gtmtypes("struct_jrec_align",7,"off")=28
-	Set gtmtypes("struct_jrec_align",7,"len")=1
-	Set gtmtypes("struct_jrec_align",7,"type")="char"
-	Set gtmtypfldindx("struct_jrec_align","align_str.text")=7
+	Set gtmtypfldindx("struct_jrec_align","time")=2
 	;
 	Set gtmtypes("struct_jrec_blk")="struct"
 	Set gtmtypes("struct_jrec_blk",0)=10
@@ -40912,7 +41931,7 @@ Init
 	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 gtmtypes("unix_db_info",122,"type")="int"
 	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
diff --git a/sr_i386/GTMDefinedTypesInitRelease.m b/sr_i386/GTMDefinedTypesInitRelease.m
index 69bac24..ad23b1e 100644
--- a/sr_i386/GTMDefinedTypesInitRelease.m
+++ b/sr_i386/GTMDefinedTypesInitRelease.m
@@ -11,14 +11,14 @@
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
 ;
-; 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
+; Generated by scantypedefs.m at 16:01:52 on 2017-08-16
+; Build done with GT.M version: GT.M V6.3-001A Linux x86
 ;
 ; Environment variables during run:
-;   $gtm_dist: /usr/library/V63000A/pro
-;   $gtm_exe: /usr/library/V63001A/pro
-;   $gtm_src: /usr/library/V63001A/src
-;   $gtm_inc: /usr/library/V63001A/inc
+;   $gtm_dist: /usr/library/V63001A/pro
+;   $gtm_exe: /usr/library/V63002/pro
+;   $gtm_src: /usr/library/V63002/src
+;   $gtm_inc: /usr/library/V63002/inc
 ;
 ; Note this file should not be manually invoked
 ;
@@ -1070,11 +1070,11 @@ Init
 	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,"name")="cache_que_heads.cache_array[0].needs_first_write"
 	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 gtmtypfldindx("cache_que_heads","cache_array[0].needs_first_write")=52
 	;
 	Set gtmtypes("cache_rec")="struct"
 	Set gtmtypes("cache_rec",0)=38
@@ -1264,11 +1264,11 @@ Init
 	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,"name")="cache_rec.needs_first_write"
 	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 gtmtypfldindx("cache_rec","needs_first_write")=38
 	;
 	Set gtmtypes("cache_state_rec")="struct"
 	Set gtmtypes("cache_state_rec",0)=35
@@ -1443,11 +1443,11 @@ Init
 	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,"name")="cache_state_rec.needs_first_write"
 	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 gtmtypfldindx("cache_state_rec","needs_first_write")=35
 	;
 	Set gtmtypes("callin_entry_list")="struct"
 	Set gtmtypes("callin_entry_list",0)=14
@@ -2769,11 +2769,11 @@ Init
 	Set gtmtypes("d_rm_struct",5,"len")=4
 	Set gtmtypes("d_rm_struct",5,"type")="boolean_t"
 	Set gtmtypfldindx("d_rm_struct","fifo")=5
-	Set gtmtypes("d_rm_struct",6,"name")="d_rm_struct.gtm_pipe1"
+	Set gtmtypes("d_rm_struct",6,"name")="d_rm_struct.is_pipe"
 	Set gtmtypes("d_rm_struct",6,"off")=20
 	Set gtmtypes("d_rm_struct",6,"len")=4
 	Set gtmtypes("d_rm_struct",6,"type")="boolean_t"
-	Set gtmtypfldindx("d_rm_struct","gtm_pipe1")=6
+	Set gtmtypfldindx("d_rm_struct","is_pipe")=6
 	Set gtmtypes("d_rm_struct",7,"name")="d_rm_struct.independent"
 	Set gtmtypes("d_rm_struct",7,"off")=24
 	Set gtmtypes("d_rm_struct",7,"len")=4
@@ -6895,11 +6895,11 @@ Init
 	Set gtmtypes("gtmsource_local_struct",53,"len")=4
 	Set gtmtypes("gtmsource_local_struct",53,"type")="int"
 	Set gtmtypfldindx("gtmsource_local_struct","num_renegotiations")=53
-	Set gtmtypes("gtmsource_local_struct",54,"name")="gtmsource_local_struct.padding"
+	Set gtmtypes("gtmsource_local_struct",54,"name")="gtmsource_local_struct.filler_8byte_align"
 	Set gtmtypes("gtmsource_local_struct",54,"off")=1540
 	Set gtmtypes("gtmsource_local_struct",54,"len")=4
 	Set gtmtypes("gtmsource_local_struct",54,"type")="int"
-	Set gtmtypfldindx("gtmsource_local_struct","padding")=54
+	Set gtmtypfldindx("gtmsource_local_struct","filler_8byte_align")=54
 	;
 	Set gtmtypes("gtmsource_options_t")="struct"
 	Set gtmtypes("gtmsource_options_t",0)=34
@@ -9633,6 +9633,99 @@ Init
 	Set gtmtypes("ipcs_mesg",7,"type")="char"
 	Set gtmtypfldindx("ipcs_mesg","fn")=7
 	;
+	Set gtmtypes("jbuf_phase2_in_prog_t")="struct"
+	Set gtmtypes("jbuf_phase2_in_prog_t",0)=12
+	Set gtmtypes("jbuf_phase2_in_prog_t","len")=48
+	Set gtmtypes("jbuf_phase2_in_prog_t",1,"name")="jbuf_phase2_in_prog_t.curr_tn"
+	Set gtmtypes("jbuf_phase2_in_prog_t",1,"off")=0
+	Set gtmtypes("jbuf_phase2_in_prog_t",1,"len")=8
+	Set gtmtypes("jbuf_phase2_in_prog_t",1,"type")="uint64_t"
+	Set gtmtypfldindx("jbuf_phase2_in_prog_t","curr_tn")=1
+	Set gtmtypes("jbuf_phase2_in_prog_t",2,"name")="jbuf_phase2_in_prog_t.jnl_seqno"
+	Set gtmtypes("jbuf_phase2_in_prog_t",2,"off")=8
+	Set gtmtypes("jbuf_phase2_in_prog_t",2,"len")=8
+	Set gtmtypes("jbuf_phase2_in_prog_t",2,"type")="uint64_t"
+	Set gtmtypfldindx("jbuf_phase2_in_prog_t","jnl_seqno")=2
+	Set gtmtypes("jbuf_phase2_in_prog_t",3,"name")="jbuf_phase2_in_prog_t.strm_seqno"
+	Set gtmtypes("jbuf_phase2_in_prog_t",3,"off")=16
+	Set gtmtypes("jbuf_phase2_in_prog_t",3,"len")=8
+	Set gtmtypes("jbuf_phase2_in_prog_t",3,"type")="uint64_t"
+	Set gtmtypfldindx("jbuf_phase2_in_prog_t","strm_seqno")=3
+	Set gtmtypes("jbuf_phase2_in_prog_t",4,"name")="jbuf_phase2_in_prog_t.process_id"
+	Set gtmtypes("jbuf_phase2_in_prog_t",4,"off")=24
+	Set gtmtypes("jbuf_phase2_in_prog_t",4,"len")=4
+	Set gtmtypes("jbuf_phase2_in_prog_t",4,"type")="unsigned-int"
+	Set gtmtypfldindx("jbuf_phase2_in_prog_t","process_id")=4
+	Set gtmtypes("jbuf_phase2_in_prog_t",5,"name")="jbuf_phase2_in_prog_t.start_freeaddr"
+	Set gtmtypes("jbuf_phase2_in_prog_t",5,"off")=28
+	Set gtmtypes("jbuf_phase2_in_prog_t",5,"len")=4
+	Set gtmtypes("jbuf_phase2_in_prog_t",5,"type")="unsigned-int"
+	Set gtmtypfldindx("jbuf_phase2_in_prog_t","start_freeaddr")=5
+	Set gtmtypes("jbuf_phase2_in_prog_t",6,"name")="jbuf_phase2_in_prog_t.tot_jrec_len"
+	Set gtmtypes("jbuf_phase2_in_prog_t",6,"off")=32
+	Set gtmtypes("jbuf_phase2_in_prog_t",6,"len")=4
+	Set gtmtypes("jbuf_phase2_in_prog_t",6,"type")="unsigned-int"
+	Set gtmtypfldindx("jbuf_phase2_in_prog_t","tot_jrec_len")=6
+	Set gtmtypes("jbuf_phase2_in_prog_t",7,"name")="jbuf_phase2_in_prog_t.pini_addr"
+	Set gtmtypes("jbuf_phase2_in_prog_t",7,"off")=36
+	Set gtmtypes("jbuf_phase2_in_prog_t",7,"len")=4
+	Set gtmtypes("jbuf_phase2_in_prog_t",7,"type")="unsigned-int"
+	Set gtmtypfldindx("jbuf_phase2_in_prog_t","pini_addr")=7
+	Set gtmtypes("jbuf_phase2_in_prog_t",8,"name")="jbuf_phase2_in_prog_t.jrec_time"
+	Set gtmtypes("jbuf_phase2_in_prog_t",8,"off")=40
+	Set gtmtypes("jbuf_phase2_in_prog_t",8,"len")=4
+	Set gtmtypes("jbuf_phase2_in_prog_t",8,"type")="unsigned-int"
+	Set gtmtypfldindx("jbuf_phase2_in_prog_t","jrec_time")=8
+	Set gtmtypes("jbuf_phase2_in_prog_t",9,"name")="jbuf_phase2_in_prog_t.in_phase2"
+	Set gtmtypes("jbuf_phase2_in_prog_t",9,"off")=44
+	Set gtmtypes("jbuf_phase2_in_prog_t",9,"len")=1
+	Set gtmtypes("jbuf_phase2_in_prog_t",9,"type")="char"
+	Set gtmtypfldindx("jbuf_phase2_in_prog_t","in_phase2")=9
+	Set gtmtypes("jbuf_phase2_in_prog_t",10,"name")="jbuf_phase2_in_prog_t.replication"
+	Set gtmtypes("jbuf_phase2_in_prog_t",10,"off")=45
+	Set gtmtypes("jbuf_phase2_in_prog_t",10,"len")=1
+	Set gtmtypes("jbuf_phase2_in_prog_t",10,"type")="char"
+	Set gtmtypfldindx("jbuf_phase2_in_prog_t","replication")=10
+	Set gtmtypes("jbuf_phase2_in_prog_t",11,"name")="jbuf_phase2_in_prog_t.write_complete"
+	Set gtmtypes("jbuf_phase2_in_prog_t",11,"off")=46
+	Set gtmtypes("jbuf_phase2_in_prog_t",11,"len")=1
+	Set gtmtypes("jbuf_phase2_in_prog_t",11,"type")="char"
+	Set gtmtypfldindx("jbuf_phase2_in_prog_t","write_complete")=11
+	Set gtmtypes("jbuf_phase2_in_prog_t",12,"name")="jbuf_phase2_in_prog_t.filler_8byte_align"
+	Set gtmtypes("jbuf_phase2_in_prog_t",12,"off")=47
+	Set gtmtypes("jbuf_phase2_in_prog_t",12,"len")=1
+	Set gtmtypes("jbuf_phase2_in_prog_t",12,"type")="char"
+	Set gtmtypfldindx("jbuf_phase2_in_prog_t","filler_8byte_align")=12
+	;
+	Set gtmtypes("jbuf_rsrv_struct_t")="struct"
+	Set gtmtypes("jbuf_rsrv_struct_t",0)=5
+	Set gtmtypes("jbuf_rsrv_struct_t","len")=20
+	Set gtmtypes("jbuf_rsrv_struct_t",1,"name")="jbuf_rsrv_struct_t.alloclen"
+	Set gtmtypes("jbuf_rsrv_struct_t",1,"off")=0
+	Set gtmtypes("jbuf_rsrv_struct_t",1,"len")=4
+	Set gtmtypes("jbuf_rsrv_struct_t",1,"type")="unsigned-int"
+	Set gtmtypfldindx("jbuf_rsrv_struct_t","alloclen")=1
+	Set gtmtypes("jbuf_rsrv_struct_t",2,"name")="jbuf_rsrv_struct_t.usedlen"
+	Set gtmtypes("jbuf_rsrv_struct_t",2,"off")=4
+	Set gtmtypes("jbuf_rsrv_struct_t",2,"len")=4
+	Set gtmtypes("jbuf_rsrv_struct_t",2,"type")="unsigned-int"
+	Set gtmtypfldindx("jbuf_rsrv_struct_t","usedlen")=2
+	Set gtmtypes("jbuf_rsrv_struct_t",3,"name")="jbuf_rsrv_struct_t.tot_jrec_len"
+	Set gtmtypes("jbuf_rsrv_struct_t",3,"off")=8
+	Set gtmtypes("jbuf_rsrv_struct_t",3,"len")=4
+	Set gtmtypes("jbuf_rsrv_struct_t",3,"type")="unsigned-int"
+	Set gtmtypfldindx("jbuf_rsrv_struct_t","tot_jrec_len")=3
+	Set gtmtypes("jbuf_rsrv_struct_t",4,"name")="jbuf_rsrv_struct_t.phase2_commit_index"
+	Set gtmtypes("jbuf_rsrv_struct_t",4,"off")=12
+	Set gtmtypes("jbuf_rsrv_struct_t",4,"len")=4
+	Set gtmtypes("jbuf_rsrv_struct_t",4,"type")="unsigned-int"
+	Set gtmtypfldindx("jbuf_rsrv_struct_t","phase2_commit_index")=4
+	Set gtmtypes("jbuf_rsrv_struct_t",5,"name")="jbuf_rsrv_struct_t.jrs_array"
+	Set gtmtypes("jbuf_rsrv_struct_t",5,"off")=16
+	Set gtmtypes("jbuf_rsrv_struct_t",5,"len")=4
+	Set gtmtypes("jbuf_rsrv_struct_t",5,"type")="addr"
+	Set gtmtypfldindx("jbuf_rsrv_struct_t","jrs_array")=5
+	;
 	Set gtmtypes("jext_heap_elem_t")="struct"
 	Set gtmtypes("jext_heap_elem_t",0)=2
 	Set gtmtypes("jext_heap_elem_t","len")=8
@@ -9662,8 +9755,8 @@ Init
 	Set gtmtypfldindx("jnl_action","nodeflags")=2
 	;
 	Set gtmtypes("jnl_buffer")="struct"
-	Set gtmtypes("jnl_buffer",0)=60
-	Set gtmtypes("jnl_buffer","len")=536
+	Set gtmtypes("jnl_buffer",0)=85
+	Set gtmtypes("jnl_buffer","len")=197216
 	Set gtmtypes("jnl_buffer",1,"name")="jnl_buffer.eov_tn"
 	Set gtmtypes("jnl_buffer",1,"off")=0
 	Set gtmtypes("jnl_buffer",1,"len")=8
@@ -9720,252 +9813,379 @@ Init
 	Set gtmtypes("jnl_buffer",11,"len")=4
 	Set gtmtypes("jnl_buffer",11,"type")="int"
 	Set gtmtypfldindx("jnl_buffer","gtm_free")=11
-	Set gtmtypes("jnl_buffer",12,"name")="jnl_buffer.freeaddr"
+	Set gtmtypes("jnl_buffer",12,"name")="jnl_buffer.rsrv_free"
 	Set gtmtypes("jnl_buffer",12,"off")=180
 	Set gtmtypes("jnl_buffer",12,"len")=4
-	Set gtmtypes("jnl_buffer",12,"type")="unsigned-int"
-	Set gtmtypfldindx("jnl_buffer","freeaddr")=12
-	Set gtmtypes("jnl_buffer",13,"name")="jnl_buffer.end_of_data"
+	Set gtmtypes("jnl_buffer",12,"type")="int"
+	Set gtmtypfldindx("jnl_buffer","rsrv_free")=12
+	Set gtmtypes("jnl_buffer",13,"name")="jnl_buffer.freeaddr"
 	Set gtmtypes("jnl_buffer",13,"off")=184
 	Set gtmtypes("jnl_buffer",13,"len")=4
 	Set gtmtypes("jnl_buffer",13,"type")="unsigned-int"
-	Set gtmtypfldindx("jnl_buffer","end_of_data")=13
-	Set gtmtypes("jnl_buffer",14,"name")="jnl_buffer.filesize"
+	Set gtmtypfldindx("jnl_buffer","freeaddr")=13
+	Set gtmtypes("jnl_buffer",14,"name")="jnl_buffer.rsrv_freeaddr"
 	Set gtmtypes("jnl_buffer",14,"off")=188
 	Set gtmtypes("jnl_buffer",14,"len")=4
 	Set gtmtypes("jnl_buffer",14,"type")="unsigned-int"
-	Set gtmtypfldindx("jnl_buffer","filesize")=14
-	Set gtmtypes("jnl_buffer",15,"name")="jnl_buffer.blocked"
+	Set gtmtypfldindx("jnl_buffer","rsrv_freeaddr")=14
+	Set gtmtypes("jnl_buffer",15,"name")="jnl_buffer.next_align_addr"
 	Set gtmtypes("jnl_buffer",15,"off")=192
 	Set gtmtypes("jnl_buffer",15,"len")=4
-	Set gtmtypes("jnl_buffer",15,"type")="int"
-	Set gtmtypfldindx("jnl_buffer","blocked")=15
-	Set gtmtypes("jnl_buffer",16,"name")="jnl_buffer.fsync_dskaddr"
+	Set gtmtypes("jnl_buffer",15,"type")="unsigned-int"
+	Set gtmtypfldindx("jnl_buffer","next_align_addr")=15
+	Set gtmtypes("jnl_buffer",16,"name")="jnl_buffer.end_of_data"
 	Set gtmtypes("jnl_buffer",16,"off")=196
 	Set gtmtypes("jnl_buffer",16,"len")=4
 	Set gtmtypes("jnl_buffer",16,"type")="unsigned-int"
-	Set gtmtypfldindx("jnl_buffer","fsync_dskaddr")=16
-	Set gtmtypes("jnl_buffer",17,"name")="jnl_buffer.dsk"
+	Set gtmtypfldindx("jnl_buffer","end_of_data")=16
+	Set gtmtypes("jnl_buffer",17,"name")="jnl_buffer.filesize"
 	Set gtmtypes("jnl_buffer",17,"off")=200
 	Set gtmtypes("jnl_buffer",17,"len")=4
-	Set gtmtypes("jnl_buffer",17,"type")="int"
-	Set gtmtypfldindx("jnl_buffer","dsk")=17
-	Set gtmtypes("jnl_buffer",18,"name")="jnl_buffer.wrtsize"
+	Set gtmtypes("jnl_buffer",17,"type")="unsigned-int"
+	Set gtmtypfldindx("jnl_buffer","filesize")=17
+	Set gtmtypes("jnl_buffer",18,"name")="jnl_buffer.phase2_commit_index1"
 	Set gtmtypes("jnl_buffer",18,"off")=204
 	Set gtmtypes("jnl_buffer",18,"len")=4
-	Set gtmtypes("jnl_buffer",18,"type")="int"
-	Set gtmtypfldindx("jnl_buffer","wrtsize")=18
-	Set gtmtypes("jnl_buffer",19,"name")="jnl_buffer.dskaddr"
+	Set gtmtypes("jnl_buffer",18,"type")="unsigned-int"
+	Set gtmtypfldindx("jnl_buffer","phase2_commit_index1")=18
+	Set gtmtypes("jnl_buffer",19,"name")="jnl_buffer.phase2_commit_index2"
 	Set gtmtypes("jnl_buffer",19,"off")=208
 	Set gtmtypes("jnl_buffer",19,"len")=4
 	Set gtmtypes("jnl_buffer",19,"type")="unsigned-int"
-	Set gtmtypfldindx("jnl_buffer","dskaddr")=19
-	Set gtmtypes("jnl_buffer",20,"name")="jnl_buffer.now_writer"
+	Set gtmtypfldindx("jnl_buffer","phase2_commit_index2")=19
+	Set gtmtypes("jnl_buffer",20,"name")="jnl_buffer.phase2_commit_array"
 	Set gtmtypes("jnl_buffer",20,"off")=212
-	Set gtmtypes("jnl_buffer",20,"len")=4
-	Set gtmtypes("jnl_buffer",20,"type")="unsigned-int"
-	Set gtmtypfldindx("jnl_buffer","now_writer")=20
-	Set gtmtypes("jnl_buffer",21,"name")="jnl_buffer.image_count"
-	Set gtmtypes("jnl_buffer",21,"off")=216
-	Set gtmtypes("jnl_buffer",21,"len")=4
-	Set gtmtypes("jnl_buffer",21,"type")="unsigned-int"
-	Set gtmtypfldindx("jnl_buffer","image_count")=21
-	Set gtmtypes("jnl_buffer",22,"name")="jnl_buffer.iosb"
+	Set gtmtypes("jnl_buffer",20,"len")=196608
+	Set gtmtypes("jnl_buffer",20,"type")="jbuf_phase2_in_prog_t"
+	Set gtmtypfldindx("jnl_buffer","phase2_commit_array")=20
+	Set gtmtypes("jnl_buffer",20,"dim")=4096
+	Set gtmtypes("jnl_buffer",21,"name")="jnl_buffer.phase2_commit_array[0].curr_tn"
+	Set gtmtypes("jnl_buffer",21,"off")=212
+	Set gtmtypes("jnl_buffer",21,"len")=8
+	Set gtmtypes("jnl_buffer",21,"type")="uint64_t"
+	Set gtmtypfldindx("jnl_buffer","phase2_commit_array[0].curr_tn")=21
+	Set gtmtypes("jnl_buffer",22,"name")="jnl_buffer.phase2_commit_array[0].jnl_seqno"
 	Set gtmtypes("jnl_buffer",22,"off")=220
 	Set gtmtypes("jnl_buffer",22,"len")=8
-	Set gtmtypes("jnl_buffer",22,"type")="struct"
-	Set gtmtypfldindx("jnl_buffer","iosb")=22
-	Set gtmtypes("jnl_buffer",23,"name")="jnl_buffer.iosb.cond"
-	Set gtmtypes("jnl_buffer",23,"off")=220
-	Set gtmtypes("jnl_buffer",23,"len")=2
-	Set gtmtypes("jnl_buffer",23,"type")="short"
-	Set gtmtypfldindx("jnl_buffer","iosb.cond")=23
-	Set gtmtypes("jnl_buffer",24,"name")="jnl_buffer.iosb.length"
-	Set gtmtypes("jnl_buffer",24,"off")=222
-	Set gtmtypes("jnl_buffer",24,"len")=2
-	Set gtmtypes("jnl_buffer",24,"type")="unsigned-short"
-	Set gtmtypfldindx("jnl_buffer","iosb.length")=24
-	Set gtmtypes("jnl_buffer",25,"name")="jnl_buffer.iosb.dev_specific"
-	Set gtmtypes("jnl_buffer",25,"off")=224
+	Set gtmtypes("jnl_buffer",22,"type")="uint64_t"
+	Set gtmtypfldindx("jnl_buffer","phase2_commit_array[0].jnl_seqno")=22
+	Set gtmtypes("jnl_buffer",23,"name")="jnl_buffer.phase2_commit_array[0].strm_seqno"
+	Set gtmtypes("jnl_buffer",23,"off")=228
+	Set gtmtypes("jnl_buffer",23,"len")=8
+	Set gtmtypes("jnl_buffer",23,"type")="uint64_t"
+	Set gtmtypfldindx("jnl_buffer","phase2_commit_array[0].strm_seqno")=23
+	Set gtmtypes("jnl_buffer",24,"name")="jnl_buffer.phase2_commit_array[0].process_id"
+	Set gtmtypes("jnl_buffer",24,"off")=236
+	Set gtmtypes("jnl_buffer",24,"len")=4
+	Set gtmtypes("jnl_buffer",24,"type")="unsigned-int"
+	Set gtmtypfldindx("jnl_buffer","phase2_commit_array[0].process_id")=24
+	Set gtmtypes("jnl_buffer",25,"name")="jnl_buffer.phase2_commit_array[0].start_freeaddr"
+	Set gtmtypes("jnl_buffer",25,"off")=240
 	Set gtmtypes("jnl_buffer",25,"len")=4
-	Set gtmtypes("jnl_buffer",25,"type")="int"
-	Set gtmtypfldindx("jnl_buffer","iosb.dev_specific")=25
-	Set gtmtypes("jnl_buffer",26,"name")="jnl_buffer.log2_of_alignsize"
-	Set gtmtypes("jnl_buffer",26,"off")=228
+	Set gtmtypes("jnl_buffer",25,"type")="unsigned-int"
+	Set gtmtypfldindx("jnl_buffer","phase2_commit_array[0].start_freeaddr")=25
+	Set gtmtypes("jnl_buffer",26,"name")="jnl_buffer.phase2_commit_array[0].tot_jrec_len"
+	Set gtmtypes("jnl_buffer",26,"off")=244
 	Set gtmtypes("jnl_buffer",26,"len")=4
 	Set gtmtypes("jnl_buffer",26,"type")="unsigned-int"
-	Set gtmtypfldindx("jnl_buffer","log2_of_alignsize")=26
-	Set gtmtypes("jnl_buffer",27,"name")="jnl_buffer.eov_timestamp"
-	Set gtmtypes("jnl_buffer",27,"off")=232
+	Set gtmtypfldindx("jnl_buffer","phase2_commit_array[0].tot_jrec_len")=26
+	Set gtmtypes("jnl_buffer",27,"name")="jnl_buffer.phase2_commit_array[0].pini_addr"
+	Set gtmtypes("jnl_buffer",27,"off")=248
 	Set gtmtypes("jnl_buffer",27,"len")=4
 	Set gtmtypes("jnl_buffer",27,"type")="unsigned-int"
-	Set gtmtypfldindx("jnl_buffer","eov_timestamp")=27
-	Set gtmtypes("jnl_buffer",28,"name")="jnl_buffer.cycle"
-	Set gtmtypes("jnl_buffer",28,"off")=236
+	Set gtmtypfldindx("jnl_buffer","phase2_commit_array[0].pini_addr")=27
+	Set gtmtypes("jnl_buffer",28,"name")="jnl_buffer.phase2_commit_array[0].jrec_time"
+	Set gtmtypes("jnl_buffer",28,"off")=252
 	Set gtmtypes("jnl_buffer",28,"len")=4
 	Set gtmtypes("jnl_buffer",28,"type")="unsigned-int"
-	Set gtmtypfldindx("jnl_buffer","cycle")=28
-	Set gtmtypes("jnl_buffer",29,"name")="jnl_buffer.qiocnt"
-	Set gtmtypes("jnl_buffer",29,"off")=240
-	Set gtmtypes("jnl_buffer",29,"len")=4
-	Set gtmtypes("jnl_buffer",29,"type")="int"
-	Set gtmtypfldindx("jnl_buffer","qiocnt")=29
-	Set gtmtypes("jnl_buffer",30,"name")="jnl_buffer.bytcnt"
-	Set gtmtypes("jnl_buffer",30,"off")=244
-	Set gtmtypes("jnl_buffer",30,"len")=4
-	Set gtmtypes("jnl_buffer",30,"type")="int"
-	Set gtmtypfldindx("jnl_buffer","bytcnt")=30
-	Set gtmtypes("jnl_buffer",31,"name")="jnl_buffer.errcnt"
-	Set gtmtypes("jnl_buffer",31,"off")=248
-	Set gtmtypes("jnl_buffer",31,"len")=4
-	Set gtmtypes("jnl_buffer",31,"type")="int"
-	Set gtmtypfldindx("jnl_buffer","errcnt")=31
-	Set gtmtypes("jnl_buffer",32,"name")="jnl_buffer.reccnt"
-	Set gtmtypes("jnl_buffer",32,"off")=252
-	Set gtmtypes("jnl_buffer",32,"len")=144
-	Set gtmtypes("jnl_buffer",32,"type")="int"
-	Set gtmtypfldindx("jnl_buffer","reccnt")=32
-	Set gtmtypes("jnl_buffer",32,"dim")=36
-	Set gtmtypes("jnl_buffer",33,"name")="jnl_buffer.filler_align"
-	Set gtmtypes("jnl_buffer",33,"off")=396
+	Set gtmtypfldindx("jnl_buffer","phase2_commit_array[0].jrec_time")=28
+	Set gtmtypes("jnl_buffer",29,"name")="jnl_buffer.phase2_commit_array[0].in_phase2"
+	Set gtmtypes("jnl_buffer",29,"off")=256
+	Set gtmtypes("jnl_buffer",29,"len")=1
+	Set gtmtypes("jnl_buffer",29,"type")="char"
+	Set gtmtypfldindx("jnl_buffer","phase2_commit_array[0].in_phase2")=29
+	Set gtmtypes("jnl_buffer",30,"name")="jnl_buffer.phase2_commit_array[0].replication"
+	Set gtmtypes("jnl_buffer",30,"off")=257
+	Set gtmtypes("jnl_buffer",30,"len")=1
+	Set gtmtypes("jnl_buffer",30,"type")="char"
+	Set gtmtypfldindx("jnl_buffer","phase2_commit_array[0].replication")=30
+	Set gtmtypes("jnl_buffer",31,"name")="jnl_buffer.phase2_commit_array[0].write_complete"
+	Set gtmtypes("jnl_buffer",31,"off")=258
+	Set gtmtypes("jnl_buffer",31,"len")=1
+	Set gtmtypes("jnl_buffer",31,"type")="char"
+	Set gtmtypfldindx("jnl_buffer","phase2_commit_array[0].write_complete")=31
+	Set gtmtypes("jnl_buffer",32,"name")="jnl_buffer.phase2_commit_array[0].filler_8byte_align"
+	Set gtmtypes("jnl_buffer",32,"off")=259
+	Set gtmtypes("jnl_buffer",32,"len")=1
+	Set gtmtypes("jnl_buffer",32,"type")="char"
+	Set gtmtypfldindx("jnl_buffer","phase2_commit_array[0].filler_8byte_align")=32
+	Set gtmtypes("jnl_buffer",33,"name")="jnl_buffer.blocked"
+	Set gtmtypes("jnl_buffer",33,"off")=196820
 	Set gtmtypes("jnl_buffer",33,"len")=4
 	Set gtmtypes("jnl_buffer",33,"type")="int"
-	Set gtmtypfldindx("jnl_buffer","filler_align")=33
-	Set gtmtypes("jnl_buffer",34,"name")="jnl_buffer.prev_jrec_time"
-	Set gtmtypes("jnl_buffer",34,"off")=400
+	Set gtmtypfldindx("jnl_buffer","blocked")=33
+	Set gtmtypes("jnl_buffer",34,"name")="jnl_buffer.fsync_dskaddr"
+	Set gtmtypes("jnl_buffer",34,"off")=196824
 	Set gtmtypes("jnl_buffer",34,"len")=4
 	Set gtmtypes("jnl_buffer",34,"type")="unsigned-int"
-	Set gtmtypfldindx("jnl_buffer","prev_jrec_time")=34
-	Set gtmtypes("jnl_buffer",35,"name")="jnl_buffer.free_update_pid"
-	Set gtmtypes("jnl_buffer",35,"off")=404
+	Set gtmtypfldindx("jnl_buffer","fsync_dskaddr")=34
+	Set gtmtypes("jnl_buffer",35,"name")="jnl_buffer.dsk"
+	Set gtmtypes("jnl_buffer",35,"off")=196828
 	Set gtmtypes("jnl_buffer",35,"len")=4
 	Set gtmtypes("jnl_buffer",35,"type")="int"
-	Set gtmtypfldindx("jnl_buffer","free_update_pid")=35
-	Set gtmtypes("jnl_buffer",36,"name")="jnl_buffer.next_epoch_time"
-	Set gtmtypes("jnl_buffer",36,"off")=408
+	Set gtmtypfldindx("jnl_buffer","dsk")=35
+	Set gtmtypes("jnl_buffer",36,"name")="jnl_buffer.wrtsize"
+	Set gtmtypes("jnl_buffer",36,"off")=196832
 	Set gtmtypes("jnl_buffer",36,"len")=4
-	Set gtmtypes("jnl_buffer",36,"type")="unsigned-int"
-	Set gtmtypfldindx("jnl_buffer","next_epoch_time")=36
-	Set gtmtypes("jnl_buffer",37,"name")="jnl_buffer.need_db_fsync"
-	Set gtmtypes("jnl_buffer",37,"off")=412
+	Set gtmtypes("jnl_buffer",36,"type")="int"
+	Set gtmtypfldindx("jnl_buffer","wrtsize")=36
+	Set gtmtypes("jnl_buffer",37,"name")="jnl_buffer.dskaddr"
+	Set gtmtypes("jnl_buffer",37,"off")=196836
 	Set gtmtypes("jnl_buffer",37,"len")=4
-	Set gtmtypes("jnl_buffer",37,"type")="boolean_t"
-	Set gtmtypfldindx("jnl_buffer","need_db_fsync")=37
-	Set gtmtypes("jnl_buffer",38,"name")="jnl_buffer.io_in_prog"
-	Set gtmtypes("jnl_buffer",38,"off")=416
+	Set gtmtypes("jnl_buffer",37,"type")="unsigned-int"
+	Set gtmtypfldindx("jnl_buffer","dskaddr")=37
+	Set gtmtypes("jnl_buffer",38,"name")="jnl_buffer.now_writer"
+	Set gtmtypes("jnl_buffer",38,"off")=196840
 	Set gtmtypes("jnl_buffer",38,"len")=4
-	Set gtmtypes("jnl_buffer",38,"type")="int"
-	Set gtmtypfldindx("jnl_buffer","io_in_prog")=38
-	Set gtmtypes("jnl_buffer",39,"name")="jnl_buffer.enospc_errcnt"
-	Set gtmtypes("jnl_buffer",39,"off")=420
+	Set gtmtypes("jnl_buffer",38,"type")="unsigned-int"
+	Set gtmtypfldindx("jnl_buffer","now_writer")=38
+	Set gtmtypes("jnl_buffer",39,"name")="jnl_buffer.image_count"
+	Set gtmtypes("jnl_buffer",39,"off")=196844
 	Set gtmtypes("jnl_buffer",39,"len")=4
 	Set gtmtypes("jnl_buffer",39,"type")="unsigned-int"
-	Set gtmtypfldindx("jnl_buffer","enospc_errcnt")=39
-	Set gtmtypes("jnl_buffer",40,"name")="jnl_buffer.max_jrec_len"
-	Set gtmtypes("jnl_buffer",40,"off")=424
-	Set gtmtypes("jnl_buffer",40,"len")=4
-	Set gtmtypes("jnl_buffer",40,"type")="unsigned-int"
-	Set gtmtypfldindx("jnl_buffer","max_jrec_len")=40
-	Set gtmtypes("jnl_buffer",41,"name")="jnl_buffer.fs_block_size"
-	Set gtmtypes("jnl_buffer",41,"off")=428
-	Set gtmtypes("jnl_buffer",41,"len")=4
-	Set gtmtypes("jnl_buffer",41,"type")="unsigned-int"
-	Set gtmtypfldindx("jnl_buffer","fs_block_size")=41
-	Set gtmtypes("jnl_buffer",42,"name")="jnl_buffer.post_epoch_freeaddr"
-	Set gtmtypes("jnl_buffer",42,"off")=432
-	Set gtmtypes("jnl_buffer",42,"len")=4
-	Set gtmtypes("jnl_buffer",42,"type")="unsigned-int"
-	Set gtmtypfldindx("jnl_buffer","post_epoch_freeaddr")=42
-	Set gtmtypes("jnl_buffer",43,"name")="jnl_buffer.last_eof_written"
-	Set gtmtypes("jnl_buffer",43,"off")=436
+	Set gtmtypfldindx("jnl_buffer","image_count")=39
+	Set gtmtypes("jnl_buffer",40,"name")="jnl_buffer.iosb"
+	Set gtmtypes("jnl_buffer",40,"off")=196848
+	Set gtmtypes("jnl_buffer",40,"len")=8
+	Set gtmtypes("jnl_buffer",40,"type")="struct"
+	Set gtmtypfldindx("jnl_buffer","iosb")=40
+	Set gtmtypes("jnl_buffer",41,"name")="jnl_buffer.iosb.cond"
+	Set gtmtypes("jnl_buffer",41,"off")=196848
+	Set gtmtypes("jnl_buffer",41,"len")=2
+	Set gtmtypes("jnl_buffer",41,"type")="short"
+	Set gtmtypfldindx("jnl_buffer","iosb.cond")=41
+	Set gtmtypes("jnl_buffer",42,"name")="jnl_buffer.iosb.length"
+	Set gtmtypes("jnl_buffer",42,"off")=196850
+	Set gtmtypes("jnl_buffer",42,"len")=2
+	Set gtmtypes("jnl_buffer",42,"type")="unsigned-short"
+	Set gtmtypfldindx("jnl_buffer","iosb.length")=42
+	Set gtmtypes("jnl_buffer",43,"name")="jnl_buffer.iosb.dev_specific"
+	Set gtmtypes("jnl_buffer",43,"off")=196852
 	Set gtmtypes("jnl_buffer",43,"len")=4
-	Set gtmtypes("jnl_buffer",43,"type")="boolean_t"
-	Set gtmtypfldindx("jnl_buffer","last_eof_written")=43
-	Set gtmtypes("jnl_buffer",44,"name")="jnl_buffer.end_of_data_at_open"
-	Set gtmtypes("jnl_buffer",44,"off")=440
+	Set gtmtypes("jnl_buffer",43,"type")="int"
+	Set gtmtypfldindx("jnl_buffer","iosb.dev_specific")=43
+	Set gtmtypes("jnl_buffer",44,"name")="jnl_buffer.alignsize"
+	Set gtmtypes("jnl_buffer",44,"off")=196856
 	Set gtmtypes("jnl_buffer",44,"len")=4
 	Set gtmtypes("jnl_buffer",44,"type")="unsigned-int"
-	Set gtmtypfldindx("jnl_buffer","end_of_data_at_open")=44
-	Set gtmtypes("jnl_buffer",45,"name")="jnl_buffer.fill_cacheline0"
-	Set gtmtypes("jnl_buffer",45,"off")=444
-	Set gtmtypes("jnl_buffer",45,"len")=24
-	Set gtmtypes("jnl_buffer",45,"type")="char"
-	Set gtmtypfldindx("jnl_buffer","fill_cacheline0")=45
-	Set gtmtypes("jnl_buffer",46,"name")="jnl_buffer.io_in_prog_latch"
-	Set gtmtypes("jnl_buffer",46,"off")=468
-	Set gtmtypes("jnl_buffer",46,"len")=8
-	Set gtmtypes("jnl_buffer",46,"type")="global_latch_t"
-	Set gtmtypfldindx("jnl_buffer","io_in_prog_latch")=46
-	Set gtmtypes("jnl_buffer",47,"name")="jnl_buffer.io_in_prog_latch.u"
-	Set gtmtypes("jnl_buffer",47,"off")=468
-	Set gtmtypes("jnl_buffer",47,"len")=8
-	Set gtmtypes("jnl_buffer",47,"type")="union"
-	Set gtmtypfldindx("jnl_buffer","io_in_prog_latch.u")=47
-	Set gtmtypes("jnl_buffer",48,"name")="jnl_buffer.io_in_prog_latch.u.pid_imgcnt"
-	Set gtmtypes("jnl_buffer",48,"off")=468
-	Set gtmtypes("jnl_buffer",48,"len")=8
-	Set gtmtypes("jnl_buffer",48,"type")="uint64_t"
-	Set gtmtypfldindx("jnl_buffer","io_in_prog_latch.u.pid_imgcnt")=48
-	Set gtmtypes("jnl_buffer",49,"name")="jnl_buffer.io_in_prog_latch.u.parts"
-	Set gtmtypes("jnl_buffer",49,"off")=468
-	Set gtmtypes("jnl_buffer",49,"len")=8
-	Set gtmtypes("jnl_buffer",49,"type")="struct"
-	Set gtmtypfldindx("jnl_buffer","io_in_prog_latch.u.parts")=49
-	Set gtmtypes("jnl_buffer",50,"name")="jnl_buffer.io_in_prog_latch.u.parts.latch_pid"
-	Set gtmtypes("jnl_buffer",50,"off")=468
-	Set gtmtypes("jnl_buffer",50,"len")=4
+	Set gtmtypfldindx("jnl_buffer","alignsize")=44
+	Set gtmtypes("jnl_buffer",45,"name")="jnl_buffer.eov_timestamp"
+	Set gtmtypes("jnl_buffer",45,"off")=196860
+	Set gtmtypes("jnl_buffer",45,"len")=4
+	Set gtmtypes("jnl_buffer",45,"type")="unsigned-int"
+	Set gtmtypfldindx("jnl_buffer","eov_timestamp")=45
+	Set gtmtypes("jnl_buffer",46,"name")="jnl_buffer.cycle"
+	Set gtmtypes("jnl_buffer",46,"off")=196864
+	Set gtmtypes("jnl_buffer",46,"len")=4
+	Set gtmtypes("jnl_buffer",46,"type")="unsigned-int"
+	Set gtmtypfldindx("jnl_buffer","cycle")=46
+	Set gtmtypes("jnl_buffer",47,"name")="jnl_buffer.qiocnt"
+	Set gtmtypes("jnl_buffer",47,"off")=196868
+	Set gtmtypes("jnl_buffer",47,"len")=4
+	Set gtmtypes("jnl_buffer",47,"type")="int"
+	Set gtmtypfldindx("jnl_buffer","qiocnt")=47
+	Set gtmtypes("jnl_buffer",48,"name")="jnl_buffer.bytcnt"
+	Set gtmtypes("jnl_buffer",48,"off")=196872
+	Set gtmtypes("jnl_buffer",48,"len")=4
+	Set gtmtypes("jnl_buffer",48,"type")="int"
+	Set gtmtypfldindx("jnl_buffer","bytcnt")=48
+	Set gtmtypes("jnl_buffer",49,"name")="jnl_buffer.errcnt"
+	Set gtmtypes("jnl_buffer",49,"off")=196876
+	Set gtmtypes("jnl_buffer",49,"len")=4
+	Set gtmtypes("jnl_buffer",49,"type")="int"
+	Set gtmtypfldindx("jnl_buffer","errcnt")=49
+	Set gtmtypes("jnl_buffer",50,"name")="jnl_buffer.reccnt"
+	Set gtmtypes("jnl_buffer",50,"off")=196880
+	Set gtmtypes("jnl_buffer",50,"len")=144
 	Set gtmtypes("jnl_buffer",50,"type")="int"
-	Set gtmtypfldindx("jnl_buffer","io_in_prog_latch.u.parts.latch_pid")=50
-	Set gtmtypes("jnl_buffer",51,"name")="jnl_buffer.io_in_prog_latch.u.parts.latch_word"
-	Set gtmtypes("jnl_buffer",51,"off")=472
-	Set gtmtypes("jnl_buffer",51,"len")=4
+	Set gtmtypfldindx("jnl_buffer","reccnt")=50
+	Set gtmtypes("jnl_buffer",50,"dim")=36
+	Set gtmtypes("jnl_buffer",51,"name")="jnl_buffer.filler_align"
+	Set gtmtypes("jnl_buffer",51,"off")=197024
+	Set gtmtypes("jnl_buffer",51,"len")=24
 	Set gtmtypes("jnl_buffer",51,"type")="int"
-	Set gtmtypfldindx("jnl_buffer","io_in_prog_latch.u.parts.latch_word")=51
-	Set gtmtypes("jnl_buffer",52,"name")="jnl_buffer.fill_cacheline1"
-	Set gtmtypes("jnl_buffer",52,"off")=476
-	Set gtmtypes("jnl_buffer",52,"len")=24
-	Set gtmtypes("jnl_buffer",52,"type")="char"
-	Set gtmtypfldindx("jnl_buffer","fill_cacheline1")=52
-	Set gtmtypes("jnl_buffer",53,"name")="jnl_buffer.fsync_in_prog_latch"
-	Set gtmtypes("jnl_buffer",53,"off")=500
-	Set gtmtypes("jnl_buffer",53,"len")=8
-	Set gtmtypes("jnl_buffer",53,"type")="global_latch_t"
-	Set gtmtypfldindx("jnl_buffer","fsync_in_prog_latch")=53
-	Set gtmtypes("jnl_buffer",54,"name")="jnl_buffer.fsync_in_prog_latch.u"
-	Set gtmtypes("jnl_buffer",54,"off")=500
-	Set gtmtypes("jnl_buffer",54,"len")=8
-	Set gtmtypes("jnl_buffer",54,"type")="union"
-	Set gtmtypfldindx("jnl_buffer","fsync_in_prog_latch.u")=54
-	Set gtmtypes("jnl_buffer",55,"name")="jnl_buffer.fsync_in_prog_latch.u.pid_imgcnt"
-	Set gtmtypes("jnl_buffer",55,"off")=500
-	Set gtmtypes("jnl_buffer",55,"len")=8
-	Set gtmtypes("jnl_buffer",55,"type")="uint64_t"
-	Set gtmtypfldindx("jnl_buffer","fsync_in_prog_latch.u.pid_imgcnt")=55
-	Set gtmtypes("jnl_buffer",56,"name")="jnl_buffer.fsync_in_prog_latch.u.parts"
-	Set gtmtypes("jnl_buffer",56,"off")=500
-	Set gtmtypes("jnl_buffer",56,"len")=8
-	Set gtmtypes("jnl_buffer",56,"type")="struct"
-	Set gtmtypfldindx("jnl_buffer","fsync_in_prog_latch.u.parts")=56
-	Set gtmtypes("jnl_buffer",57,"name")="jnl_buffer.fsync_in_prog_latch.u.parts.latch_pid"
-	Set gtmtypes("jnl_buffer",57,"off")=500
+	Set gtmtypfldindx("jnl_buffer","filler_align")=51
+	Set gtmtypes("jnl_buffer",51,"dim")=6
+	Set gtmtypes("jnl_buffer",52,"name")="jnl_buffer.prev_jrec_time"
+	Set gtmtypes("jnl_buffer",52,"off")=197048
+	Set gtmtypes("jnl_buffer",52,"len")=4
+	Set gtmtypes("jnl_buffer",52,"type")="unsigned-int"
+	Set gtmtypfldindx("jnl_buffer","prev_jrec_time")=52
+	Set gtmtypes("jnl_buffer",53,"name")="jnl_buffer.next_epoch_time"
+	Set gtmtypes("jnl_buffer",53,"off")=197052
+	Set gtmtypes("jnl_buffer",53,"len")=4
+	Set gtmtypes("jnl_buffer",53,"type")="unsigned-int"
+	Set gtmtypfldindx("jnl_buffer","next_epoch_time")=53
+	Set gtmtypes("jnl_buffer",54,"name")="jnl_buffer.need_db_fsync"
+	Set gtmtypes("jnl_buffer",54,"off")=197056
+	Set gtmtypes("jnl_buffer",54,"len")=4
+	Set gtmtypes("jnl_buffer",54,"type")="boolean_t"
+	Set gtmtypfldindx("jnl_buffer","need_db_fsync")=54
+	Set gtmtypes("jnl_buffer",55,"name")="jnl_buffer.io_in_prog"
+	Set gtmtypes("jnl_buffer",55,"off")=197060
+	Set gtmtypes("jnl_buffer",55,"len")=4
+	Set gtmtypes("jnl_buffer",55,"type")="int"
+	Set gtmtypfldindx("jnl_buffer","io_in_prog")=55
+	Set gtmtypes("jnl_buffer",56,"name")="jnl_buffer.enospc_errcnt"
+	Set gtmtypes("jnl_buffer",56,"off")=197064
+	Set gtmtypes("jnl_buffer",56,"len")=4
+	Set gtmtypes("jnl_buffer",56,"type")="unsigned-int"
+	Set gtmtypfldindx("jnl_buffer","enospc_errcnt")=56
+	Set gtmtypes("jnl_buffer",57,"name")="jnl_buffer.max_jrec_len"
+	Set gtmtypes("jnl_buffer",57,"off")=197068
 	Set gtmtypes("jnl_buffer",57,"len")=4
-	Set gtmtypes("jnl_buffer",57,"type")="int"
-	Set gtmtypfldindx("jnl_buffer","fsync_in_prog_latch.u.parts.latch_pid")=57
-	Set gtmtypes("jnl_buffer",58,"name")="jnl_buffer.fsync_in_prog_latch.u.parts.latch_word"
-	Set gtmtypes("jnl_buffer",58,"off")=504
+	Set gtmtypes("jnl_buffer",57,"type")="unsigned-int"
+	Set gtmtypfldindx("jnl_buffer","max_jrec_len")=57
+	Set gtmtypes("jnl_buffer",58,"name")="jnl_buffer.fs_block_size"
+	Set gtmtypes("jnl_buffer",58,"off")=197072
 	Set gtmtypes("jnl_buffer",58,"len")=4
-	Set gtmtypes("jnl_buffer",58,"type")="int"
-	Set gtmtypfldindx("jnl_buffer","fsync_in_prog_latch.u.parts.latch_word")=58
-	Set gtmtypes("jnl_buffer",59,"name")="jnl_buffer.fill_cacheline2"
-	Set gtmtypes("jnl_buffer",59,"off")=508
-	Set gtmtypes("jnl_buffer",59,"len")=24
-	Set gtmtypes("jnl_buffer",59,"type")="char"
-	Set gtmtypfldindx("jnl_buffer","fill_cacheline2")=59
-	Set gtmtypes("jnl_buffer",60,"name")="jnl_buffer.buff"
-	Set gtmtypes("jnl_buffer",60,"off")=532
-	Set gtmtypes("jnl_buffer",60,"len")=1
-	Set gtmtypes("jnl_buffer",60,"type")="unsigned-char"
-	Set gtmtypfldindx("jnl_buffer","buff")=60
+	Set gtmtypes("jnl_buffer",58,"type")="unsigned-int"
+	Set gtmtypfldindx("jnl_buffer","fs_block_size")=58
+	Set gtmtypes("jnl_buffer",59,"name")="jnl_buffer.post_epoch_freeaddr"
+	Set gtmtypes("jnl_buffer",59,"off")=197076
+	Set gtmtypes("jnl_buffer",59,"len")=4
+	Set gtmtypes("jnl_buffer",59,"type")="unsigned-int"
+	Set gtmtypfldindx("jnl_buffer","post_epoch_freeaddr")=59
+	Set gtmtypes("jnl_buffer",60,"name")="jnl_buffer.last_eof_written"
+	Set gtmtypes("jnl_buffer",60,"off")=197080
+	Set gtmtypes("jnl_buffer",60,"len")=4
+	Set gtmtypes("jnl_buffer",60,"type")="boolean_t"
+	Set gtmtypfldindx("jnl_buffer","last_eof_written")=60
+	Set gtmtypes("jnl_buffer",61,"name")="jnl_buffer.end_of_data_at_open"
+	Set gtmtypes("jnl_buffer",61,"off")=197084
+	Set gtmtypes("jnl_buffer",61,"len")=4
+	Set gtmtypes("jnl_buffer",61,"type")="unsigned-int"
+	Set gtmtypfldindx("jnl_buffer","end_of_data_at_open")=61
+	Set gtmtypes("jnl_buffer",62,"name")="jnl_buffer.re_read_dskaddr"
+	Set gtmtypes("jnl_buffer",62,"off")=197088
+	Set gtmtypes("jnl_buffer",62,"len")=4
+	Set gtmtypes("jnl_buffer",62,"type")="unsigned-int"
+	Set gtmtypfldindx("jnl_buffer","re_read_dskaddr")=62
+	Set gtmtypes("jnl_buffer",63,"name")="jnl_buffer.fill_cacheline0"
+	Set gtmtypes("jnl_buffer",63,"off")=197092
+	Set gtmtypes("jnl_buffer",63,"len")=24
+	Set gtmtypes("jnl_buffer",63,"type")="char"
+	Set gtmtypfldindx("jnl_buffer","fill_cacheline0")=63
+	Set gtmtypes("jnl_buffer",64,"name")="jnl_buffer.io_in_prog_latch"
+	Set gtmtypes("jnl_buffer",64,"off")=197116
+	Set gtmtypes("jnl_buffer",64,"len")=8
+	Set gtmtypes("jnl_buffer",64,"type")="global_latch_t"
+	Set gtmtypfldindx("jnl_buffer","io_in_prog_latch")=64
+	Set gtmtypes("jnl_buffer",65,"name")="jnl_buffer.io_in_prog_latch.u"
+	Set gtmtypes("jnl_buffer",65,"off")=197116
+	Set gtmtypes("jnl_buffer",65,"len")=8
+	Set gtmtypes("jnl_buffer",65,"type")="union"
+	Set gtmtypfldindx("jnl_buffer","io_in_prog_latch.u")=65
+	Set gtmtypes("jnl_buffer",66,"name")="jnl_buffer.io_in_prog_latch.u.pid_imgcnt"
+	Set gtmtypes("jnl_buffer",66,"off")=197116
+	Set gtmtypes("jnl_buffer",66,"len")=8
+	Set gtmtypes("jnl_buffer",66,"type")="uint64_t"
+	Set gtmtypfldindx("jnl_buffer","io_in_prog_latch.u.pid_imgcnt")=66
+	Set gtmtypes("jnl_buffer",67,"name")="jnl_buffer.io_in_prog_latch.u.parts"
+	Set gtmtypes("jnl_buffer",67,"off")=197116
+	Set gtmtypes("jnl_buffer",67,"len")=8
+	Set gtmtypes("jnl_buffer",67,"type")="struct"
+	Set gtmtypfldindx("jnl_buffer","io_in_prog_latch.u.parts")=67
+	Set gtmtypes("jnl_buffer",68,"name")="jnl_buffer.io_in_prog_latch.u.parts.latch_pid"
+	Set gtmtypes("jnl_buffer",68,"off")=197116
+	Set gtmtypes("jnl_buffer",68,"len")=4
+	Set gtmtypes("jnl_buffer",68,"type")="int"
+	Set gtmtypfldindx("jnl_buffer","io_in_prog_latch.u.parts.latch_pid")=68
+	Set gtmtypes("jnl_buffer",69,"name")="jnl_buffer.io_in_prog_latch.u.parts.latch_word"
+	Set gtmtypes("jnl_buffer",69,"off")=197120
+	Set gtmtypes("jnl_buffer",69,"len")=4
+	Set gtmtypes("jnl_buffer",69,"type")="int"
+	Set gtmtypfldindx("jnl_buffer","io_in_prog_latch.u.parts.latch_word")=69
+	Set gtmtypes("jnl_buffer",70,"name")="jnl_buffer.fill_cacheline1"
+	Set gtmtypes("jnl_buffer",70,"off")=197124
+	Set gtmtypes("jnl_buffer",70,"len")=24
+	Set gtmtypes("jnl_buffer",70,"type")="char"
+	Set gtmtypfldindx("jnl_buffer","fill_cacheline1")=70
+	Set gtmtypes("jnl_buffer",71,"name")="jnl_buffer.fsync_in_prog_latch"
+	Set gtmtypes("jnl_buffer",71,"off")=197148
+	Set gtmtypes("jnl_buffer",71,"len")=8
+	Set gtmtypes("jnl_buffer",71,"type")="global_latch_t"
+	Set gtmtypfldindx("jnl_buffer","fsync_in_prog_latch")=71
+	Set gtmtypes("jnl_buffer",72,"name")="jnl_buffer.fsync_in_prog_latch.u"
+	Set gtmtypes("jnl_buffer",72,"off")=197148
+	Set gtmtypes("jnl_buffer",72,"len")=8
+	Set gtmtypes("jnl_buffer",72,"type")="union"
+	Set gtmtypfldindx("jnl_buffer","fsync_in_prog_latch.u")=72
+	Set gtmtypes("jnl_buffer",73,"name")="jnl_buffer.fsync_in_prog_latch.u.pid_imgcnt"
+	Set gtmtypes("jnl_buffer",73,"off")=197148
+	Set gtmtypes("jnl_buffer",73,"len")=8
+	Set gtmtypes("jnl_buffer",73,"type")="uint64_t"
+	Set gtmtypfldindx("jnl_buffer","fsync_in_prog_latch.u.pid_imgcnt")=73
+	Set gtmtypes("jnl_buffer",74,"name")="jnl_buffer.fsync_in_prog_latch.u.parts"
+	Set gtmtypes("jnl_buffer",74,"off")=197148
+	Set gtmtypes("jnl_buffer",74,"len")=8
+	Set gtmtypes("jnl_buffer",74,"type")="struct"
+	Set gtmtypfldindx("jnl_buffer","fsync_in_prog_latch.u.parts")=74
+	Set gtmtypes("jnl_buffer",75,"name")="jnl_buffer.fsync_in_prog_latch.u.parts.latch_pid"
+	Set gtmtypes("jnl_buffer",75,"off")=197148
+	Set gtmtypes("jnl_buffer",75,"len")=4
+	Set gtmtypes("jnl_buffer",75,"type")="int"
+	Set gtmtypfldindx("jnl_buffer","fsync_in_prog_latch.u.parts.latch_pid")=75
+	Set gtmtypes("jnl_buffer",76,"name")="jnl_buffer.fsync_in_prog_latch.u.parts.latch_word"
+	Set gtmtypes("jnl_buffer",76,"off")=197152
+	Set gtmtypes("jnl_buffer",76,"len")=4
+	Set gtmtypes("jnl_buffer",76,"type")="int"
+	Set gtmtypfldindx("jnl_buffer","fsync_in_prog_latch.u.parts.latch_word")=76
+	Set gtmtypes("jnl_buffer",77,"name")="jnl_buffer.fill_cacheline2"
+	Set gtmtypes("jnl_buffer",77,"off")=197156
+	Set gtmtypes("jnl_buffer",77,"len")=24
+	Set gtmtypes("jnl_buffer",77,"type")="char"
+	Set gtmtypfldindx("jnl_buffer","fill_cacheline2")=77
+	Set gtmtypes("jnl_buffer",78,"name")="jnl_buffer.phase2_commit_latch"
+	Set gtmtypes("jnl_buffer",78,"off")=197180
+	Set gtmtypes("jnl_buffer",78,"len")=8
+	Set gtmtypes("jnl_buffer",78,"type")="global_latch_t"
+	Set gtmtypfldindx("jnl_buffer","phase2_commit_latch")=78
+	Set gtmtypes("jnl_buffer",79,"name")="jnl_buffer.phase2_commit_latch.u"
+	Set gtmtypes("jnl_buffer",79,"off")=197180
+	Set gtmtypes("jnl_buffer",79,"len")=8
+	Set gtmtypes("jnl_buffer",79,"type")="union"
+	Set gtmtypfldindx("jnl_buffer","phase2_commit_latch.u")=79
+	Set gtmtypes("jnl_buffer",80,"name")="jnl_buffer.phase2_commit_latch.u.pid_imgcnt"
+	Set gtmtypes("jnl_buffer",80,"off")=197180
+	Set gtmtypes("jnl_buffer",80,"len")=8
+	Set gtmtypes("jnl_buffer",80,"type")="uint64_t"
+	Set gtmtypfldindx("jnl_buffer","phase2_commit_latch.u.pid_imgcnt")=80
+	Set gtmtypes("jnl_buffer",81,"name")="jnl_buffer.phase2_commit_latch.u.parts"
+	Set gtmtypes("jnl_buffer",81,"off")=197180
+	Set gtmtypes("jnl_buffer",81,"len")=8
+	Set gtmtypes("jnl_buffer",81,"type")="struct"
+	Set gtmtypfldindx("jnl_buffer","phase2_commit_latch.u.parts")=81
+	Set gtmtypes("jnl_buffer",82,"name")="jnl_buffer.phase2_commit_latch.u.parts.latch_pid"
+	Set gtmtypes("jnl_buffer",82,"off")=197180
+	Set gtmtypes("jnl_buffer",82,"len")=4
+	Set gtmtypes("jnl_buffer",82,"type")="int"
+	Set gtmtypfldindx("jnl_buffer","phase2_commit_latch.u.parts.latch_pid")=82
+	Set gtmtypes("jnl_buffer",83,"name")="jnl_buffer.phase2_commit_latch.u.parts.latch_word"
+	Set gtmtypes("jnl_buffer",83,"off")=197184
+	Set gtmtypes("jnl_buffer",83,"len")=4
+	Set gtmtypes("jnl_buffer",83,"type")="int"
+	Set gtmtypfldindx("jnl_buffer","phase2_commit_latch.u.parts.latch_word")=83
+	Set gtmtypes("jnl_buffer",84,"name")="jnl_buffer.fill_cacheline3"
+	Set gtmtypes("jnl_buffer",84,"off")=197188
+	Set gtmtypes("jnl_buffer",84,"len")=24
+	Set gtmtypes("jnl_buffer",84,"type")="char"
+	Set gtmtypfldindx("jnl_buffer","fill_cacheline3")=84
+	Set gtmtypes("jnl_buffer",85,"name")="jnl_buffer.buff"
+	Set gtmtypes("jnl_buffer",85,"off")=197212
+	Set gtmtypes("jnl_buffer",85,"len")=1
+	Set gtmtypes("jnl_buffer",85,"type")="unsigned-char"
+	Set gtmtypfldindx("jnl_buffer","buff")=85
 	;
 	Set gtmtypes("jnl_create_info")="struct"
 	Set gtmtypes("jnl_create_info",0)=35
@@ -10387,8 +10607,8 @@ Init
 	Set gtmtypfldindx("jnl_ctl_list","turn_around_fullyupgraded")=47
 	;
 	Set gtmtypes("jnl_fence_control")="struct"
-	Set gtmtypes("jnl_fence_control",0)=4
-	Set gtmtypes("jnl_fence_control","len")=24
+	Set gtmtypes("jnl_fence_control",0)=5
+	Set gtmtypes("jnl_fence_control","len")=28
 	Set gtmtypes("jnl_fence_control",1,"name")="jnl_fence_control.fence_list"
 	Set gtmtypes("jnl_fence_control",1,"off")=0
 	Set gtmtypes("jnl_fence_control",1,"len")=4
@@ -10399,16 +10619,21 @@ Init
 	Set gtmtypes("jnl_fence_control",2,"len")=4
 	Set gtmtypes("jnl_fence_control",2,"type")="int"
 	Set gtmtypfldindx("jnl_fence_control","level")=2
-	Set gtmtypes("jnl_fence_control",3,"name")="jnl_fence_control.token"
+	Set gtmtypes("jnl_fence_control",3,"name")="jnl_fence_control.replication"
 	Set gtmtypes("jnl_fence_control",3,"off")=8
-	Set gtmtypes("jnl_fence_control",3,"len")=8
-	Set gtmtypes("jnl_fence_control",3,"type")="uint64_t"
-	Set gtmtypfldindx("jnl_fence_control","token")=3
-	Set gtmtypes("jnl_fence_control",4,"name")="jnl_fence_control.strm_seqno"
-	Set gtmtypes("jnl_fence_control",4,"off")=16
+	Set gtmtypes("jnl_fence_control",3,"len")=4
+	Set gtmtypes("jnl_fence_control",3,"type")="boolean_t"
+	Set gtmtypfldindx("jnl_fence_control","replication")=3
+	Set gtmtypes("jnl_fence_control",4,"name")="jnl_fence_control.token"
+	Set gtmtypes("jnl_fence_control",4,"off")=12
 	Set gtmtypes("jnl_fence_control",4,"len")=8
 	Set gtmtypes("jnl_fence_control",4,"type")="uint64_t"
-	Set gtmtypfldindx("jnl_fence_control","strm_seqno")=4
+	Set gtmtypfldindx("jnl_fence_control","token")=4
+	Set gtmtypes("jnl_fence_control",5,"name")="jnl_fence_control.strm_seqno"
+	Set gtmtypes("jnl_fence_control",5,"off")=20
+	Set gtmtypes("jnl_fence_control",5,"len")=8
+	Set gtmtypes("jnl_fence_control",5,"type")="uint64_t"
+	Set gtmtypfldindx("jnl_fence_control","strm_seqno")=5
 	;
 	Set gtmtypes("jnl_file_header")="struct"
 	Set gtmtypes("jnl_file_header",0)=67
@@ -10935,8 +11160,8 @@ Init
 	Set gtmtypfldindx("jnl_gbls_t","mur_update")=21
 	;
 	Set gtmtypes("jnl_private_control")="struct"
-	Set gtmtypes("jnl_private_control",0)=24
-	Set gtmtypes("jnl_private_control","len")=104
+	Set gtmtypes("jnl_private_control",0)=22
+	Set gtmtypes("jnl_private_control","len")=96
 	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
@@ -10977,86 +11202,76 @@ Init
 	Set gtmtypes("jnl_private_control",8,"len")=4
 	Set gtmtypes("jnl_private_control",8,"type")="unsigned-int"
 	Set gtmtypfldindx("jnl_private_control","fileid.st_gen")=8
-	Set gtmtypes("jnl_private_control",9,"name")="jnl_private_control.jnllsb"
+	Set gtmtypes("jnl_private_control",9,"name")="jnl_private_control.pini_addr"
 	Set gtmtypes("jnl_private_control",9,"off")=36
 	Set gtmtypes("jnl_private_control",9,"len")=4
-	Set gtmtypes("jnl_private_control",9,"type")="addr"
-	Set gtmtypfldindx("jnl_private_control","jnllsb")=9
-	Set gtmtypes("jnl_private_control",10,"name")="jnl_private_control.pini_addr"
+	Set gtmtypes("jnl_private_control",9,"type")="unsigned-int"
+	Set gtmtypfldindx("jnl_private_control","pini_addr")=9
+	Set gtmtypes("jnl_private_control",10,"name")="jnl_private_control.new_freeaddr"
 	Set gtmtypes("jnl_private_control",10,"off")=40
 	Set gtmtypes("jnl_private_control",10,"len")=4
 	Set gtmtypes("jnl_private_control",10,"type")="unsigned-int"
-	Set gtmtypfldindx("jnl_private_control","pini_addr")=10
-	Set gtmtypes("jnl_private_control",11,"name")="jnl_private_control.new_freeaddr"
+	Set gtmtypfldindx("jnl_private_control","new_freeaddr")=10
+	Set gtmtypes("jnl_private_control",11,"name")="jnl_private_control.phase2_freeaddr"
 	Set gtmtypes("jnl_private_control",11,"off")=44
 	Set gtmtypes("jnl_private_control",11,"len")=4
 	Set gtmtypes("jnl_private_control",11,"type")="unsigned-int"
-	Set gtmtypfldindx("jnl_private_control","new_freeaddr")=11
-	Set gtmtypes("jnl_private_control",12,"name")="jnl_private_control.temp_free"
+	Set gtmtypfldindx("jnl_private_control","phase2_freeaddr")=11
+	Set gtmtypes("jnl_private_control",12,"name")="jnl_private_control.phase2_free"
 	Set gtmtypes("jnl_private_control",12,"off")=48
 	Set gtmtypes("jnl_private_control",12,"len")=4
-	Set gtmtypes("jnl_private_control",12,"type")="int"
-	Set gtmtypfldindx("jnl_private_control","temp_free")=12
-	Set gtmtypes("jnl_private_control",13,"name")="jnl_private_control.filler_q0"
+	Set gtmtypes("jnl_private_control",12,"type")="unsigned-int"
+	Set gtmtypfldindx("jnl_private_control","phase2_free")=12
+	Set gtmtypes("jnl_private_control",13,"name")="jnl_private_control.in_jnl_phase2_salvage"
 	Set gtmtypes("jnl_private_control",13,"off")=52
-	Set gtmtypes("jnl_private_control",13,"len")=8
-	Set gtmtypes("jnl_private_control",13,"type")="double"
-	Set gtmtypfldindx("jnl_private_control","filler_q0")=13
-	Set gtmtypes("jnl_private_control",14,"name")="jnl_private_control.new_dsk"
-	Set gtmtypes("jnl_private_control",14,"off")=60
+	Set gtmtypes("jnl_private_control",13,"len")=4
+	Set gtmtypes("jnl_private_control",13,"type")="boolean_t"
+	Set gtmtypfldindx("jnl_private_control","in_jnl_phase2_salvage")=13
+	Set gtmtypes("jnl_private_control",14,"name")="jnl_private_control.status"
+	Set gtmtypes("jnl_private_control",14,"off")=56
 	Set gtmtypes("jnl_private_control",14,"len")=4
 	Set gtmtypes("jnl_private_control",14,"type")="int"
-	Set gtmtypfldindx("jnl_private_control","new_dsk")=14
-	Set gtmtypes("jnl_private_control",15,"name")="jnl_private_control.new_dskaddr"
-	Set gtmtypes("jnl_private_control",15,"off")=64
+	Set gtmtypfldindx("jnl_private_control","status")=14
+	Set gtmtypes("jnl_private_control",15,"name")="jnl_private_control.qio_active"
+	Set gtmtypes("jnl_private_control",15,"off")=60
 	Set gtmtypes("jnl_private_control",15,"len")=4
-	Set gtmtypes("jnl_private_control",15,"type")="unsigned-int"
-	Set gtmtypfldindx("jnl_private_control","new_dskaddr")=15
-	Set gtmtypes("jnl_private_control",16,"name")="jnl_private_control.status"
-	Set gtmtypes("jnl_private_control",16,"off")=68
+	Set gtmtypes("jnl_private_control",15,"type")="boolean_t"
+	Set gtmtypfldindx("jnl_private_control","qio_active")=15
+	Set gtmtypes("jnl_private_control",16,"name")="jnl_private_control.fd_mismatch"
+	Set gtmtypes("jnl_private_control",16,"off")=64
 	Set gtmtypes("jnl_private_control",16,"len")=4
-	Set gtmtypes("jnl_private_control",16,"type")="int"
-	Set gtmtypfldindx("jnl_private_control","status")=16
-	Set gtmtypes("jnl_private_control",17,"name")="jnl_private_control.dsk_update_inprog"
-	Set gtmtypes("jnl_private_control",17,"off")=72
+	Set gtmtypes("jnl_private_control",16,"type")="boolean_t"
+	Set gtmtypfldindx("jnl_private_control","fd_mismatch")=16
+	Set gtmtypes("jnl_private_control",17,"name")="jnl_private_control.sync_io"
+	Set gtmtypes("jnl_private_control",17,"off")=68
 	Set gtmtypes("jnl_private_control",17,"len")=4
 	Set gtmtypes("jnl_private_control",17,"type")="boolean_t"
-	Set gtmtypfldindx("jnl_private_control","dsk_update_inprog")=17
-	Set gtmtypes("jnl_private_control",18,"name")="jnl_private_control.qio_active"
-	Set gtmtypes("jnl_private_control",18,"off")=76
+	Set gtmtypfldindx("jnl_private_control","sync_io")=17
+	Set gtmtypes("jnl_private_control",18,"name")="jnl_private_control.error_reported"
+	Set gtmtypes("jnl_private_control",18,"off")=72
 	Set gtmtypes("jnl_private_control",18,"len")=4
 	Set gtmtypes("jnl_private_control",18,"type")="boolean_t"
-	Set gtmtypfldindx("jnl_private_control","qio_active")=18
-	Set gtmtypes("jnl_private_control",19,"name")="jnl_private_control.fd_mismatch"
-	Set gtmtypes("jnl_private_control",19,"off")=80
+	Set gtmtypfldindx("jnl_private_control","error_reported")=18
+	Set gtmtypes("jnl_private_control",19,"name")="jnl_private_control.status2"
+	Set gtmtypes("jnl_private_control",19,"off")=76
 	Set gtmtypes("jnl_private_control",19,"len")=4
-	Set gtmtypes("jnl_private_control",19,"type")="boolean_t"
-	Set gtmtypfldindx("jnl_private_control","fd_mismatch")=19
-	Set gtmtypes("jnl_private_control",20,"name")="jnl_private_control.sync_io"
-	Set gtmtypes("jnl_private_control",20,"off")=84
+	Set gtmtypes("jnl_private_control",19,"type")="unsigned-int"
+	Set gtmtypfldindx("jnl_private_control","status2")=19
+	Set gtmtypes("jnl_private_control",20,"name")="jnl_private_control.cycle"
+	Set gtmtypes("jnl_private_control",20,"off")=80
 	Set gtmtypes("jnl_private_control",20,"len")=4
-	Set gtmtypes("jnl_private_control",20,"type")="boolean_t"
-	Set gtmtypfldindx("jnl_private_control","sync_io")=20
-	Set gtmtypes("jnl_private_control",21,"name")="jnl_private_control.error_reported"
-	Set gtmtypes("jnl_private_control",21,"off")=88
+	Set gtmtypes("jnl_private_control",20,"type")="unsigned-int"
+	Set gtmtypfldindx("jnl_private_control","cycle")=20
+	Set gtmtypes("jnl_private_control",21,"name")="jnl_private_control.err_str"
+	Set gtmtypes("jnl_private_control",21,"off")=84
 	Set gtmtypes("jnl_private_control",21,"len")=4
-	Set gtmtypes("jnl_private_control",21,"type")="boolean_t"
-	Set gtmtypfldindx("jnl_private_control","error_reported")=21
-	Set gtmtypes("jnl_private_control",22,"name")="jnl_private_control.status2"
-	Set gtmtypes("jnl_private_control",22,"off")=92
-	Set gtmtypes("jnl_private_control",22,"len")=4
-	Set gtmtypes("jnl_private_control",22,"type")="unsigned-int"
-	Set gtmtypfldindx("jnl_private_control","status2")=22
-	Set gtmtypes("jnl_private_control",23,"name")="jnl_private_control.cycle"
-	Set gtmtypes("jnl_private_control",23,"off")=96
-	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_private_control",21,"type")="addr"
+	Set gtmtypfldindx("jnl_private_control","err_str")=21
+	Set gtmtypes("jnl_private_control",22,"name")="jnl_private_control.curr_tn"
+	Set gtmtypes("jnl_private_control",22,"off")=88
+	Set gtmtypes("jnl_private_control",22,"len")=8
+	Set gtmtypes("jnl_private_control",22,"type")="uint64_t"
+	Set gtmtypfldindx("jnl_private_control","curr_tn")=22
 	;
 	Set gtmtypes("jnl_process_vector")="struct"
 	Set gtmtypes("jnl_process_vector",0)=10
@@ -11332,19 +11547,19 @@ Init
 	Set gtmtypfldindx("jnl_record","jrec_aimg.blk_contents")=43
 	Set gtmtypes("jnl_record",44,"name")="jnl_record.jrec_align"
 	Set gtmtypes("jnl_record",44,"off")=0
-	Set gtmtypes("jnl_record",44,"len")=32
+	Set gtmtypes("jnl_record",44,"len")=12
 	Set gtmtypes("jnl_record",44,"type")="struct_jrec_align"
 	Set gtmtypfldindx("jnl_record","jrec_align")=44
-	Set gtmtypes("jnl_record",45,"name")="jnl_record.jrec_align.prefix"
-	Set gtmtypes("jnl_record",45,"off")=0
-	Set gtmtypes("jnl_record",45,"len")=24
-	Set gtmtypes("jnl_record",45,"type")="jrec_prefix"
-	Set gtmtypfldindx("jnl_record","jrec_align.prefix")=45
-	Set gtmtypes("jnl_record",46,"name")="jnl_record.jrec_align.align_str"
-	Set gtmtypes("jnl_record",46,"off")=24
-	Set gtmtypes("jnl_record",46,"len")=8
-	Set gtmtypes("jnl_record",46,"type")="jnl_string"
-	Set gtmtypfldindx("jnl_record","jrec_align.align_str")=46
+	Set gtmtypes("jnl_record",45,"name")="jnl_record.jrec_align.checksum"
+	Set gtmtypes("jnl_record",45,"off")=4
+	Set gtmtypes("jnl_record",45,"len")=4
+	Set gtmtypes("jnl_record",45,"type")="unsigned-int"
+	Set gtmtypfldindx("jnl_record","jrec_align.checksum")=45
+	Set gtmtypes("jnl_record",46,"name")="jnl_record.jrec_align.time"
+	Set gtmtypes("jnl_record",46,"off")=8
+	Set gtmtypes("jnl_record",46,"len")=4
+	Set gtmtypes("jnl_record",46,"type")="unsigned-int"
+	Set gtmtypfldindx("jnl_record","jrec_align.time")=46
 	Set gtmtypes("jnl_record",47,"name")="jnl_record.jrec_tcom"
 	Set gtmtypes("jnl_record",47,"off")=0
 	Set gtmtypes("jnl_record",47,"len")=56
@@ -11681,8 +11896,8 @@ Init
 	Set gtmtypfldindx("jnlext_multi_t","size")=7
 	;
 	Set gtmtypes("jnlpool_addrs")="struct"
-	Set gtmtypes("jnlpool_addrs",0)=7
-	Set gtmtypes("jnlpool_addrs","len")=28
+	Set gtmtypes("jnlpool_addrs",0)=16
+	Set gtmtypes("jnlpool_addrs","len")=68
 	Set gtmtypes("jnlpool_addrs",1,"name")="jnlpool_addrs.jnlpool_ctl"
 	Set gtmtypes("jnlpool_addrs",1,"off")=0
 	Set gtmtypes("jnlpool_addrs",1,"len")=4
@@ -11718,10 +11933,55 @@ Init
 	Set gtmtypes("jnlpool_addrs",7,"len")=4
 	Set gtmtypes("jnlpool_addrs",7,"type")="addr"
 	Set gtmtypfldindx("jnlpool_addrs","jnldata_base")=7
+	Set gtmtypes("jnlpool_addrs",8,"name")="jnlpool_addrs.jrs"
+	Set gtmtypes("jnlpool_addrs",8,"off")=28
+	Set gtmtypes("jnlpool_addrs",8,"len")=40
+	Set gtmtypes("jnlpool_addrs",8,"type")="jpl_rsrv_struct_t"
+	Set gtmtypfldindx("jnlpool_addrs","jrs")=8
+	Set gtmtypes("jnlpool_addrs",9,"name")="jnlpool_addrs.jrs.start_write_addr"
+	Set gtmtypes("jnlpool_addrs",9,"off")=28
+	Set gtmtypes("jnlpool_addrs",9,"len")=8
+	Set gtmtypes("jnlpool_addrs",9,"type")="uint64_t"
+	Set gtmtypfldindx("jnlpool_addrs","jrs.start_write_addr")=9
+	Set gtmtypes("jnlpool_addrs",10,"name")="jnlpool_addrs.jrs.cur_write_addr"
+	Set gtmtypes("jnlpool_addrs",10,"off")=36
+	Set gtmtypes("jnlpool_addrs",10,"len")=8
+	Set gtmtypes("jnlpool_addrs",10,"type")="uint64_t"
+	Set gtmtypfldindx("jnlpool_addrs","jrs.cur_write_addr")=10
+	Set gtmtypes("jnlpool_addrs",11,"name")="jnlpool_addrs.jrs.tot_jrec_len"
+	Set gtmtypes("jnlpool_addrs",11,"off")=44
+	Set gtmtypes("jnlpool_addrs",11,"len")=4
+	Set gtmtypes("jnlpool_addrs",11,"type")="unsigned-int"
+	Set gtmtypfldindx("jnlpool_addrs","jrs.tot_jrec_len")=11
+	Set gtmtypes("jnlpool_addrs",12,"name")="jnlpool_addrs.jrs.write_total"
+	Set gtmtypes("jnlpool_addrs",12,"off")=48
+	Set gtmtypes("jnlpool_addrs",12,"len")=4
+	Set gtmtypes("jnlpool_addrs",12,"type")="unsigned-int"
+	Set gtmtypfldindx("jnlpool_addrs","jrs.write_total")=12
+	Set gtmtypes("jnlpool_addrs",13,"name")="jnlpool_addrs.jrs.memcpy_skipped"
+	Set gtmtypes("jnlpool_addrs",13,"off")=52
+	Set gtmtypes("jnlpool_addrs",13,"len")=4
+	Set gtmtypes("jnlpool_addrs",13,"type")="boolean_t"
+	Set gtmtypfldindx("jnlpool_addrs","jrs.memcpy_skipped")=13
+	Set gtmtypes("jnlpool_addrs",14,"name")="jnlpool_addrs.jrs.phase2_commit_index"
+	Set gtmtypes("jnlpool_addrs",14,"off")=56
+	Set gtmtypes("jnlpool_addrs",14,"len")=4
+	Set gtmtypes("jnlpool_addrs",14,"type")="unsigned-int"
+	Set gtmtypfldindx("jnlpool_addrs","jrs.phase2_commit_index")=14
+	Set gtmtypes("jnlpool_addrs",15,"name")="jnlpool_addrs.jrs.num_tcoms"
+	Set gtmtypes("jnlpool_addrs",15,"off")=60
+	Set gtmtypes("jnlpool_addrs",15,"len")=4
+	Set gtmtypes("jnlpool_addrs",15,"type")="unsigned-int"
+	Set gtmtypfldindx("jnlpool_addrs","jrs.num_tcoms")=15
+	Set gtmtypes("jnlpool_addrs",16,"name")="jnlpool_addrs.jrs.filler_8byte_align"
+	Set gtmtypes("jnlpool_addrs",16,"off")=64
+	Set gtmtypes("jnlpool_addrs",16,"len")=4
+	Set gtmtypes("jnlpool_addrs",16,"type")="char"
+	Set gtmtypfldindx("jnlpool_addrs","jrs.filler_8byte_align")=16
 	;
 	Set gtmtypes("jnlpool_ctl_struct")="struct"
-	Set gtmtypes("jnlpool_ctl_struct",0)=48
-	Set gtmtypes("jnlpool_ctl_struct","len")=3712
+	Set gtmtypes("jnlpool_ctl_struct",0)=72
+	Set gtmtypes("jnlpool_ctl_struct","len")=659152
 	Set gtmtypes("jnlpool_ctl_struct",1,"name")="jnlpool_ctl_struct.jnlpool_id"
 	Set gtmtypes("jnlpool_ctl_struct",1,"off")=0
 	Set gtmtypes("jnlpool_ctl_struct",1,"len")=312
@@ -11802,181 +12062,288 @@ Init
 	Set gtmtypes("jnlpool_ctl_struct",16,"len")=8
 	Set gtmtypes("jnlpool_ctl_struct",16,"type")="uint64_t"
 	Set gtmtypfldindx("jnlpool_ctl_struct","max_zqgblmod_seqno")=16
-	Set gtmtypes("jnlpool_ctl_struct",17,"name")="jnlpool_ctl_struct.early_write_addr"
+	Set gtmtypes("jnlpool_ctl_struct",17,"name")="jnlpool_ctl_struct.strm_seqno"
 	Set gtmtypes("jnlpool_ctl_struct",17,"off")=368
-	Set gtmtypes("jnlpool_ctl_struct",17,"len")=8
+	Set gtmtypes("jnlpool_ctl_struct",17,"len")=128
 	Set gtmtypes("jnlpool_ctl_struct",17,"type")="uint64_t"
-	Set gtmtypfldindx("jnlpool_ctl_struct","early_write_addr")=17
-	Set gtmtypes("jnlpool_ctl_struct",18,"name")="jnlpool_ctl_struct.write_addr"
-	Set gtmtypes("jnlpool_ctl_struct",18,"off")=376
-	Set gtmtypes("jnlpool_ctl_struct",18,"len")=8
-	Set gtmtypes("jnlpool_ctl_struct",18,"type")="uint64_t"
-	Set gtmtypfldindx("jnlpool_ctl_struct","write_addr")=18
-	Set gtmtypes("jnlpool_ctl_struct",19,"name")="jnlpool_ctl_struct.write"
-	Set gtmtypes("jnlpool_ctl_struct",19,"off")=384
+	Set gtmtypfldindx("jnlpool_ctl_struct","strm_seqno")=17
+	Set gtmtypes("jnlpool_ctl_struct",17,"dim")=16
+	Set gtmtypes("jnlpool_ctl_struct",18,"name")="jnlpool_ctl_struct.this_side"
+	Set gtmtypes("jnlpool_ctl_struct",18,"off")=496
+	Set gtmtypes("jnlpool_ctl_struct",18,"len")=48
+	Set gtmtypes("jnlpool_ctl_struct",18,"type")="repl_conn_info_t"
+	Set gtmtypfldindx("jnlpool_ctl_struct","this_side")=18
+	Set gtmtypes("jnlpool_ctl_struct",19,"name")="jnlpool_ctl_struct.this_side.proto_ver"
+	Set gtmtypes("jnlpool_ctl_struct",19,"off")=496
 	Set gtmtypes("jnlpool_ctl_struct",19,"len")=4
-	Set gtmtypes("jnlpool_ctl_struct",19,"type")="unsigned-int"
-	Set gtmtypfldindx("jnlpool_ctl_struct","write")=19
-	Set gtmtypes("jnlpool_ctl_struct",20,"name")="jnlpool_ctl_struct.upd_disabled"
-	Set gtmtypes("jnlpool_ctl_struct",20,"off")=388
+	Set gtmtypes("jnlpool_ctl_struct",19,"type")="int"
+	Set gtmtypfldindx("jnlpool_ctl_struct","this_side.proto_ver")=19
+	Set gtmtypes("jnlpool_ctl_struct",20,"name")="jnlpool_ctl_struct.this_side.jnl_ver"
+	Set gtmtypes("jnlpool_ctl_struct",20,"off")=500
 	Set gtmtypes("jnlpool_ctl_struct",20,"len")=4
-	Set gtmtypes("jnlpool_ctl_struct",20,"type")="boolean_t"
-	Set gtmtypfldindx("jnlpool_ctl_struct","upd_disabled")=20
-	Set gtmtypes("jnlpool_ctl_struct",21,"name")="jnlpool_ctl_struct.lastwrite_len"
-	Set gtmtypes("jnlpool_ctl_struct",21,"off")=392
+	Set gtmtypes("jnlpool_ctl_struct",20,"type")="unsigned-int"
+	Set gtmtypfldindx("jnlpool_ctl_struct","this_side.jnl_ver")=20
+	Set gtmtypes("jnlpool_ctl_struct",21,"name")="jnlpool_ctl_struct.this_side.is_std_null_coll"
+	Set gtmtypes("jnlpool_ctl_struct",21,"off")=504
 	Set gtmtypes("jnlpool_ctl_struct",21,"len")=4
-	Set gtmtypes("jnlpool_ctl_struct",21,"type")="unsigned-int"
-	Set gtmtypfldindx("jnlpool_ctl_struct","lastwrite_len")=21
-	Set gtmtypes("jnlpool_ctl_struct",22,"name")="jnlpool_ctl_struct.send_losttn_complete"
-	Set gtmtypes("jnlpool_ctl_struct",22,"off")=396
+	Set gtmtypes("jnlpool_ctl_struct",21,"type")="boolean_t"
+	Set gtmtypfldindx("jnlpool_ctl_struct","this_side.is_std_null_coll")=21
+	Set gtmtypes("jnlpool_ctl_struct",22,"name")="jnlpool_ctl_struct.this_side.trigger_supported"
+	Set gtmtypes("jnlpool_ctl_struct",22,"off")=508
 	Set gtmtypes("jnlpool_ctl_struct",22,"len")=4
 	Set gtmtypes("jnlpool_ctl_struct",22,"type")="boolean_t"
-	Set gtmtypfldindx("jnlpool_ctl_struct","send_losttn_complete")=22
-	Set gtmtypes("jnlpool_ctl_struct",23,"name")="jnlpool_ctl_struct.primary_instname"
-	Set gtmtypes("jnlpool_ctl_struct",23,"off")=400
-	Set gtmtypes("jnlpool_ctl_struct",23,"len")=16
-	Set gtmtypes("jnlpool_ctl_struct",23,"type")="unsigned-char"
-	Set gtmtypfldindx("jnlpool_ctl_struct","primary_instname")=23
-	Set gtmtypes("jnlpool_ctl_struct",24,"name")="jnlpool_ctl_struct.gtmrecv_pid"
-	Set gtmtypes("jnlpool_ctl_struct",24,"off")=416
+	Set gtmtypfldindx("jnlpool_ctl_struct","this_side.trigger_supported")=22
+	Set gtmtypes("jnlpool_ctl_struct",23,"name")="jnlpool_ctl_struct.this_side.cross_endian"
+	Set gtmtypes("jnlpool_ctl_struct",23,"off")=512
+	Set gtmtypes("jnlpool_ctl_struct",23,"len")=4
+	Set gtmtypes("jnlpool_ctl_struct",23,"type")="boolean_t"
+	Set gtmtypfldindx("jnlpool_ctl_struct","this_side.cross_endian")=23
+	Set gtmtypes("jnlpool_ctl_struct",24,"name")="jnlpool_ctl_struct.this_side.endianness_known"
+	Set gtmtypes("jnlpool_ctl_struct",24,"off")=516
 	Set gtmtypes("jnlpool_ctl_struct",24,"len")=4
-	Set gtmtypes("jnlpool_ctl_struct",24,"type")="unsigned-int"
-	Set gtmtypfldindx("jnlpool_ctl_struct","gtmrecv_pid")=24
-	Set gtmtypes("jnlpool_ctl_struct",25,"name")="jnlpool_ctl_struct.prev_jnlseqno_time"
-	Set gtmtypes("jnlpool_ctl_struct",25,"off")=420
+	Set gtmtypes("jnlpool_ctl_struct",24,"type")="boolean_t"
+	Set gtmtypfldindx("jnlpool_ctl_struct","this_side.endianness_known")=24
+	Set gtmtypes("jnlpool_ctl_struct",25,"name")="jnlpool_ctl_struct.this_side.null_subs_xform"
+	Set gtmtypes("jnlpool_ctl_struct",25,"off")=520
 	Set gtmtypes("jnlpool_ctl_struct",25,"len")=4
-	Set gtmtypes("jnlpool_ctl_struct",25,"type")="unsigned-int"
-	Set gtmtypfldindx("jnlpool_ctl_struct","prev_jnlseqno_time")=25
-	Set gtmtypes("jnlpool_ctl_struct",26,"name")="jnlpool_ctl_struct.pool_initialized"
-	Set gtmtypes("jnlpool_ctl_struct",26,"off")=424
+	Set gtmtypes("jnlpool_ctl_struct",25,"type")="boolean_t"
+	Set gtmtypfldindx("jnlpool_ctl_struct","this_side.null_subs_xform")=25
+	Set gtmtypes("jnlpool_ctl_struct",26,"name")="jnlpool_ctl_struct.this_side.is_supplementary"
+	Set gtmtypes("jnlpool_ctl_struct",26,"off")=524
 	Set gtmtypes("jnlpool_ctl_struct",26,"len")=4
 	Set gtmtypes("jnlpool_ctl_struct",26,"type")="boolean_t"
-	Set gtmtypfldindx("jnlpool_ctl_struct","pool_initialized")=26
-	Set gtmtypes("jnlpool_ctl_struct",27,"name")="jnlpool_ctl_struct.jnlpool_creator_pid"
-	Set gtmtypes("jnlpool_ctl_struct",27,"off")=428
+	Set gtmtypfldindx("jnlpool_ctl_struct","this_side.is_supplementary")=26
+	Set gtmtypes("jnlpool_ctl_struct",27,"name")="jnlpool_ctl_struct.this_side.tls_requested"
+	Set gtmtypes("jnlpool_ctl_struct",27,"off")=528
 	Set gtmtypes("jnlpool_ctl_struct",27,"len")=4
-	Set gtmtypes("jnlpool_ctl_struct",27,"type")="unsigned-int"
-	Set gtmtypfldindx("jnlpool_ctl_struct","jnlpool_creator_pid")=27
-	Set gtmtypes("jnlpool_ctl_struct",28,"name")="jnlpool_ctl_struct.this_side"
-	Set gtmtypes("jnlpool_ctl_struct",28,"off")=432
-	Set gtmtypes("jnlpool_ctl_struct",28,"len")=48
-	Set gtmtypes("jnlpool_ctl_struct",28,"type")="repl_conn_info_t"
-	Set gtmtypfldindx("jnlpool_ctl_struct","this_side")=28
-	Set gtmtypes("jnlpool_ctl_struct",29,"name")="jnlpool_ctl_struct.this_side.proto_ver"
-	Set gtmtypes("jnlpool_ctl_struct",29,"off")=432
-	Set gtmtypes("jnlpool_ctl_struct",29,"len")=4
-	Set gtmtypes("jnlpool_ctl_struct",29,"type")="int"
-	Set gtmtypfldindx("jnlpool_ctl_struct","this_side.proto_ver")=29
-	Set gtmtypes("jnlpool_ctl_struct",30,"name")="jnlpool_ctl_struct.this_side.jnl_ver"
-	Set gtmtypes("jnlpool_ctl_struct",30,"off")=436
-	Set gtmtypes("jnlpool_ctl_struct",30,"len")=4
-	Set gtmtypes("jnlpool_ctl_struct",30,"type")="unsigned-int"
-	Set gtmtypfldindx("jnlpool_ctl_struct","this_side.jnl_ver")=30
-	Set gtmtypes("jnlpool_ctl_struct",31,"name")="jnlpool_ctl_struct.this_side.is_std_null_coll"
-	Set gtmtypes("jnlpool_ctl_struct",31,"off")=440
+	Set gtmtypes("jnlpool_ctl_struct",27,"type")="boolean_t"
+	Set gtmtypfldindx("jnlpool_ctl_struct","this_side.tls_requested")=27
+	Set gtmtypes("jnlpool_ctl_struct",28,"name")="jnlpool_ctl_struct.this_side.filler_16"
+	Set gtmtypes("jnlpool_ctl_struct",28,"off")=532
+	Set gtmtypes("jnlpool_ctl_struct",28,"len")=12
+	Set gtmtypes("jnlpool_ctl_struct",28,"type")="char"
+	Set gtmtypfldindx("jnlpool_ctl_struct","this_side.filler_16")=28
+	Set gtmtypes("jnlpool_ctl_struct",29,"name")="jnlpool_ctl_struct.write_addr"
+	Set gtmtypes("jnlpool_ctl_struct",29,"off")=544
+	Set gtmtypes("jnlpool_ctl_struct",29,"len")=8
+	Set gtmtypes("jnlpool_ctl_struct",29,"type")="uint64_t"
+	Set gtmtypfldindx("jnlpool_ctl_struct","write_addr")=29
+	Set gtmtypes("jnlpool_ctl_struct",30,"name")="jnlpool_ctl_struct.rsrv_write_addr"
+	Set gtmtypes("jnlpool_ctl_struct",30,"off")=552
+	Set gtmtypes("jnlpool_ctl_struct",30,"len")=8
+	Set gtmtypes("jnlpool_ctl_struct",30,"type")="uint64_t"
+	Set gtmtypfldindx("jnlpool_ctl_struct","rsrv_write_addr")=30
+	Set gtmtypes("jnlpool_ctl_struct",31,"name")="jnlpool_ctl_struct.upd_disabled"
+	Set gtmtypes("jnlpool_ctl_struct",31,"off")=560
 	Set gtmtypes("jnlpool_ctl_struct",31,"len")=4
 	Set gtmtypes("jnlpool_ctl_struct",31,"type")="boolean_t"
-	Set gtmtypfldindx("jnlpool_ctl_struct","this_side.is_std_null_coll")=31
-	Set gtmtypes("jnlpool_ctl_struct",32,"name")="jnlpool_ctl_struct.this_side.trigger_supported"
-	Set gtmtypes("jnlpool_ctl_struct",32,"off")=444
+	Set gtmtypfldindx("jnlpool_ctl_struct","upd_disabled")=31
+	Set gtmtypes("jnlpool_ctl_struct",32,"name")="jnlpool_ctl_struct.lastwrite_len"
+	Set gtmtypes("jnlpool_ctl_struct",32,"off")=564
 	Set gtmtypes("jnlpool_ctl_struct",32,"len")=4
-	Set gtmtypes("jnlpool_ctl_struct",32,"type")="boolean_t"
-	Set gtmtypfldindx("jnlpool_ctl_struct","this_side.trigger_supported")=32
-	Set gtmtypes("jnlpool_ctl_struct",33,"name")="jnlpool_ctl_struct.this_side.cross_endian"
-	Set gtmtypes("jnlpool_ctl_struct",33,"off")=448
+	Set gtmtypes("jnlpool_ctl_struct",32,"type")="unsigned-int"
+	Set gtmtypfldindx("jnlpool_ctl_struct","lastwrite_len")=32
+	Set gtmtypes("jnlpool_ctl_struct",33,"name")="jnlpool_ctl_struct.send_losttn_complete"
+	Set gtmtypes("jnlpool_ctl_struct",33,"off")=568
 	Set gtmtypes("jnlpool_ctl_struct",33,"len")=4
 	Set gtmtypes("jnlpool_ctl_struct",33,"type")="boolean_t"
-	Set gtmtypfldindx("jnlpool_ctl_struct","this_side.cross_endian")=33
-	Set gtmtypes("jnlpool_ctl_struct",34,"name")="jnlpool_ctl_struct.this_side.endianness_known"
-	Set gtmtypes("jnlpool_ctl_struct",34,"off")=452
-	Set gtmtypes("jnlpool_ctl_struct",34,"len")=4
-	Set gtmtypes("jnlpool_ctl_struct",34,"type")="boolean_t"
-	Set gtmtypfldindx("jnlpool_ctl_struct","this_side.endianness_known")=34
-	Set gtmtypes("jnlpool_ctl_struct",35,"name")="jnlpool_ctl_struct.this_side.null_subs_xform"
-	Set gtmtypes("jnlpool_ctl_struct",35,"off")=456
+	Set gtmtypfldindx("jnlpool_ctl_struct","send_losttn_complete")=33
+	Set gtmtypes("jnlpool_ctl_struct",34,"name")="jnlpool_ctl_struct.primary_instname"
+	Set gtmtypes("jnlpool_ctl_struct",34,"off")=572
+	Set gtmtypes("jnlpool_ctl_struct",34,"len")=16
+	Set gtmtypes("jnlpool_ctl_struct",34,"type")="unsigned-char"
+	Set gtmtypfldindx("jnlpool_ctl_struct","primary_instname")=34
+	Set gtmtypes("jnlpool_ctl_struct",35,"name")="jnlpool_ctl_struct.gtmrecv_pid"
+	Set gtmtypes("jnlpool_ctl_struct",35,"off")=588
 	Set gtmtypes("jnlpool_ctl_struct",35,"len")=4
-	Set gtmtypes("jnlpool_ctl_struct",35,"type")="boolean_t"
-	Set gtmtypfldindx("jnlpool_ctl_struct","this_side.null_subs_xform")=35
-	Set gtmtypes("jnlpool_ctl_struct",36,"name")="jnlpool_ctl_struct.this_side.is_supplementary"
-	Set gtmtypes("jnlpool_ctl_struct",36,"off")=460
+	Set gtmtypes("jnlpool_ctl_struct",35,"type")="unsigned-int"
+	Set gtmtypfldindx("jnlpool_ctl_struct","gtmrecv_pid")=35
+	Set gtmtypes("jnlpool_ctl_struct",36,"name")="jnlpool_ctl_struct.prev_jnlseqno_time"
+	Set gtmtypes("jnlpool_ctl_struct",36,"off")=592
 	Set gtmtypes("jnlpool_ctl_struct",36,"len")=4
-	Set gtmtypes("jnlpool_ctl_struct",36,"type")="boolean_t"
-	Set gtmtypfldindx("jnlpool_ctl_struct","this_side.is_supplementary")=36
-	Set gtmtypes("jnlpool_ctl_struct",37,"name")="jnlpool_ctl_struct.this_side.tls_requested"
-	Set gtmtypes("jnlpool_ctl_struct",37,"off")=464
+	Set gtmtypes("jnlpool_ctl_struct",36,"type")="unsigned-int"
+	Set gtmtypfldindx("jnlpool_ctl_struct","prev_jnlseqno_time")=36
+	Set gtmtypes("jnlpool_ctl_struct",37,"name")="jnlpool_ctl_struct.pool_initialized"
+	Set gtmtypes("jnlpool_ctl_struct",37,"off")=596
 	Set gtmtypes("jnlpool_ctl_struct",37,"len")=4
 	Set gtmtypes("jnlpool_ctl_struct",37,"type")="boolean_t"
-	Set gtmtypfldindx("jnlpool_ctl_struct","this_side.tls_requested")=37
-	Set gtmtypes("jnlpool_ctl_struct",38,"name")="jnlpool_ctl_struct.this_side.filler_16"
-	Set gtmtypes("jnlpool_ctl_struct",38,"off")=468
-	Set gtmtypes("jnlpool_ctl_struct",38,"len")=12
-	Set gtmtypes("jnlpool_ctl_struct",38,"type")="char"
-	Set gtmtypfldindx("jnlpool_ctl_struct","this_side.filler_16")=38
-	Set gtmtypes("jnlpool_ctl_struct",39,"name")="jnlpool_ctl_struct.strm_seqno"
-	Set gtmtypes("jnlpool_ctl_struct",39,"off")=480
-	Set gtmtypes("jnlpool_ctl_struct",39,"len")=128
-	Set gtmtypes("jnlpool_ctl_struct",39,"type")="uint64_t"
-	Set gtmtypfldindx("jnlpool_ctl_struct","strm_seqno")=39
-	Set gtmtypes("jnlpool_ctl_struct",39,"dim")=16
-	Set gtmtypes("jnlpool_ctl_struct",40,"name")="jnlpool_ctl_struct.onln_rlbk_pid"
+	Set gtmtypfldindx("jnlpool_ctl_struct","pool_initialized")=37
+	Set gtmtypes("jnlpool_ctl_struct",38,"name")="jnlpool_ctl_struct.jnlpool_creator_pid"
+	Set gtmtypes("jnlpool_ctl_struct",38,"off")=600
+	Set gtmtypes("jnlpool_ctl_struct",38,"len")=4
+	Set gtmtypes("jnlpool_ctl_struct",38,"type")="unsigned-int"
+	Set gtmtypfldindx("jnlpool_ctl_struct","jnlpool_creator_pid")=38
+	Set gtmtypes("jnlpool_ctl_struct",39,"name")="jnlpool_ctl_struct.onln_rlbk_pid"
+	Set gtmtypes("jnlpool_ctl_struct",39,"off")=604
+	Set gtmtypes("jnlpool_ctl_struct",39,"len")=4
+	Set gtmtypes("jnlpool_ctl_struct",39,"type")="unsigned-int"
+	Set gtmtypfldindx("jnlpool_ctl_struct","onln_rlbk_pid")=39
+	Set gtmtypes("jnlpool_ctl_struct",40,"name")="jnlpool_ctl_struct.onln_rlbk_cycle"
 	Set gtmtypes("jnlpool_ctl_struct",40,"off")=608
 	Set gtmtypes("jnlpool_ctl_struct",40,"len")=4
 	Set gtmtypes("jnlpool_ctl_struct",40,"type")="unsigned-int"
-	Set gtmtypfldindx("jnlpool_ctl_struct","onln_rlbk_pid")=40
-	Set gtmtypes("jnlpool_ctl_struct",41,"name")="jnlpool_ctl_struct.onln_rlbk_cycle"
+	Set gtmtypfldindx("jnlpool_ctl_struct","onln_rlbk_cycle")=40
+	Set gtmtypes("jnlpool_ctl_struct",41,"name")="jnlpool_ctl_struct.freeze"
 	Set gtmtypes("jnlpool_ctl_struct",41,"off")=612
 	Set gtmtypes("jnlpool_ctl_struct",41,"len")=4
-	Set gtmtypes("jnlpool_ctl_struct",41,"type")="unsigned-int"
-	Set gtmtypfldindx("jnlpool_ctl_struct","onln_rlbk_cycle")=41
-	Set gtmtypes("jnlpool_ctl_struct",42,"name")="jnlpool_ctl_struct.freeze"
+	Set gtmtypes("jnlpool_ctl_struct",41,"type")="boolean_t"
+	Set gtmtypfldindx("jnlpool_ctl_struct","freeze")=41
+	Set gtmtypes("jnlpool_ctl_struct",42,"name")="jnlpool_ctl_struct.freeze_comment"
 	Set gtmtypes("jnlpool_ctl_struct",42,"off")=616
-	Set gtmtypes("jnlpool_ctl_struct",42,"len")=4
-	Set gtmtypes("jnlpool_ctl_struct",42,"type")="boolean_t"
-	Set gtmtypfldindx("jnlpool_ctl_struct","freeze")=42
-	Set gtmtypes("jnlpool_ctl_struct",43,"name")="jnlpool_ctl_struct.freeze_comment"
-	Set gtmtypes("jnlpool_ctl_struct",43,"off")=620
-	Set gtmtypes("jnlpool_ctl_struct",43,"len")=1024
-	Set gtmtypes("jnlpool_ctl_struct",43,"type")="char"
-	Set gtmtypfldindx("jnlpool_ctl_struct","freeze_comment")=43
-	Set gtmtypes("jnlpool_ctl_struct",44,"name")="jnlpool_ctl_struct.instfreeze_environ_inited"
+	Set gtmtypes("jnlpool_ctl_struct",42,"len")=1024
+	Set gtmtypes("jnlpool_ctl_struct",42,"type")="char"
+	Set gtmtypfldindx("jnlpool_ctl_struct","freeze_comment")=42
+	Set gtmtypes("jnlpool_ctl_struct",43,"name")="jnlpool_ctl_struct.instfreeze_environ_inited"
+	Set gtmtypes("jnlpool_ctl_struct",43,"off")=1640
+	Set gtmtypes("jnlpool_ctl_struct",43,"len")=4
+	Set gtmtypes("jnlpool_ctl_struct",43,"type")="boolean_t"
+	Set gtmtypfldindx("jnlpool_ctl_struct","instfreeze_environ_inited")=43
+	Set gtmtypes("jnlpool_ctl_struct",44,"name")="jnlpool_ctl_struct.merrors_array"
 	Set gtmtypes("jnlpool_ctl_struct",44,"off")=1644
-	Set gtmtypes("jnlpool_ctl_struct",44,"len")=4
-	Set gtmtypes("jnlpool_ctl_struct",44,"type")="boolean_t"
-	Set gtmtypfldindx("jnlpool_ctl_struct","instfreeze_environ_inited")=44
-	Set gtmtypes("jnlpool_ctl_struct",45,"name")="jnlpool_ctl_struct.merrors_array"
-	Set gtmtypes("jnlpool_ctl_struct",45,"off")=1648
-	Set gtmtypes("jnlpool_ctl_struct",45,"len")=2048
-	Set gtmtypes("jnlpool_ctl_struct",45,"type")="unsigned-char"
-	Set gtmtypfldindx("jnlpool_ctl_struct","merrors_array")=45
-	Set gtmtypes("jnlpool_ctl_struct",46,"name")="jnlpool_ctl_struct.outofsync_core_generated"
+	Set gtmtypes("jnlpool_ctl_struct",44,"len")=2048
+	Set gtmtypes("jnlpool_ctl_struct",44,"type")="unsigned-char"
+	Set gtmtypfldindx("jnlpool_ctl_struct","merrors_array")=44
+	Set gtmtypes("jnlpool_ctl_struct",45,"name")="jnlpool_ctl_struct.ftok_counter_halted"
+	Set gtmtypes("jnlpool_ctl_struct",45,"off")=3692
+	Set gtmtypes("jnlpool_ctl_struct",45,"len")=4
+	Set gtmtypes("jnlpool_ctl_struct",45,"type")="boolean_t"
+	Set gtmtypfldindx("jnlpool_ctl_struct","ftok_counter_halted")=45
+	Set gtmtypes("jnlpool_ctl_struct",46,"name")="jnlpool_ctl_struct.phase2_commit_index1"
 	Set gtmtypes("jnlpool_ctl_struct",46,"off")=3696
 	Set gtmtypes("jnlpool_ctl_struct",46,"len")=4
-	Set gtmtypes("jnlpool_ctl_struct",46,"type")="boolean_t"
-	Set gtmtypfldindx("jnlpool_ctl_struct","outofsync_core_generated")=46
-	Set gtmtypes("jnlpool_ctl_struct",47,"name")="jnlpool_ctl_struct.ftok_counter_halted"
+	Set gtmtypes("jnlpool_ctl_struct",46,"type")="unsigned-int"
+	Set gtmtypfldindx("jnlpool_ctl_struct","phase2_commit_index1")=46
+	Set gtmtypes("jnlpool_ctl_struct",47,"name")="jnlpool_ctl_struct.phase2_commit_index2"
 	Set gtmtypes("jnlpool_ctl_struct",47,"off")=3700
 	Set gtmtypes("jnlpool_ctl_struct",47,"len")=4
-	Set gtmtypes("jnlpool_ctl_struct",47,"type")="boolean_t"
-	Set gtmtypfldindx("jnlpool_ctl_struct","ftok_counter_halted")=47
-	Set gtmtypes("jnlpool_ctl_struct",48,"name")="jnlpool_ctl_struct.filler_16bytealign"
+	Set gtmtypes("jnlpool_ctl_struct",47,"type")="unsigned-int"
+	Set gtmtypfldindx("jnlpool_ctl_struct","phase2_commit_index2")=47
+	Set gtmtypes("jnlpool_ctl_struct",48,"name")="jnlpool_ctl_struct.filler_16bytealign1"
 	Set gtmtypes("jnlpool_ctl_struct",48,"off")=3704
 	Set gtmtypes("jnlpool_ctl_struct",48,"len")=8
 	Set gtmtypes("jnlpool_ctl_struct",48,"type")="char"
-	Set gtmtypfldindx("jnlpool_ctl_struct","filler_16bytealign")=48
-	;
-	Set gtmtypes("jnlpool_write_ctx_t")="struct"
-	Set gtmtypes("jnlpool_write_ctx_t",0)=2
-	Set gtmtypes("jnlpool_write_ctx_t","len")=8
-	Set gtmtypes("jnlpool_write_ctx_t",1,"name")="jnlpool_write_ctx_t.write"
-	Set gtmtypes("jnlpool_write_ctx_t",1,"off")=0
-	Set gtmtypes("jnlpool_write_ctx_t",1,"len")=4
-	Set gtmtypes("jnlpool_write_ctx_t",1,"type")="unsigned-int"
-	Set gtmtypfldindx("jnlpool_write_ctx_t","write")=1
-	Set gtmtypes("jnlpool_write_ctx_t",2,"name")="jnlpool_write_ctx_t.write_total"
-	Set gtmtypes("jnlpool_write_ctx_t",2,"off")=4
-	Set gtmtypes("jnlpool_write_ctx_t",2,"len")=4
-	Set gtmtypes("jnlpool_write_ctx_t",2,"type")="unsigned-int"
-	Set gtmtypfldindx("jnlpool_write_ctx_t","write_total")=2
+	Set gtmtypfldindx("jnlpool_ctl_struct","filler_16bytealign1")=48
+	Set gtmtypes("jnlpool_ctl_struct",49,"name")="jnlpool_ctl_struct.jnl_pool_write_sleep"
+	Set gtmtypes("jnlpool_ctl_struct",49,"off")=3712
+	Set gtmtypes("jnlpool_ctl_struct",49,"len")=16
+	Set gtmtypes("jnlpool_ctl_struct",49,"type")="jpl_trc_rec_t"
+	Set gtmtypfldindx("jnlpool_ctl_struct","jnl_pool_write_sleep")=49
+	Set gtmtypes("jnlpool_ctl_struct",50,"name")="jnlpool_ctl_struct.jnl_pool_write_sleep.cntr"
+	Set gtmtypes("jnlpool_ctl_struct",50,"off")=3712
+	Set gtmtypes("jnlpool_ctl_struct",50,"len")=8
+	Set gtmtypes("jnlpool_ctl_struct",50,"type")="uint64_t"
+	Set gtmtypfldindx("jnlpool_ctl_struct","jnl_pool_write_sleep.cntr")=50
+	Set gtmtypes("jnlpool_ctl_struct",51,"name")="jnlpool_ctl_struct.jnl_pool_write_sleep.seqno"
+	Set gtmtypes("jnlpool_ctl_struct",51,"off")=3720
+	Set gtmtypes("jnlpool_ctl_struct",51,"len")=8
+	Set gtmtypes("jnlpool_ctl_struct",51,"type")="uint64_t"
+	Set gtmtypfldindx("jnlpool_ctl_struct","jnl_pool_write_sleep.seqno")=51
+	Set gtmtypes("jnlpool_ctl_struct",52,"name")="jnlpool_ctl_struct.repl_phs2cmt_arrayfull_sleep"
+	Set gtmtypes("jnlpool_ctl_struct",52,"off")=3728
+	Set gtmtypes("jnlpool_ctl_struct",52,"len")=16
+	Set gtmtypes("jnlpool_ctl_struct",52,"type")="jpl_trc_rec_t"
+	Set gtmtypfldindx("jnlpool_ctl_struct","repl_phs2cmt_arrayfull_sleep")=52
+	Set gtmtypes("jnlpool_ctl_struct",53,"name")="jnlpool_ctl_struct.repl_phs2cmt_arrayfull_sleep.cntr"
+	Set gtmtypes("jnlpool_ctl_struct",53,"off")=3728
+	Set gtmtypes("jnlpool_ctl_struct",53,"len")=8
+	Set gtmtypes("jnlpool_ctl_struct",53,"type")="uint64_t"
+	Set gtmtypfldindx("jnlpool_ctl_struct","repl_phs2cmt_arrayfull_sleep.cntr")=53
+	Set gtmtypes("jnlpool_ctl_struct",54,"name")="jnlpool_ctl_struct.repl_phs2cmt_arrayfull_sleep.seqno"
+	Set gtmtypes("jnlpool_ctl_struct",54,"off")=3736
+	Set gtmtypes("jnlpool_ctl_struct",54,"len")=8
+	Set gtmtypes("jnlpool_ctl_struct",54,"type")="uint64_t"
+	Set gtmtypfldindx("jnlpool_ctl_struct","repl_phs2cmt_arrayfull_sleep.seqno")=54
+	Set gtmtypes("jnlpool_ctl_struct",55,"name")="jnlpool_ctl_struct.repl_phase2_cleanup_isprcalv"
+	Set gtmtypes("jnlpool_ctl_struct",55,"off")=3744
+	Set gtmtypes("jnlpool_ctl_struct",55,"len")=16
+	Set gtmtypes("jnlpool_ctl_struct",55,"type")="jpl_trc_rec_t"
+	Set gtmtypfldindx("jnlpool_ctl_struct","repl_phase2_cleanup_isprcalv")=55
+	Set gtmtypes("jnlpool_ctl_struct",56,"name")="jnlpool_ctl_struct.repl_phase2_cleanup_isprcalv.cntr"
+	Set gtmtypes("jnlpool_ctl_struct",56,"off")=3744
+	Set gtmtypes("jnlpool_ctl_struct",56,"len")=8
+	Set gtmtypes("jnlpool_ctl_struct",56,"type")="uint64_t"
+	Set gtmtypfldindx("jnlpool_ctl_struct","repl_phase2_cleanup_isprcalv.cntr")=56
+	Set gtmtypes("jnlpool_ctl_struct",57,"name")="jnlpool_ctl_struct.repl_phase2_cleanup_isprcalv.seqno"
+	Set gtmtypes("jnlpool_ctl_struct",57,"off")=3752
+	Set gtmtypes("jnlpool_ctl_struct",57,"len")=8
+	Set gtmtypes("jnlpool_ctl_struct",57,"type")="uint64_t"
+	Set gtmtypfldindx("jnlpool_ctl_struct","repl_phase2_cleanup_isprcalv.seqno")=57
+	Set gtmtypes("jnlpool_ctl_struct",58,"name")="jnlpool_ctl_struct.phase2_commit_array"
+	Set gtmtypes("jnlpool_ctl_struct",58,"off")=3760
+	Set gtmtypes("jnlpool_ctl_struct",58,"len")=655360
+	Set gtmtypes("jnlpool_ctl_struct",58,"type")="jpl_phase2_in_prog_t"
+	Set gtmtypfldindx("jnlpool_ctl_struct","phase2_commit_array")=58
+	Set gtmtypes("jnlpool_ctl_struct",58,"dim")=16384
+	Set gtmtypes("jnlpool_ctl_struct",59,"name")="jnlpool_ctl_struct.phase2_commit_array[0].jnl_seqno"
+	Set gtmtypes("jnlpool_ctl_struct",59,"off")=3760
+	Set gtmtypes("jnlpool_ctl_struct",59,"len")=8
+	Set gtmtypes("jnlpool_ctl_struct",59,"type")="uint64_t"
+	Set gtmtypfldindx("jnlpool_ctl_struct","phase2_commit_array[0].jnl_seqno")=59
+	Set gtmtypes("jnlpool_ctl_struct",60,"name")="jnlpool_ctl_struct.phase2_commit_array[0].strm_seqno"
+	Set gtmtypes("jnlpool_ctl_struct",60,"off")=3768
+	Set gtmtypes("jnlpool_ctl_struct",60,"len")=8
+	Set gtmtypes("jnlpool_ctl_struct",60,"type")="uint64_t"
+	Set gtmtypfldindx("jnlpool_ctl_struct","phase2_commit_array[0].strm_seqno")=60
+	Set gtmtypes("jnlpool_ctl_struct",61,"name")="jnlpool_ctl_struct.phase2_commit_array[0].start_write_addr"
+	Set gtmtypes("jnlpool_ctl_struct",61,"off")=3776
+	Set gtmtypes("jnlpool_ctl_struct",61,"len")=8
+	Set gtmtypes("jnlpool_ctl_struct",61,"type")="uint64_t"
+	Set gtmtypfldindx("jnlpool_ctl_struct","phase2_commit_array[0].start_write_addr")=61
+	Set gtmtypes("jnlpool_ctl_struct",62,"name")="jnlpool_ctl_struct.phase2_commit_array[0].process_id"
+	Set gtmtypes("jnlpool_ctl_struct",62,"off")=3784
+	Set gtmtypes("jnlpool_ctl_struct",62,"len")=4
+	Set gtmtypes("jnlpool_ctl_struct",62,"type")="unsigned-int"
+	Set gtmtypfldindx("jnlpool_ctl_struct","phase2_commit_array[0].process_id")=62
+	Set gtmtypes("jnlpool_ctl_struct",63,"name")="jnlpool_ctl_struct.phase2_commit_array[0].tot_jrec_len"
+	Set gtmtypes("jnlpool_ctl_struct",63,"off")=3788
+	Set gtmtypes("jnlpool_ctl_struct",63,"len")=4
+	Set gtmtypes("jnlpool_ctl_struct",63,"type")="unsigned-int"
+	Set gtmtypfldindx("jnlpool_ctl_struct","phase2_commit_array[0].tot_jrec_len")=63
+	Set gtmtypes("jnlpool_ctl_struct",64,"name")="jnlpool_ctl_struct.phase2_commit_array[0].prev_jrec_len"
+	Set gtmtypes("jnlpool_ctl_struct",64,"off")=3792
+	Set gtmtypes("jnlpool_ctl_struct",64,"len")=4
+	Set gtmtypes("jnlpool_ctl_struct",64,"type")="unsigned-int"
+	Set gtmtypfldindx("jnlpool_ctl_struct","phase2_commit_array[0].prev_jrec_len")=64
+	Set gtmtypes("jnlpool_ctl_struct",65,"name")="jnlpool_ctl_struct.phase2_commit_array[0].write_complete"
+	Set gtmtypes("jnlpool_ctl_struct",65,"off")=3796
+	Set gtmtypes("jnlpool_ctl_struct",65,"len")=4
+	Set gtmtypes("jnlpool_ctl_struct",65,"type")="boolean_t"
+	Set gtmtypfldindx("jnlpool_ctl_struct","phase2_commit_array[0].write_complete")=65
+	Set gtmtypes("jnlpool_ctl_struct",66,"name")="jnlpool_ctl_struct.fill_cacheline0"
+	Set gtmtypes("jnlpool_ctl_struct",66,"off")=659120
+	Set gtmtypes("jnlpool_ctl_struct",66,"len")=24
+	Set gtmtypes("jnlpool_ctl_struct",66,"type")="char"
+	Set gtmtypfldindx("jnlpool_ctl_struct","fill_cacheline0")=66
+	Set gtmtypes("jnlpool_ctl_struct",67,"name")="jnlpool_ctl_struct.phase2_commit_latch"
+	Set gtmtypes("jnlpool_ctl_struct",67,"off")=659144
+	Set gtmtypes("jnlpool_ctl_struct",67,"len")=8
+	Set gtmtypes("jnlpool_ctl_struct",67,"type")="global_latch_t"
+	Set gtmtypfldindx("jnlpool_ctl_struct","phase2_commit_latch")=67
+	Set gtmtypes("jnlpool_ctl_struct",68,"name")="jnlpool_ctl_struct.phase2_commit_latch.u"
+	Set gtmtypes("jnlpool_ctl_struct",68,"off")=659144
+	Set gtmtypes("jnlpool_ctl_struct",68,"len")=8
+	Set gtmtypes("jnlpool_ctl_struct",68,"type")="union"
+	Set gtmtypfldindx("jnlpool_ctl_struct","phase2_commit_latch.u")=68
+	Set gtmtypes("jnlpool_ctl_struct",69,"name")="jnlpool_ctl_struct.phase2_commit_latch.u.pid_imgcnt"
+	Set gtmtypes("jnlpool_ctl_struct",69,"off")=659144
+	Set gtmtypes("jnlpool_ctl_struct",69,"len")=8
+	Set gtmtypes("jnlpool_ctl_struct",69,"type")="uint64_t"
+	Set gtmtypfldindx("jnlpool_ctl_struct","phase2_commit_latch.u.pid_imgcnt")=69
+	Set gtmtypes("jnlpool_ctl_struct",70,"name")="jnlpool_ctl_struct.phase2_commit_latch.u.parts"
+	Set gtmtypes("jnlpool_ctl_struct",70,"off")=659144
+	Set gtmtypes("jnlpool_ctl_struct",70,"len")=8
+	Set gtmtypes("jnlpool_ctl_struct",70,"type")="struct"
+	Set gtmtypfldindx("jnlpool_ctl_struct","phase2_commit_latch.u.parts")=70
+	Set gtmtypes("jnlpool_ctl_struct",71,"name")="jnlpool_ctl_struct.phase2_commit_latch.u.parts.latch_pid"
+	Set gtmtypes("jnlpool_ctl_struct",71,"off")=659144
+	Set gtmtypes("jnlpool_ctl_struct",71,"len")=4
+	Set gtmtypes("jnlpool_ctl_struct",71,"type")="int"
+	Set gtmtypfldindx("jnlpool_ctl_struct","phase2_commit_latch.u.parts.latch_pid")=71
+	Set gtmtypes("jnlpool_ctl_struct",72,"name")="jnlpool_ctl_struct.phase2_commit_latch.u.parts.latch_word"
+	Set gtmtypes("jnlpool_ctl_struct",72,"off")=659148
+	Set gtmtypes("jnlpool_ctl_struct",72,"len")=4
+	Set gtmtypes("jnlpool_ctl_struct",72,"type")="int"
+	Set gtmtypfldindx("jnlpool_ctl_struct","phase2_commit_latch.u.parts.latch_word")=72
 	;
 	Set gtmtypes("job_arg_msg")="struct"
 	Set gtmtypes("job_arg_msg",0)=2
@@ -12328,6 +12695,103 @@ Init
 	Set gtmtypes("joberr_msg",2,"type")="int"
 	Set gtmtypfldindx("joberr_msg","len")=2
 	;
+	Set gtmtypes("jpl_phase2_in_prog_t")="struct"
+	Set gtmtypes("jpl_phase2_in_prog_t",0)=7
+	Set gtmtypes("jpl_phase2_in_prog_t","len")=40
+	Set gtmtypes("jpl_phase2_in_prog_t",1,"name")="jpl_phase2_in_prog_t.jnl_seqno"
+	Set gtmtypes("jpl_phase2_in_prog_t",1,"off")=0
+	Set gtmtypes("jpl_phase2_in_prog_t",1,"len")=8
+	Set gtmtypes("jpl_phase2_in_prog_t",1,"type")="uint64_t"
+	Set gtmtypfldindx("jpl_phase2_in_prog_t","jnl_seqno")=1
+	Set gtmtypes("jpl_phase2_in_prog_t",2,"name")="jpl_phase2_in_prog_t.strm_seqno"
+	Set gtmtypes("jpl_phase2_in_prog_t",2,"off")=8
+	Set gtmtypes("jpl_phase2_in_prog_t",2,"len")=8
+	Set gtmtypes("jpl_phase2_in_prog_t",2,"type")="uint64_t"
+	Set gtmtypfldindx("jpl_phase2_in_prog_t","strm_seqno")=2
+	Set gtmtypes("jpl_phase2_in_prog_t",3,"name")="jpl_phase2_in_prog_t.start_write_addr"
+	Set gtmtypes("jpl_phase2_in_prog_t",3,"off")=16
+	Set gtmtypes("jpl_phase2_in_prog_t",3,"len")=8
+	Set gtmtypes("jpl_phase2_in_prog_t",3,"type")="uint64_t"
+	Set gtmtypfldindx("jpl_phase2_in_prog_t","start_write_addr")=3
+	Set gtmtypes("jpl_phase2_in_prog_t",4,"name")="jpl_phase2_in_prog_t.process_id"
+	Set gtmtypes("jpl_phase2_in_prog_t",4,"off")=24
+	Set gtmtypes("jpl_phase2_in_prog_t",4,"len")=4
+	Set gtmtypes("jpl_phase2_in_prog_t",4,"type")="unsigned-int"
+	Set gtmtypfldindx("jpl_phase2_in_prog_t","process_id")=4
+	Set gtmtypes("jpl_phase2_in_prog_t",5,"name")="jpl_phase2_in_prog_t.tot_jrec_len"
+	Set gtmtypes("jpl_phase2_in_prog_t",5,"off")=28
+	Set gtmtypes("jpl_phase2_in_prog_t",5,"len")=4
+	Set gtmtypes("jpl_phase2_in_prog_t",5,"type")="unsigned-int"
+	Set gtmtypfldindx("jpl_phase2_in_prog_t","tot_jrec_len")=5
+	Set gtmtypes("jpl_phase2_in_prog_t",6,"name")="jpl_phase2_in_prog_t.prev_jrec_len"
+	Set gtmtypes("jpl_phase2_in_prog_t",6,"off")=32
+	Set gtmtypes("jpl_phase2_in_prog_t",6,"len")=4
+	Set gtmtypes("jpl_phase2_in_prog_t",6,"type")="unsigned-int"
+	Set gtmtypfldindx("jpl_phase2_in_prog_t","prev_jrec_len")=6
+	Set gtmtypes("jpl_phase2_in_prog_t",7,"name")="jpl_phase2_in_prog_t.write_complete"
+	Set gtmtypes("jpl_phase2_in_prog_t",7,"off")=36
+	Set gtmtypes("jpl_phase2_in_prog_t",7,"len")=4
+	Set gtmtypes("jpl_phase2_in_prog_t",7,"type")="boolean_t"
+	Set gtmtypfldindx("jpl_phase2_in_prog_t","write_complete")=7
+	;
+	Set gtmtypes("jpl_rsrv_struct_t")="struct"
+	Set gtmtypes("jpl_rsrv_struct_t",0)=8
+	Set gtmtypes("jpl_rsrv_struct_t","len")=40
+	Set gtmtypes("jpl_rsrv_struct_t",1,"name")="jpl_rsrv_struct_t.start_write_addr"
+	Set gtmtypes("jpl_rsrv_struct_t",1,"off")=0
+	Set gtmtypes("jpl_rsrv_struct_t",1,"len")=8
+	Set gtmtypes("jpl_rsrv_struct_t",1,"type")="uint64_t"
+	Set gtmtypfldindx("jpl_rsrv_struct_t","start_write_addr")=1
+	Set gtmtypes("jpl_rsrv_struct_t",2,"name")="jpl_rsrv_struct_t.cur_write_addr"
+	Set gtmtypes("jpl_rsrv_struct_t",2,"off")=8
+	Set gtmtypes("jpl_rsrv_struct_t",2,"len")=8
+	Set gtmtypes("jpl_rsrv_struct_t",2,"type")="uint64_t"
+	Set gtmtypfldindx("jpl_rsrv_struct_t","cur_write_addr")=2
+	Set gtmtypes("jpl_rsrv_struct_t",3,"name")="jpl_rsrv_struct_t.tot_jrec_len"
+	Set gtmtypes("jpl_rsrv_struct_t",3,"off")=16
+	Set gtmtypes("jpl_rsrv_struct_t",3,"len")=4
+	Set gtmtypes("jpl_rsrv_struct_t",3,"type")="unsigned-int"
+	Set gtmtypfldindx("jpl_rsrv_struct_t","tot_jrec_len")=3
+	Set gtmtypes("jpl_rsrv_struct_t",4,"name")="jpl_rsrv_struct_t.write_total"
+	Set gtmtypes("jpl_rsrv_struct_t",4,"off")=20
+	Set gtmtypes("jpl_rsrv_struct_t",4,"len")=4
+	Set gtmtypes("jpl_rsrv_struct_t",4,"type")="unsigned-int"
+	Set gtmtypfldindx("jpl_rsrv_struct_t","write_total")=4
+	Set gtmtypes("jpl_rsrv_struct_t",5,"name")="jpl_rsrv_struct_t.memcpy_skipped"
+	Set gtmtypes("jpl_rsrv_struct_t",5,"off")=24
+	Set gtmtypes("jpl_rsrv_struct_t",5,"len")=4
+	Set gtmtypes("jpl_rsrv_struct_t",5,"type")="boolean_t"
+	Set gtmtypfldindx("jpl_rsrv_struct_t","memcpy_skipped")=5
+	Set gtmtypes("jpl_rsrv_struct_t",6,"name")="jpl_rsrv_struct_t.phase2_commit_index"
+	Set gtmtypes("jpl_rsrv_struct_t",6,"off")=28
+	Set gtmtypes("jpl_rsrv_struct_t",6,"len")=4
+	Set gtmtypes("jpl_rsrv_struct_t",6,"type")="unsigned-int"
+	Set gtmtypfldindx("jpl_rsrv_struct_t","phase2_commit_index")=6
+	Set gtmtypes("jpl_rsrv_struct_t",7,"name")="jpl_rsrv_struct_t.num_tcoms"
+	Set gtmtypes("jpl_rsrv_struct_t",7,"off")=32
+	Set gtmtypes("jpl_rsrv_struct_t",7,"len")=4
+	Set gtmtypes("jpl_rsrv_struct_t",7,"type")="unsigned-int"
+	Set gtmtypfldindx("jpl_rsrv_struct_t","num_tcoms")=7
+	Set gtmtypes("jpl_rsrv_struct_t",8,"name")="jpl_rsrv_struct_t.filler_8byte_align"
+	Set gtmtypes("jpl_rsrv_struct_t",8,"off")=36
+	Set gtmtypes("jpl_rsrv_struct_t",8,"len")=4
+	Set gtmtypes("jpl_rsrv_struct_t",8,"type")="char"
+	Set gtmtypfldindx("jpl_rsrv_struct_t","filler_8byte_align")=8
+	;
+	Set gtmtypes("jpl_trc_rec_t")="struct"
+	Set gtmtypes("jpl_trc_rec_t",0)=2
+	Set gtmtypes("jpl_trc_rec_t","len")=16
+	Set gtmtypes("jpl_trc_rec_t",1,"name")="jpl_trc_rec_t.cntr"
+	Set gtmtypes("jpl_trc_rec_t",1,"off")=0
+	Set gtmtypes("jpl_trc_rec_t",1,"len")=8
+	Set gtmtypes("jpl_trc_rec_t",1,"type")="uint64_t"
+	Set gtmtypfldindx("jpl_trc_rec_t","cntr")=1
+	Set gtmtypes("jpl_trc_rec_t",2,"name")="jpl_trc_rec_t.seqno"
+	Set gtmtypes("jpl_trc_rec_t",2,"off")=8
+	Set gtmtypes("jpl_trc_rec_t",2,"len")=8
+	Set gtmtypes("jpl_trc_rec_t",2,"type")="uint64_t"
+	Set gtmtypfldindx("jpl_trc_rec_t","seqno")=2
+	;
 	Set gtmtypes("jrec_prefix")="struct"
 	Set gtmtypes("jrec_prefix",0)=4
 	Set gtmtypes("jrec_prefix","len")=24
@@ -12352,6 +12816,25 @@ Init
 	Set gtmtypes("jrec_prefix",4,"type")="uint64_t"
 	Set gtmtypfldindx("jrec_prefix","tn")=4
 	;
+	Set gtmtypes("jrec_rsrv_elem_t")="struct"
+	Set gtmtypes("jrec_rsrv_elem_t",0)=3
+	Set gtmtypes("jrec_rsrv_elem_t","len")=12
+	Set gtmtypes("jrec_rsrv_elem_t",1,"name")="jrec_rsrv_elem_t.rectype"
+	Set gtmtypes("jrec_rsrv_elem_t",1,"off")=0
+	Set gtmtypes("jrec_rsrv_elem_t",1,"len")=4
+	Set gtmtypes("jrec_rsrv_elem_t",1,"type")="int"
+	Set gtmtypfldindx("jrec_rsrv_elem_t","rectype")=1
+	Set gtmtypes("jrec_rsrv_elem_t",2,"name")="jrec_rsrv_elem_t.reclen"
+	Set gtmtypes("jrec_rsrv_elem_t",2,"off")=4
+	Set gtmtypes("jrec_rsrv_elem_t",2,"len")=4
+	Set gtmtypes("jrec_rsrv_elem_t",2,"type")="unsigned-int"
+	Set gtmtypfldindx("jrec_rsrv_elem_t","reclen")=2
+	Set gtmtypes("jrec_rsrv_elem_t",3,"name")="jrec_rsrv_elem_t.param1"
+	Set gtmtypes("jrec_rsrv_elem_t",3,"off")=8
+	Set gtmtypes("jrec_rsrv_elem_t",3,"len")=4
+	Set gtmtypes("jrec_rsrv_elem_t",3,"type")="addr"
+	Set gtmtypfldindx("jrec_rsrv_elem_t","param1")=3
+	;
 	Set gtmtypes("key_cum_value")="struct"
 	Set gtmtypes("key_cum_value",0)=11
 	Set gtmtypes("key_cum_value","len")=1076
@@ -13106,6 +13589,362 @@ Init
 	Set gtmtypes("lv_xnew_var",6,"type")="addr"
 	Set gtmtypfldindx("lv_xnew_var","lvval")=6
 	;
+	Set gtmtypes("lvmon_value_ent")="struct"
+	Set gtmtypes("lvmon_value_ent",0)=31
+	Set gtmtypes("lvmon_value_ent","len")=84
+	Set gtmtypes("lvmon_value_ent",1,"name")="lvmon_value_ent.varlvval"
+	Set gtmtypes("lvmon_value_ent",1,"off")=0
+	Set gtmtypes("lvmon_value_ent",1,"len")=68
+	Set gtmtypes("lvmon_value_ent",1,"type")="lv_val"
+	Set gtmtypfldindx("lvmon_value_ent","varlvval")=1
+	Set gtmtypes("lvmon_value_ent",2,"name")="lvmon_value_ent.varlvval.v"
+	Set gtmtypes("lvmon_value_ent",2,"off")=0
+	Set gtmtypes("lvmon_value_ent",2,"len")=32
+	Set gtmtypes("lvmon_value_ent",2,"type")="mval"
+	Set gtmtypfldindx("lvmon_value_ent","varlvval.v")=2
+	Set gtmtypes("lvmon_value_ent",3,"name")="lvmon_value_ent.varlvval.v.mvtype"
+	Set gtmtypes("lvmon_value_ent",3,"off")=0
+	Set gtmtypes("lvmon_value_ent",3,"len")=2
+	Set gtmtypes("lvmon_value_ent",3,"type")="unsigned-short"
+	Set gtmtypfldindx("lvmon_value_ent","varlvval.v.mvtype")=3
+	Set gtmtypes("lvmon_value_ent",4,"name")="lvmon_value_ent.varlvval.v.fnpc_indx"
+	Set gtmtypes("lvmon_value_ent",4,"off")=3
+	Set gtmtypes("lvmon_value_ent",4,"len")=1
+	Set gtmtypes("lvmon_value_ent",4,"type")="unsigned-char"
+	Set gtmtypfldindx("lvmon_value_ent","varlvval.v.fnpc_indx")=4
+	Set gtmtypes("lvmon_value_ent",5,"name")="lvmon_value_ent.varlvval.v.utfcgr_indx"
+	Set gtmtypes("lvmon_value_ent",5,"off")=4
+	Set gtmtypes("lvmon_value_ent",5,"len")=4
+	Set gtmtypes("lvmon_value_ent",5,"type")="unsigned-int"
+	Set gtmtypfldindx("lvmon_value_ent","varlvval.v.utfcgr_indx")=5
+	Set gtmtypes("lvmon_value_ent",6,"name")="lvmon_value_ent.varlvval.v.filler2"
+	Set gtmtypes("lvmon_value_ent",6,"off")=8
+	Set gtmtypes("lvmon_value_ent",6,"len")=4
+	Set gtmtypes("lvmon_value_ent",6,"type")="unsigned-int"
+	Set gtmtypfldindx("lvmon_value_ent","varlvval.v.filler2")=6
+	Set gtmtypes("lvmon_value_ent",7,"name")="lvmon_value_ent.varlvval.v.m"
+	Set gtmtypes("lvmon_value_ent",7,"off")=12
+	Set gtmtypes("lvmon_value_ent",7,"len")=8
+	Set gtmtypes("lvmon_value_ent",7,"type")="int"
+	Set gtmtypfldindx("lvmon_value_ent","varlvval.v.m")=7
+	Set gtmtypes("lvmon_value_ent",7,"dim")=2
+	Set gtmtypes("lvmon_value_ent",8,"name")="lvmon_value_ent.varlvval.v.str"
+	Set gtmtypes("lvmon_value_ent",8,"off")=20
+	Set gtmtypes("lvmon_value_ent",8,"len")=12
+	Set gtmtypes("lvmon_value_ent",8,"type")="mstr"
+	Set gtmtypfldindx("lvmon_value_ent","varlvval.v.str")=8
+	Set gtmtypes("lvmon_value_ent",9,"name")="lvmon_value_ent.varlvval.ptrs"
+	Set gtmtypes("lvmon_value_ent",9,"off")=32
+	Set gtmtypes("lvmon_value_ent",9,"len")=8
+	Set gtmtypes("lvmon_value_ent",9,"type")="union"
+	Set gtmtypfldindx("lvmon_value_ent","varlvval.ptrs")=9
+	Set gtmtypes("lvmon_value_ent",10,"name")="lvmon_value_ent.varlvval.ptrs.val_ent"
+	Set gtmtypes("lvmon_value_ent",10,"off")=32
+	Set gtmtypes("lvmon_value_ent",10,"len")=8
+	Set gtmtypes("lvmon_value_ent",10,"type")="struct"
+	Set gtmtypfldindx("lvmon_value_ent","varlvval.ptrs.val_ent")=10
+	Set gtmtypes("lvmon_value_ent",11,"name")="lvmon_value_ent.varlvval.ptrs.val_ent.children"
+	Set gtmtypes("lvmon_value_ent",11,"off")=32
+	Set gtmtypes("lvmon_value_ent",11,"len")=4
+	Set gtmtypes("lvmon_value_ent",11,"type")="addr"
+	Set gtmtypfldindx("lvmon_value_ent","varlvval.ptrs.val_ent.children")=11
+	Set gtmtypes("lvmon_value_ent",12,"name")="lvmon_value_ent.varlvval.ptrs.val_ent.parent"
+	Set gtmtypes("lvmon_value_ent",12,"off")=36
+	Set gtmtypes("lvmon_value_ent",12,"len")=4
+	Set gtmtypes("lvmon_value_ent",12,"type")="union"
+	Set gtmtypfldindx("lvmon_value_ent","varlvval.ptrs.val_ent.parent")=12
+	Set gtmtypes("lvmon_value_ent",13,"name")="lvmon_value_ent.varlvval.ptrs.val_ent.parent.sym"
+	Set gtmtypes("lvmon_value_ent",13,"off")=36
+	Set gtmtypes("lvmon_value_ent",13,"len")=4
+	Set gtmtypes("lvmon_value_ent",13,"type")="addr"
+	Set gtmtypfldindx("lvmon_value_ent","varlvval.ptrs.val_ent.parent.sym")=13
+	Set gtmtypes("lvmon_value_ent",14,"name")="lvmon_value_ent.varlvval.ptrs.val_ent.parent.sbs_tree"
+	Set gtmtypes("lvmon_value_ent",14,"off")=36
+	Set gtmtypes("lvmon_value_ent",14,"len")=4
+	Set gtmtypes("lvmon_value_ent",14,"type")="addr"
+	Set gtmtypfldindx("lvmon_value_ent","varlvval.ptrs.val_ent.parent.sbs_tree")=14
+	Set gtmtypes("lvmon_value_ent",15,"name")="lvmon_value_ent.varlvval.ptrs.free_ent"
+	Set gtmtypes("lvmon_value_ent",15,"off")=32
+	Set gtmtypes("lvmon_value_ent",15,"len")=4
+	Set gtmtypes("lvmon_value_ent",15,"type")="struct"
+	Set gtmtypfldindx("lvmon_value_ent","varlvval.ptrs.free_ent")=15
+	Set gtmtypes("lvmon_value_ent",16,"name")="lvmon_value_ent.varlvval.ptrs.free_ent.next_free"
+	Set gtmtypes("lvmon_value_ent",16,"off")=32
+	Set gtmtypes("lvmon_value_ent",16,"len")=4
+	Set gtmtypes("lvmon_value_ent",16,"type")="addr"
+	Set gtmtypfldindx("lvmon_value_ent","varlvval.ptrs.free_ent.next_free")=16
+	Set gtmtypes("lvmon_value_ent",17,"name")="lvmon_value_ent.varlvval.ptrs.copy_loc"
+	Set gtmtypes("lvmon_value_ent",17,"off")=32
+	Set gtmtypes("lvmon_value_ent",17,"len")=4
+	Set gtmtypes("lvmon_value_ent",17,"type")="struct"
+	Set gtmtypfldindx("lvmon_value_ent","varlvval.ptrs.copy_loc")=17
+	Set gtmtypes("lvmon_value_ent",18,"name")="lvmon_value_ent.varlvval.ptrs.copy_loc.newtablv"
+	Set gtmtypes("lvmon_value_ent",18,"off")=32
+	Set gtmtypes("lvmon_value_ent",18,"len")=4
+	Set gtmtypes("lvmon_value_ent",18,"type")="addr"
+	Set gtmtypfldindx("lvmon_value_ent","varlvval.ptrs.copy_loc.newtablv")=18
+	Set gtmtypes("lvmon_value_ent",19,"name")="lvmon_value_ent.varlvval.stats"
+	Set gtmtypes("lvmon_value_ent",19,"off")=40
+	Set gtmtypes("lvmon_value_ent",19,"len")=16
+	Set gtmtypes("lvmon_value_ent",19,"type")="struct"
+	Set gtmtypfldindx("lvmon_value_ent","varlvval.stats")=19
+	Set gtmtypes("lvmon_value_ent",20,"name")="lvmon_value_ent.varlvval.stats.trefcnt"
+	Set gtmtypes("lvmon_value_ent",20,"off")=40
+	Set gtmtypes("lvmon_value_ent",20,"len")=4
+	Set gtmtypes("lvmon_value_ent",20,"type")="int"
+	Set gtmtypfldindx("lvmon_value_ent","varlvval.stats.trefcnt")=20
+	Set gtmtypes("lvmon_value_ent",21,"name")="lvmon_value_ent.varlvval.stats.crefcnt"
+	Set gtmtypes("lvmon_value_ent",21,"off")=44
+	Set gtmtypes("lvmon_value_ent",21,"len")=4
+	Set gtmtypes("lvmon_value_ent",21,"type")="int"
+	Set gtmtypfldindx("lvmon_value_ent","varlvval.stats.crefcnt")=21
+	Set gtmtypes("lvmon_value_ent",22,"name")="lvmon_value_ent.varlvval.stats.tstartcycle"
+	Set gtmtypes("lvmon_value_ent",22,"off")=48
+	Set gtmtypes("lvmon_value_ent",22,"len")=4
+	Set gtmtypes("lvmon_value_ent",22,"type")="unsigned-int"
+	Set gtmtypfldindx("lvmon_value_ent","varlvval.stats.tstartcycle")=22
+	Set gtmtypes("lvmon_value_ent",23,"name")="lvmon_value_ent.varlvval.stats.lvtaskcycle"
+	Set gtmtypes("lvmon_value_ent",23,"off")=52
+	Set gtmtypes("lvmon_value_ent",23,"len")=4
+	Set gtmtypes("lvmon_value_ent",23,"type")="unsigned-int"
+	Set gtmtypfldindx("lvmon_value_ent","varlvval.stats.lvtaskcycle")=23
+	Set gtmtypes("lvmon_value_ent",24,"name")="lvmon_value_ent.varlvval.has_aliascont"
+	Set gtmtypes("lvmon_value_ent",24,"off")=56
+	Set gtmtypes("lvmon_value_ent",24,"len")=4
+	Set gtmtypes("lvmon_value_ent",24,"type")="boolean_t"
+	Set gtmtypfldindx("lvmon_value_ent","varlvval.has_aliascont")=24
+	Set gtmtypes("lvmon_value_ent",25,"name")="lvmon_value_ent.varlvval.lvmon_mark"
+	Set gtmtypes("lvmon_value_ent",25,"off")=60
+	Set gtmtypes("lvmon_value_ent",25,"len")=4
+	Set gtmtypes("lvmon_value_ent",25,"type")="boolean_t"
+	Set gtmtypfldindx("lvmon_value_ent","varlvval.lvmon_mark")=25
+	Set gtmtypes("lvmon_value_ent",26,"name")="lvmon_value_ent.varlvval.tp_var"
+	Set gtmtypes("lvmon_value_ent",26,"off")=64
+	Set gtmtypes("lvmon_value_ent",26,"len")=4
+	Set gtmtypes("lvmon_value_ent",26,"type")="addr"
+	Set gtmtypfldindx("lvmon_value_ent","varlvval.tp_var")=26
+	Set gtmtypes("lvmon_value_ent",27,"name")="lvmon_value_ent.varvalue"
+	Set gtmtypes("lvmon_value_ent",27,"off")=68
+	Set gtmtypes("lvmon_value_ent",27,"len")=12
+	Set gtmtypes("lvmon_value_ent",27,"type")="mstr"
+	Set gtmtypfldindx("lvmon_value_ent","varvalue")=27
+	Set gtmtypes("lvmon_value_ent",28,"name")="lvmon_value_ent.varvalue.char_len"
+	Set gtmtypes("lvmon_value_ent",28,"off")=68
+	Set gtmtypes("lvmon_value_ent",28,"len")=4
+	Set gtmtypes("lvmon_value_ent",28,"type")="unsigned-int"
+	Set gtmtypfldindx("lvmon_value_ent","varvalue.char_len")=28
+	Set gtmtypes("lvmon_value_ent",29,"name")="lvmon_value_ent.varvalue.len"
+	Set gtmtypes("lvmon_value_ent",29,"off")=72
+	Set gtmtypes("lvmon_value_ent",29,"len")=4
+	Set gtmtypes("lvmon_value_ent",29,"type")="int"
+	Set gtmtypfldindx("lvmon_value_ent","varvalue.len")=29
+	Set gtmtypes("lvmon_value_ent",30,"name")="lvmon_value_ent.varvalue.addr"
+	Set gtmtypes("lvmon_value_ent",30,"off")=76
+	Set gtmtypes("lvmon_value_ent",30,"len")=4
+	Set gtmtypes("lvmon_value_ent",30,"type")="addr"
+	Set gtmtypfldindx("lvmon_value_ent","varvalue.addr")=30
+	Set gtmtypes("lvmon_value_ent",31,"name")="lvmon_value_ent.alloclen"
+	Set gtmtypes("lvmon_value_ent",31,"off")=80
+	Set gtmtypes("lvmon_value_ent",31,"len")=4
+	Set gtmtypes("lvmon_value_ent",31,"type")="unsigned-int"
+	Set gtmtypfldindx("lvmon_value_ent","alloclen")=31
+	;
+	Set gtmtypes("lvmon_var")="struct"
+	Set gtmtypes("lvmon_var",0)=38
+	Set gtmtypes("lvmon_var","len")=200
+	Set gtmtypes("lvmon_var",1,"name")="lvmon_var.lvmv"
+	Set gtmtypes("lvmon_var",1,"off")=0
+	Set gtmtypes("lvmon_var",1,"len")=20
+	Set gtmtypes("lvmon_var",1,"type")="mname_entry"
+	Set gtmtypfldindx("lvmon_var","lvmv")=1
+	Set gtmtypes("lvmon_var",2,"name")="lvmon_var.lvmv.var_name"
+	Set gtmtypes("lvmon_var",2,"off")=0
+	Set gtmtypes("lvmon_var",2,"len")=12
+	Set gtmtypes("lvmon_var",2,"type")="mstr"
+	Set gtmtypfldindx("lvmon_var","lvmv.var_name")=2
+	Set gtmtypes("lvmon_var",3,"name")="lvmon_var.lvmv.hash_code"
+	Set gtmtypes("lvmon_var",3,"off")=12
+	Set gtmtypes("lvmon_var",3,"len")=4
+	Set gtmtypes("lvmon_var",3,"type")="unsigned-int"
+	Set gtmtypfldindx("lvmon_var","lvmv.hash_code")=3
+	Set gtmtypes("lvmon_var",4,"name")="lvmon_var.lvmv.marked"
+	Set gtmtypes("lvmon_var",4,"off")=16
+	Set gtmtypes("lvmon_var",4,"len")=4
+	Set gtmtypes("lvmon_var",4,"type")="boolean_t"
+	Set gtmtypfldindx("lvmon_var","lvmv.marked")=4
+	Set gtmtypes("lvmon_var",5,"name")="lvmon_var.varlvadr"
+	Set gtmtypes("lvmon_var",5,"off")=20
+	Set gtmtypes("lvmon_var",5,"len")=4
+	Set gtmtypes("lvmon_var",5,"type")="addr"
+	Set gtmtypfldindx("lvmon_var","varlvadr")=5
+	Set gtmtypes("lvmon_var",6,"name")="lvmon_var.curr_symval_cycle"
+	Set gtmtypes("lvmon_var",6,"off")=24
+	Set gtmtypes("lvmon_var",6,"len")=8
+	Set gtmtypes("lvmon_var",6,"type")="gtm_int8"
+	Set gtmtypfldindx("lvmon_var","curr_symval_cycle")=6
+	Set gtmtypes("lvmon_var",7,"name")="lvmon_var.values"
+	Set gtmtypes("lvmon_var",7,"off")=32
+	Set gtmtypes("lvmon_var",7,"len")=168
+	Set gtmtypes("lvmon_var",7,"type")="lvmon_value_ent"
+	Set gtmtypfldindx("lvmon_var","values")=7
+	Set gtmtypes("lvmon_var",7,"dim")=2
+	Set gtmtypes("lvmon_var",8,"name")="lvmon_var.values[0].varlvval"
+	Set gtmtypes("lvmon_var",8,"off")=32
+	Set gtmtypes("lvmon_var",8,"len")=68
+	Set gtmtypes("lvmon_var",8,"type")="lv_val"
+	Set gtmtypfldindx("lvmon_var","values[0].varlvval")=8
+	Set gtmtypes("lvmon_var",9,"name")="lvmon_var.values[0].varlvval.v"
+	Set gtmtypes("lvmon_var",9,"off")=32
+	Set gtmtypes("lvmon_var",9,"len")=32
+	Set gtmtypes("lvmon_var",9,"type")="mval"
+	Set gtmtypfldindx("lvmon_var","values[0].varlvval.v")=9
+	Set gtmtypes("lvmon_var",10,"name")="lvmon_var.values[0].varlvval.v.mvtype"
+	Set gtmtypes("lvmon_var",10,"off")=32
+	Set gtmtypes("lvmon_var",10,"len")=2
+	Set gtmtypes("lvmon_var",10,"type")="unsigned-short"
+	Set gtmtypfldindx("lvmon_var","values[0].varlvval.v.mvtype")=10
+	Set gtmtypes("lvmon_var",11,"name")="lvmon_var.values[0].varlvval.v.fnpc_indx"
+	Set gtmtypes("lvmon_var",11,"off")=35
+	Set gtmtypes("lvmon_var",11,"len")=1
+	Set gtmtypes("lvmon_var",11,"type")="unsigned-char"
+	Set gtmtypfldindx("lvmon_var","values[0].varlvval.v.fnpc_indx")=11
+	Set gtmtypes("lvmon_var",12,"name")="lvmon_var.values[0].varlvval.v.utfcgr_indx"
+	Set gtmtypes("lvmon_var",12,"off")=36
+	Set gtmtypes("lvmon_var",12,"len")=4
+	Set gtmtypes("lvmon_var",12,"type")="unsigned-int"
+	Set gtmtypfldindx("lvmon_var","values[0].varlvval.v.utfcgr_indx")=12
+	Set gtmtypes("lvmon_var",13,"name")="lvmon_var.values[0].varlvval.v.filler2"
+	Set gtmtypes("lvmon_var",13,"off")=40
+	Set gtmtypes("lvmon_var",13,"len")=4
+	Set gtmtypes("lvmon_var",13,"type")="unsigned-int"
+	Set gtmtypfldindx("lvmon_var","values[0].varlvval.v.filler2")=13
+	Set gtmtypes("lvmon_var",14,"name")="lvmon_var.values[0].varlvval.v.m"
+	Set gtmtypes("lvmon_var",14,"off")=44
+	Set gtmtypes("lvmon_var",14,"len")=8
+	Set gtmtypes("lvmon_var",14,"type")="int"
+	Set gtmtypfldindx("lvmon_var","values[0].varlvval.v.m")=14
+	Set gtmtypes("lvmon_var",14,"dim")=2
+	Set gtmtypes("lvmon_var",15,"name")="lvmon_var.values[0].varlvval.v.str"
+	Set gtmtypes("lvmon_var",15,"off")=52
+	Set gtmtypes("lvmon_var",15,"len")=12
+	Set gtmtypes("lvmon_var",15,"type")="mstr"
+	Set gtmtypfldindx("lvmon_var","values[0].varlvval.v.str")=15
+	Set gtmtypes("lvmon_var",16,"name")="lvmon_var.values[0].varlvval.ptrs"
+	Set gtmtypes("lvmon_var",16,"off")=64
+	Set gtmtypes("lvmon_var",16,"len")=8
+	Set gtmtypes("lvmon_var",16,"type")="union"
+	Set gtmtypfldindx("lvmon_var","values[0].varlvval.ptrs")=16
+	Set gtmtypes("lvmon_var",17,"name")="lvmon_var.values[0].varlvval.ptrs.val_ent"
+	Set gtmtypes("lvmon_var",17,"off")=64
+	Set gtmtypes("lvmon_var",17,"len")=8
+	Set gtmtypes("lvmon_var",17,"type")="struct"
+	Set gtmtypfldindx("lvmon_var","values[0].varlvval.ptrs.val_ent")=17
+	Set gtmtypes("lvmon_var",18,"name")="lvmon_var.values[0].varlvval.ptrs.val_ent.children"
+	Set gtmtypes("lvmon_var",18,"off")=64
+	Set gtmtypes("lvmon_var",18,"len")=4
+	Set gtmtypes("lvmon_var",18,"type")="addr"
+	Set gtmtypfldindx("lvmon_var","values[0].varlvval.ptrs.val_ent.children")=18
+	Set gtmtypes("lvmon_var",19,"name")="lvmon_var.values[0].varlvval.ptrs.val_ent.parent"
+	Set gtmtypes("lvmon_var",19,"off")=68
+	Set gtmtypes("lvmon_var",19,"len")=4
+	Set gtmtypes("lvmon_var",19,"type")="union"
+	Set gtmtypfldindx("lvmon_var","values[0].varlvval.ptrs.val_ent.parent")=19
+	Set gtmtypes("lvmon_var",20,"name")="lvmon_var.values[0].varlvval.ptrs.val_ent.parent.sym"
+	Set gtmtypes("lvmon_var",20,"off")=68
+	Set gtmtypes("lvmon_var",20,"len")=4
+	Set gtmtypes("lvmon_var",20,"type")="addr"
+	Set gtmtypfldindx("lvmon_var","values[0].varlvval.ptrs.val_ent.parent.sym")=20
+	Set gtmtypes("lvmon_var",21,"name")="lvmon_var.values[0].varlvval.ptrs.val_ent.parent.sbs_tree"
+	Set gtmtypes("lvmon_var",21,"off")=68
+	Set gtmtypes("lvmon_var",21,"len")=4
+	Set gtmtypes("lvmon_var",21,"type")="addr"
+	Set gtmtypfldindx("lvmon_var","values[0].varlvval.ptrs.val_ent.parent.sbs_tree")=21
+	Set gtmtypes("lvmon_var",22,"name")="lvmon_var.values[0].varlvval.ptrs.free_ent"
+	Set gtmtypes("lvmon_var",22,"off")=64
+	Set gtmtypes("lvmon_var",22,"len")=4
+	Set gtmtypes("lvmon_var",22,"type")="struct"
+	Set gtmtypfldindx("lvmon_var","values[0].varlvval.ptrs.free_ent")=22
+	Set gtmtypes("lvmon_var",23,"name")="lvmon_var.values[0].varlvval.ptrs.free_ent.next_free"
+	Set gtmtypes("lvmon_var",23,"off")=64
+	Set gtmtypes("lvmon_var",23,"len")=4
+	Set gtmtypes("lvmon_var",23,"type")="addr"
+	Set gtmtypfldindx("lvmon_var","values[0].varlvval.ptrs.free_ent.next_free")=23
+	Set gtmtypes("lvmon_var",24,"name")="lvmon_var.values[0].varlvval.ptrs.copy_loc"
+	Set gtmtypes("lvmon_var",24,"off")=64
+	Set gtmtypes("lvmon_var",24,"len")=4
+	Set gtmtypes("lvmon_var",24,"type")="struct"
+	Set gtmtypfldindx("lvmon_var","values[0].varlvval.ptrs.copy_loc")=24
+	Set gtmtypes("lvmon_var",25,"name")="lvmon_var.values[0].varlvval.ptrs.copy_loc.newtablv"
+	Set gtmtypes("lvmon_var",25,"off")=64
+	Set gtmtypes("lvmon_var",25,"len")=4
+	Set gtmtypes("lvmon_var",25,"type")="addr"
+	Set gtmtypfldindx("lvmon_var","values[0].varlvval.ptrs.copy_loc.newtablv")=25
+	Set gtmtypes("lvmon_var",26,"name")="lvmon_var.values[0].varlvval.stats"
+	Set gtmtypes("lvmon_var",26,"off")=72
+	Set gtmtypes("lvmon_var",26,"len")=16
+	Set gtmtypes("lvmon_var",26,"type")="struct"
+	Set gtmtypfldindx("lvmon_var","values[0].varlvval.stats")=26
+	Set gtmtypes("lvmon_var",27,"name")="lvmon_var.values[0].varlvval.stats.trefcnt"
+	Set gtmtypes("lvmon_var",27,"off")=72
+	Set gtmtypes("lvmon_var",27,"len")=4
+	Set gtmtypes("lvmon_var",27,"type")="int"
+	Set gtmtypfldindx("lvmon_var","values[0].varlvval.stats.trefcnt")=27
+	Set gtmtypes("lvmon_var",28,"name")="lvmon_var.values[0].varlvval.stats.crefcnt"
+	Set gtmtypes("lvmon_var",28,"off")=76
+	Set gtmtypes("lvmon_var",28,"len")=4
+	Set gtmtypes("lvmon_var",28,"type")="int"
+	Set gtmtypfldindx("lvmon_var","values[0].varlvval.stats.crefcnt")=28
+	Set gtmtypes("lvmon_var",29,"name")="lvmon_var.values[0].varlvval.stats.tstartcycle"
+	Set gtmtypes("lvmon_var",29,"off")=80
+	Set gtmtypes("lvmon_var",29,"len")=4
+	Set gtmtypes("lvmon_var",29,"type")="unsigned-int"
+	Set gtmtypfldindx("lvmon_var","values[0].varlvval.stats.tstartcycle")=29
+	Set gtmtypes("lvmon_var",30,"name")="lvmon_var.values[0].varlvval.stats.lvtaskcycle"
+	Set gtmtypes("lvmon_var",30,"off")=84
+	Set gtmtypes("lvmon_var",30,"len")=4
+	Set gtmtypes("lvmon_var",30,"type")="unsigned-int"
+	Set gtmtypfldindx("lvmon_var","values[0].varlvval.stats.lvtaskcycle")=30
+	Set gtmtypes("lvmon_var",31,"name")="lvmon_var.values[0].varlvval.has_aliascont"
+	Set gtmtypes("lvmon_var",31,"off")=88
+	Set gtmtypes("lvmon_var",31,"len")=4
+	Set gtmtypes("lvmon_var",31,"type")="boolean_t"
+	Set gtmtypfldindx("lvmon_var","values[0].varlvval.has_aliascont")=31
+	Set gtmtypes("lvmon_var",32,"name")="lvmon_var.values[0].varlvval.lvmon_mark"
+	Set gtmtypes("lvmon_var",32,"off")=92
+	Set gtmtypes("lvmon_var",32,"len")=4
+	Set gtmtypes("lvmon_var",32,"type")="boolean_t"
+	Set gtmtypfldindx("lvmon_var","values[0].varlvval.lvmon_mark")=32
+	Set gtmtypes("lvmon_var",33,"name")="lvmon_var.values[0].varlvval.tp_var"
+	Set gtmtypes("lvmon_var",33,"off")=96
+	Set gtmtypes("lvmon_var",33,"len")=4
+	Set gtmtypes("lvmon_var",33,"type")="addr"
+	Set gtmtypfldindx("lvmon_var","values[0].varlvval.tp_var")=33
+	Set gtmtypes("lvmon_var",34,"name")="lvmon_var.values[0].varvalue"
+	Set gtmtypes("lvmon_var",34,"off")=100
+	Set gtmtypes("lvmon_var",34,"len")=12
+	Set gtmtypes("lvmon_var",34,"type")="mstr"
+	Set gtmtypfldindx("lvmon_var","values[0].varvalue")=34
+	Set gtmtypes("lvmon_var",35,"name")="lvmon_var.values[0].varvalue.char_len"
+	Set gtmtypes("lvmon_var",35,"off")=100
+	Set gtmtypes("lvmon_var",35,"len")=4
+	Set gtmtypes("lvmon_var",35,"type")="unsigned-int"
+	Set gtmtypfldindx("lvmon_var","values[0].varvalue.char_len")=35
+	Set gtmtypes("lvmon_var",36,"name")="lvmon_var.values[0].varvalue.len"
+	Set gtmtypes("lvmon_var",36,"off")=104
+	Set gtmtypes("lvmon_var",36,"len")=4
+	Set gtmtypes("lvmon_var",36,"type")="int"
+	Set gtmtypfldindx("lvmon_var","values[0].varvalue.len")=36
+	Set gtmtypes("lvmon_var",37,"name")="lvmon_var.values[0].varvalue.addr"
+	Set gtmtypes("lvmon_var",37,"off")=108
+	Set gtmtypes("lvmon_var",37,"len")=4
+	Set gtmtypes("lvmon_var",37,"type")="addr"
+	Set gtmtypfldindx("lvmon_var","values[0].varvalue.addr")=37
+	Set gtmtypes("lvmon_var",38,"name")="lvmon_var.values[0].alloclen"
+	Set gtmtypes("lvmon_var",38,"off")=112
+	Set gtmtypes("lvmon_var",38,"len")=4
+	Set gtmtypes("lvmon_var",38,"type")="unsigned-int"
+	Set gtmtypfldindx("lvmon_var","values[0].alloclen")=38
+	;
 	Set gtmtypes("lvname_info")="struct"
 	Set gtmtypes("lvname_info",0)=4
 	Set gtmtypes("lvname_info","len")=140
@@ -13342,8 +14181,8 @@ Init
 	Set gtmtypfldindx("mlabel","gbl")=9
 	;
 	Set gtmtypes("mline")="struct"
-	Set gtmtypes("mline",0)=6
-	Set gtmtypes("mline","len")=24
+	Set gtmtypes("mline",0)=7
+	Set gtmtypes("mline","len")=28
 	Set gtmtypes("mline",1,"name")="mline.parent"
 	Set gtmtypes("mline",1,"off")=0
 	Set gtmtypes("mline",1,"len")=4
@@ -13374,6 +14213,11 @@ Init
 	Set gtmtypes("mline",6,"len")=4
 	Set gtmtypes("mline",6,"type")="boolean_t"
 	Set gtmtypfldindx("mline","table")=6
+	Set gtmtypes("mline",7,"name")="mline.block_ok"
+	Set gtmtypes("mline",7,"off")=24
+	Set gtmtypes("mline",7,"len")=4
+	Set gtmtypes("mline",7,"type")="boolean_t"
+	Set gtmtypfldindx("mline","block_ok")=7
 	;
 	Set gtmtypes("mliteral")="struct"
 	Set gtmtypes("mliteral",0)=12
@@ -16944,8 +17788,8 @@ Init
 	Set gtmtypfldindx("nametabent","name")=2
 	;
 	Set gtmtypes("node_local")="struct"
-	Set gtmtypes("node_local",0)=249
-	Set gtmtypes("node_local","len")=104768
+	Set gtmtypes("node_local",0)=250
+	Set gtmtypes("node_local","len")=104776
 	Set gtmtypes("node_local",1,"name")="node_local.label"
 	Set gtmtypes("node_local",1,"off")=0
 	Set gtmtypes("node_local",1,"len")=12
@@ -18082,126 +18926,131 @@ Init
 	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,"name")="node_local.update_underway_tn"
 	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",226,"len")=8
+	Set gtmtypes("node_local",226,"type")="uint64_t"
+	Set gtmtypfldindx("node_local","update_underway_tn")=226
+	Set gtmtypes("node_local",227,"name")="node_local.lastwriterbypas_msg_issued"
+	Set gtmtypes("node_local",227,"off")=104704
 	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 gtmtypfldindx("node_local","lastwriterbypas_msg_issued")=227
+	Set gtmtypes("node_local",228,"name")="node_local.first_writer_seen"
+	Set gtmtypes("node_local",228,"off")=104708
 	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 gtmtypfldindx("node_local","first_writer_seen")=228
+	Set gtmtypes("node_local",229,"name")="node_local.first_nonbypas_writer_seen"
+	Set gtmtypes("node_local",229,"off")=104712
 	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 gtmtypfldindx("node_local","first_nonbypas_writer_seen")=229
+	Set gtmtypes("node_local",230,"name")="node_local.ftok_counter_halted"
+	Set gtmtypes("node_local",230,"off")=104716
 	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 gtmtypfldindx("node_local","ftok_counter_halted")=230
+	Set gtmtypes("node_local",231,"name")="node_local.access_counter_halted"
+	Set gtmtypes("node_local",231,"off")=104720
 	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 gtmtypfldindx("node_local","access_counter_halted")=231
+	Set gtmtypes("node_local",232,"name")="node_local.statsdb_created"
+	Set gtmtypes("node_local",232,"off")=104724
 	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",232,"type")="boolean_t"
+	Set gtmtypfldindx("node_local","statsdb_created")=232
+	Set gtmtypes("node_local",233,"name")="node_local.statsdb_fname_len"
+	Set gtmtypes("node_local",233,"off")=104728
 	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",233,"type")="unsigned-int"
+	Set gtmtypfldindx("node_local","statsdb_fname_len")=233
+	Set gtmtypes("node_local",234,"name")="node_local.statsdb_rundown_clean"
+	Set gtmtypes("node_local",234,"off")=104732
+	Set gtmtypes("node_local",234,"len")=4
+	Set gtmtypes("node_local",234,"type")="boolean_t"
+	Set gtmtypfldindx("node_local","statsdb_rundown_clean")=234
+	Set gtmtypes("node_local",235,"name")="node_local.freeze_latch"
+	Set gtmtypes("node_local",235,"off")=104736
 	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",235,"type")="global_latch_t"
+	Set gtmtypfldindx("node_local","freeze_latch")=235
+	Set gtmtypes("node_local",236,"name")="node_local.freeze_latch.u"
+	Set gtmtypes("node_local",236,"off")=104736
 	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",236,"type")="union"
+	Set gtmtypfldindx("node_local","freeze_latch.u")=236
+	Set gtmtypes("node_local",237,"name")="node_local.freeze_latch.u.pid_imgcnt"
+	Set gtmtypes("node_local",237,"off")=104736
 	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",237,"type")="uint64_t"
+	Set gtmtypfldindx("node_local","freeze_latch.u.pid_imgcnt")=237
+	Set gtmtypes("node_local",238,"name")="node_local.freeze_latch.u.parts"
+	Set gtmtypes("node_local",238,"off")=104736
+	Set gtmtypes("node_local",238,"len")=8
+	Set gtmtypes("node_local",238,"type")="struct"
+	Set gtmtypfldindx("node_local","freeze_latch.u.parts")=238
+	Set gtmtypes("node_local",239,"name")="node_local.freeze_latch.u.parts.latch_pid"
+	Set gtmtypes("node_local",239,"off")=104736
 	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 gtmtypfldindx("node_local","freeze_latch.u.parts.latch_pid")=239
+	Set gtmtypes("node_local",240,"name")="node_local.freeze_latch.u.parts.latch_word"
+	Set gtmtypes("node_local",240,"off")=104740
+	Set gtmtypes("node_local",240,"len")=4
+	Set gtmtypes("node_local",240,"type")="int"
+	Set gtmtypfldindx("node_local","freeze_latch.u.parts.latch_word")=240
+	Set gtmtypes("node_local",241,"name")="node_local.wcs_buffs_freed"
 	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 gtmtypfldindx("node_local","wcs_buffs_freed")=241
+	Set gtmtypes("node_local",242,"name")="node_local.dskspace_next_fire"
 	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",242,"type")="uint64_t"
+	Set gtmtypfldindx("node_local","dskspace_next_fire")=242
+	Set gtmtypes("node_local",243,"name")="node_local.lock_crit"
+	Set gtmtypes("node_local",243,"off")=104760
 	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",243,"type")="global_latch_t"
+	Set gtmtypfldindx("node_local","lock_crit")=243
+	Set gtmtypes("node_local",244,"name")="node_local.lock_crit.u"
+	Set gtmtypes("node_local",244,"off")=104760
 	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",244,"type")="union"
+	Set gtmtypfldindx("node_local","lock_crit.u")=244
+	Set gtmtypes("node_local",245,"name")="node_local.lock_crit.u.pid_imgcnt"
+	Set gtmtypes("node_local",245,"off")=104760
 	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",245,"type")="uint64_t"
+	Set gtmtypfldindx("node_local","lock_crit.u.pid_imgcnt")=245
+	Set gtmtypes("node_local",246,"name")="node_local.lock_crit.u.parts"
+	Set gtmtypes("node_local",246,"off")=104760
+	Set gtmtypes("node_local",246,"len")=8
+	Set gtmtypes("node_local",246,"type")="struct"
+	Set gtmtypfldindx("node_local","lock_crit.u.parts")=246
+	Set gtmtypes("node_local",247,"name")="node_local.lock_crit.u.parts.latch_pid"
+	Set gtmtypes("node_local",247,"off")=104760
 	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 gtmtypfldindx("node_local","lock_crit.u.parts.latch_pid")=247
+	Set gtmtypes("node_local",248,"name")="node_local.lock_crit.u.parts.latch_word"
+	Set gtmtypes("node_local",248,"off")=104764
 	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 gtmtypfldindx("node_local","lock_crit.u.parts.latch_word")=248
+	Set gtmtypes("node_local",249,"name")="node_local.tp_hint"
+	Set gtmtypes("node_local",249,"off")=104768
 	Set gtmtypes("node_local",249,"len")=4
 	Set gtmtypes("node_local",249,"type")="int"
-	Set gtmtypfldindx("node_local","filler_8byte_align6")=249
+	Set gtmtypfldindx("node_local","tp_hint")=249
+	Set gtmtypes("node_local",250,"name")="node_local.filler_8byte_align6"
+	Set gtmtypes("node_local",250,"off")=104772
+	Set gtmtypes("node_local",250,"len")=4
+	Set gtmtypes("node_local",250,"type")="int"
+	Set gtmtypfldindx("node_local","filler_8byte_align6")=250
 	;
 	Set gtmtypes("noisolation_element")="struct"
 	Set gtmtypes("noisolation_element",0)=2
@@ -19133,6 +19982,106 @@ Init
 	Set gtmtypes("parse_blk",17,"type")="addr"
 	Set gtmtypfldindx("parse_blk","l_ext")=17
 	;
+	Set gtmtypes("parse_save_block")="struct"
+	Set gtmtypes("parse_save_block",0)=19
+	Set gtmtypes("parse_save_block","len")=124
+	Set gtmtypes("parse_save_block",1,"name")="parse_save_block.source_error_found"
+	Set gtmtypes("parse_save_block",1,"off")=0
+	Set gtmtypes("parse_save_block",1,"len")=4
+	Set gtmtypes("parse_save_block",1,"type")="boolean_t"
+	Set gtmtypfldindx("parse_save_block","source_error_found")=1
+	Set gtmtypes("parse_save_block",2,"name")="parse_save_block.source_column"
+	Set gtmtypes("parse_save_block",2,"off")=4
+	Set gtmtypes("parse_save_block",2,"len")=4
+	Set gtmtypes("parse_save_block",2,"type")="int"
+	Set gtmtypfldindx("parse_save_block","source_column")=2
+	Set gtmtypes("parse_save_block",3,"name")="parse_save_block.director_ident_len"
+	Set gtmtypes("parse_save_block",3,"off")=8
+	Set gtmtypes("parse_save_block",3,"len")=4
+	Set gtmtypes("parse_save_block",3,"type")="int"
+	Set gtmtypfldindx("parse_save_block","director_ident_len")=3
+	Set gtmtypes("parse_save_block",4,"name")="parse_save_block.block_level"
+	Set gtmtypes("parse_save_block",4,"off")=12
+	Set gtmtypes("parse_save_block",4,"len")=4
+	Set gtmtypes("parse_save_block",4,"type")="int"
+	Set gtmtypfldindx("parse_save_block","block_level")=4
+	Set gtmtypes("parse_save_block",5,"name")="parse_save_block.source_len"
+	Set gtmtypes("parse_save_block",5,"off")=16
+	Set gtmtypes("parse_save_block",5,"len")=4
+	Set gtmtypes("parse_save_block",5,"type")="int"
+	Set gtmtypfldindx("parse_save_block","source_len")=5
+	Set gtmtypes("parse_save_block",6,"name")="parse_save_block.director_mval"
+	Set gtmtypes("parse_save_block",6,"off")=20
+	Set gtmtypes("parse_save_block",6,"len")=32
+	Set gtmtypes("parse_save_block",6,"type")="mval"
+	Set gtmtypfldindx("parse_save_block","director_mval")=6
+	Set gtmtypes("parse_save_block",7,"name")="parse_save_block.director_mval.mvtype"
+	Set gtmtypes("parse_save_block",7,"off")=20
+	Set gtmtypes("parse_save_block",7,"len")=2
+	Set gtmtypes("parse_save_block",7,"type")="unsigned-short"
+	Set gtmtypfldindx("parse_save_block","director_mval.mvtype")=7
+	Set gtmtypes("parse_save_block",8,"name")="parse_save_block.director_mval.fnpc_indx"
+	Set gtmtypes("parse_save_block",8,"off")=23
+	Set gtmtypes("parse_save_block",8,"len")=1
+	Set gtmtypes("parse_save_block",8,"type")="unsigned-char"
+	Set gtmtypfldindx("parse_save_block","director_mval.fnpc_indx")=8
+	Set gtmtypes("parse_save_block",9,"name")="parse_save_block.director_mval.utfcgr_indx"
+	Set gtmtypes("parse_save_block",9,"off")=24
+	Set gtmtypes("parse_save_block",9,"len")=4
+	Set gtmtypes("parse_save_block",9,"type")="unsigned-int"
+	Set gtmtypfldindx("parse_save_block","director_mval.utfcgr_indx")=9
+	Set gtmtypes("parse_save_block",10,"name")="parse_save_block.director_mval.filler2"
+	Set gtmtypes("parse_save_block",10,"off")=28
+	Set gtmtypes("parse_save_block",10,"len")=4
+	Set gtmtypes("parse_save_block",10,"type")="unsigned-int"
+	Set gtmtypfldindx("parse_save_block","director_mval.filler2")=10
+	Set gtmtypes("parse_save_block",11,"name")="parse_save_block.director_mval.m"
+	Set gtmtypes("parse_save_block",11,"off")=32
+	Set gtmtypes("parse_save_block",11,"len")=8
+	Set gtmtypes("parse_save_block",11,"type")="int"
+	Set gtmtypfldindx("parse_save_block","director_mval.m")=11
+	Set gtmtypes("parse_save_block",11,"dim")=2
+	Set gtmtypes("parse_save_block",12,"name")="parse_save_block.director_mval.str"
+	Set gtmtypes("parse_save_block",12,"off")=40
+	Set gtmtypes("parse_save_block",12,"len")=12
+	Set gtmtypes("parse_save_block",12,"type")="mstr"
+	Set gtmtypfldindx("parse_save_block","director_mval.str")=12
+	Set gtmtypes("parse_save_block",13,"name")="parse_save_block.director_mval.str.char_len"
+	Set gtmtypes("parse_save_block",13,"off")=40
+	Set gtmtypes("parse_save_block",13,"len")=4
+	Set gtmtypes("parse_save_block",13,"type")="unsigned-int"
+	Set gtmtypfldindx("parse_save_block","director_mval.str.char_len")=13
+	Set gtmtypes("parse_save_block",14,"name")="parse_save_block.director_mval.str.len"
+	Set gtmtypes("parse_save_block",14,"off")=44
+	Set gtmtypes("parse_save_block",14,"len")=4
+	Set gtmtypes("parse_save_block",14,"type")="int"
+	Set gtmtypfldindx("parse_save_block","director_mval.str.len")=14
+	Set gtmtypes("parse_save_block",15,"name")="parse_save_block.director_mval.str.addr"
+	Set gtmtypes("parse_save_block",15,"off")=48
+	Set gtmtypes("parse_save_block",15,"len")=4
+	Set gtmtypes("parse_save_block",15,"type")="addr"
+	Set gtmtypfldindx("parse_save_block","director_mval.str.addr")=15
+	Set gtmtypes("parse_save_block",16,"name")="parse_save_block.ident_buffer"
+	Set gtmtypes("parse_save_block",16,"off")=52
+	Set gtmtypes("parse_save_block",16,"len")=63
+	Set gtmtypes("parse_save_block",16,"type")="unsigned-char"
+	Set gtmtypfldindx("parse_save_block","ident_buffer")=16
+	Set gtmtypes("parse_save_block",17,"name")="parse_save_block.director_token"
+	Set gtmtypes("parse_save_block",17,"off")=115
+	Set gtmtypes("parse_save_block",17,"len")=1
+	Set gtmtypes("parse_save_block",17,"type")="char"
+	Set gtmtypfldindx("parse_save_block","director_token")=17
+	Set gtmtypes("parse_save_block",18,"name")="parse_save_block.lexical_ptr"
+	Set gtmtypes("parse_save_block",18,"off")=116
+	Set gtmtypes("parse_save_block",18,"len")=4
+	Set gtmtypes("parse_save_block",18,"type")="addr"
+	Set gtmtypfldindx("parse_save_block","lexical_ptr")=18
+	Set gtmtypes("parse_save_block",19,"name")="parse_save_block.window_token"
+	Set gtmtypes("parse_save_block",19,"off")=120
+	Set gtmtypes("parse_save_block",19,"len")=1
+	Set gtmtypes("parse_save_block",19,"type")="char"
+	Set gtmtypfldindx("parse_save_block","window_token")=19
+	;
 	Set gtmtypes("pat_strlit")="struct"
 	Set gtmtypes("pat_strlit",0)=4
 	Set gtmtypes("pat_strlit","len")=3956
@@ -25964,8 +26913,8 @@ Init
 	Set gtmtypfldindx("sgbg_addrs","fill1")=2
 	;
 	Set gtmtypes("sgm_info")="struct"
-	Set gtmtypes("sgm_info",0)=39
-	Set gtmtypes("sgm_info","len")=160
+	Set gtmtypes("sgm_info",0)=40
+	Set gtmtypes("sgm_info","len")=164
 	Set gtmtypes("sgm_info",1,"name")="sgm_info.next_sgm_info"
 	Set gtmtypes("sgm_info",1,"off")=0
 	Set gtmtypes("sgm_info",1,"len")=4
@@ -26161,6 +27110,11 @@ Init
 	Set gtmtypes("sgm_info",39,"len")=4
 	Set gtmtypes("sgm_info",39,"type")="unsigned-int"
 	Set gtmtypfldindx("sgm_info","tot_jrec_size")=39
+	Set gtmtypes("sgm_info",40,"name")="sgm_info.jbuf_rsrv_ptr"
+	Set gtmtypes("sgm_info",40,"off")=160
+	Set gtmtypes("sgm_info",40,"len")=4
+	Set gtmtypes("sgm_info",40,"type")="addr"
+	Set gtmtypfldindx("sgm_info","jbuf_rsrv_ptr")=40
 	;
 	Set gtmtypes("sgmm_addrs")="struct"
 	Set gtmtypes("sgmm_addrs",0)=1
@@ -26779,7 +27733,7 @@ Init
 	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 gtmtypes("sgmnt_addrs",121,"type")="int"
 	Set gtmtypfldindx("sgmnt_addrs","do_fullblockwrites")=121
 	Set gtmtypes("sgmnt_addrs",122,"name")="sgmnt_addrs.regnum"
 	Set gtmtypes("sgmnt_addrs",122,"off")=712
@@ -26943,7 +27897,7 @@ Init
 	Set gtmtypfldindx("sgmnt_addrs","statsDB_setup_completed")=153
 	;
 	Set gtmtypes("sgmnt_data")="struct"
-	Set gtmtypes("sgmnt_data",0)=586
+	Set gtmtypes("sgmnt_data",0)=592
 	Set gtmtypes("sgmnt_data","len")=8192
 	Set gtmtypes("sgmnt_data",1,"name")="sgmnt_data.label"
 	Set gtmtypes("sgmnt_data",1,"off")=0
@@ -27826,11 +28780,11 @@ Init
 	Set gtmtypes("sgmnt_data",174,"len")=8
 	Set gtmtypes("sgmnt_data",174,"type")="uint64_t"
 	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,"name")="sgmnt_data.wcb_gds_rundown2_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_bgtrcrec1_tn")=175
+	Set gtmtypfldindx("sgmnt_data","wcb_gds_rundown2_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
@@ -28121,11 +29075,11 @@ Init
 	Set gtmtypes("sgmnt_data",233,"len")=8
 	Set gtmtypes("sgmnt_data",233,"type")="uint64_t"
 	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,"name")="sgmnt_data.wcb_wcs_flu0_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_tp_grab_crit_tn")=234
+	Set gtmtypfldindx("sgmnt_data","wcb_wcs_flu0_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
@@ -28146,11 +29100,11 @@ Init
 	Set gtmtypes("sgmnt_data",238,"len")=8
 	Set gtmtypes("sgmnt_data",238,"type")="uint64_t"
 	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,"name")="sgmnt_data.wcb_gds_rundown1_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_gds_rundown_tn")=239
+	Set gtmtypfldindx("sgmnt_data","wcb_gds_rundown1_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
@@ -28506,1391 +29460,1421 @@ Init
 	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,"name")="sgmnt_data.jnlbuff_phs2cmt_array_full_tn"
 	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","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","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","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",311,"len")=8
+	Set gtmtypes("sgmnt_data",311,"type")="uint64_t"
+	Set gtmtypfldindx("sgmnt_data","jnlbuff_phs2cmt_array_full_tn")=311
+	Set gtmtypes("sgmnt_data",312,"name")="sgmnt_data.jnl_phase2_cleanup_if_possible_tn"
+	Set gtmtypes("sgmnt_data",312,"off")=3208
+	Set gtmtypes("sgmnt_data",312,"len")=8
+	Set gtmtypes("sgmnt_data",312,"type")="uint64_t"
+	Set gtmtypfldindx("sgmnt_data","jnl_phase2_cleanup_if_possible_tn")=312
+	Set gtmtypes("sgmnt_data",313,"name")="sgmnt_data.jnlbuff_phs2cmt_isprcalv_tn"
+	Set gtmtypes("sgmnt_data",313,"off")=3216
+	Set gtmtypes("sgmnt_data",313,"len")=8
+	Set gtmtypes("sgmnt_data",313,"type")="uint64_t"
+	Set gtmtypfldindx("sgmnt_data","jnlbuff_phs2cmt_isprcalv_tn")=313
+	Set gtmtypes("sgmnt_data",314,"name")="sgmnt_data.bg_trc_rec_tn_filler"
+	Set gtmtypes("sgmnt_data",314,"off")=3224
+	Set gtmtypes("sgmnt_data",314,"len")=24
+	Set gtmtypes("sgmnt_data",314,"type")="char"
+	Set gtmtypfldindx("sgmnt_data","bg_trc_rec_tn_filler")=314
+	Set gtmtypes("sgmnt_data",315,"name")="sgmnt_data.total_buffer_flush_cntr"
+	Set gtmtypes("sgmnt_data",315,"off")=3248
 	Set gtmtypes("sgmnt_data",315,"len")=4
 	Set gtmtypes("sgmnt_data",315,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","total_buffer_flush_cntr")=315
+	Set gtmtypes("sgmnt_data",316,"name")="sgmnt_data.bufct_buffer_flush_cntr"
+	Set gtmtypes("sgmnt_data",316,"off")=3252
 	Set gtmtypes("sgmnt_data",316,"len")=4
 	Set gtmtypes("sgmnt_data",316,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","bufct_buffer_flush_cntr")=316
+	Set gtmtypes("sgmnt_data",317,"name")="sgmnt_data.bufct_buffer_flush_loop_cntr"
+	Set gtmtypes("sgmnt_data",317,"off")=3256
 	Set gtmtypes("sgmnt_data",317,"len")=4
 	Set gtmtypes("sgmnt_data",317,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","bufct_buffer_flush_loop_cntr")=317
+	Set gtmtypes("sgmnt_data",318,"name")="sgmnt_data.wrt_calls_cntr"
+	Set gtmtypes("sgmnt_data",318,"off")=3260
 	Set gtmtypes("sgmnt_data",318,"len")=4
 	Set gtmtypes("sgmnt_data",318,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","wrt_calls_cntr")=318
+	Set gtmtypes("sgmnt_data",319,"name")="sgmnt_data.wrt_count_cntr"
+	Set gtmtypes("sgmnt_data",319,"off")=3264
 	Set gtmtypes("sgmnt_data",319,"len")=4
 	Set gtmtypes("sgmnt_data",319,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","wrt_count_cntr")=319
+	Set gtmtypes("sgmnt_data",320,"name")="sgmnt_data.wrt_blocked_cntr"
+	Set gtmtypes("sgmnt_data",320,"off")=3268
 	Set gtmtypes("sgmnt_data",320,"len")=4
 	Set gtmtypes("sgmnt_data",320,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","wrt_blocked_cntr")=320
+	Set gtmtypes("sgmnt_data",321,"name")="sgmnt_data.wrt_busy_cntr"
+	Set gtmtypes("sgmnt_data",321,"off")=3272
 	Set gtmtypes("sgmnt_data",321,"len")=4
 	Set gtmtypes("sgmnt_data",321,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","wrt_busy_cntr")=321
+	Set gtmtypes("sgmnt_data",322,"name")="sgmnt_data.wrt_noblks_wrtn_cntr"
+	Set gtmtypes("sgmnt_data",322,"off")=3276
 	Set gtmtypes("sgmnt_data",322,"len")=4
 	Set gtmtypes("sgmnt_data",322,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","wrt_noblks_wrtn_cntr")=322
+	Set gtmtypes("sgmnt_data",323,"name")="sgmnt_data.wcb_gds_rundown2_cntr"
+	Set gtmtypes("sgmnt_data",323,"off")=3280
 	Set gtmtypes("sgmnt_data",323,"len")=4
 	Set gtmtypes("sgmnt_data",323,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","wcb_gds_rundown2_cntr")=323
+	Set gtmtypes("sgmnt_data",324,"name")="sgmnt_data.reserved_bgtrcrec2_cntr"
+	Set gtmtypes("sgmnt_data",324,"off")=3284
 	Set gtmtypes("sgmnt_data",324,"len")=4
 	Set gtmtypes("sgmnt_data",324,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","reserved_bgtrcrec2_cntr")=324
+	Set gtmtypes("sgmnt_data",325,"name")="sgmnt_data.reserved_bgtrcrec3_cntr"
+	Set gtmtypes("sgmnt_data",325,"off")=3288
 	Set gtmtypes("sgmnt_data",325,"len")=4
 	Set gtmtypes("sgmnt_data",325,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","reserved_bgtrcrec3_cntr")=325
+	Set gtmtypes("sgmnt_data",326,"name")="sgmnt_data.lost_block_recovery_cntr"
+	Set gtmtypes("sgmnt_data",326,"off")=3292
 	Set gtmtypes("sgmnt_data",326,"len")=4
 	Set gtmtypes("sgmnt_data",326,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","lost_block_recovery_cntr")=326
+	Set gtmtypes("sgmnt_data",327,"name")="sgmnt_data.wc_blocked_onln_rlbk_cntr"
+	Set gtmtypes("sgmnt_data",327,"off")=3296
 	Set gtmtypes("sgmnt_data",327,"len")=4
 	Set gtmtypes("sgmnt_data",327,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","wc_blocked_onln_rlbk_cntr")=327
+	Set gtmtypes("sgmnt_data",328,"name")="sgmnt_data.stale_cntr"
+	Set gtmtypes("sgmnt_data",328,"off")=3300
 	Set gtmtypes("sgmnt_data",328,"len")=4
 	Set gtmtypes("sgmnt_data",328,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","stale_cntr")=328
+	Set gtmtypes("sgmnt_data",329,"name")="sgmnt_data.starved_cntr"
+	Set gtmtypes("sgmnt_data",329,"off")=3304
 	Set gtmtypes("sgmnt_data",329,"len")=4
 	Set gtmtypes("sgmnt_data",329,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","starved_cntr")=329
+	Set gtmtypes("sgmnt_data",330,"name")="sgmnt_data.stale_timer_started_cntr"
+	Set gtmtypes("sgmnt_data",330,"off")=3308
 	Set gtmtypes("sgmnt_data",330,"len")=4
 	Set gtmtypes("sgmnt_data",330,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","stale_timer_started_cntr")=330
+	Set gtmtypes("sgmnt_data",331,"name")="sgmnt_data.stale_timer_pop_cntr"
+	Set gtmtypes("sgmnt_data",331,"off")=3312
 	Set gtmtypes("sgmnt_data",331,"len")=4
 	Set gtmtypes("sgmnt_data",331,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","stale_timer_pop_cntr")=331
+	Set gtmtypes("sgmnt_data",332,"name")="sgmnt_data.stale_process_defer_cntr"
+	Set gtmtypes("sgmnt_data",332,"off")=3316
 	Set gtmtypes("sgmnt_data",332,"len")=4
 	Set gtmtypes("sgmnt_data",332,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","stale_process_defer_cntr")=332
+	Set gtmtypes("sgmnt_data",333,"name")="sgmnt_data.stale_defer_processed_cntr"
+	Set gtmtypes("sgmnt_data",333,"off")=3320
 	Set gtmtypes("sgmnt_data",333,"len")=4
 	Set gtmtypes("sgmnt_data",333,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","stale_defer_processed_cntr")=333
+	Set gtmtypes("sgmnt_data",334,"name")="sgmnt_data.spcfc_buffer_flush_cntr"
+	Set gtmtypes("sgmnt_data",334,"off")=3324
 	Set gtmtypes("sgmnt_data",334,"len")=4
 	Set gtmtypes("sgmnt_data",334,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","spcfc_buffer_flush_cntr")=334
+	Set gtmtypes("sgmnt_data",335,"name")="sgmnt_data.spcfc_buffer_flush_loop_cntr"
+	Set gtmtypes("sgmnt_data",335,"off")=3328
 	Set gtmtypes("sgmnt_data",335,"len")=4
 	Set gtmtypes("sgmnt_data",335,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","spcfc_buffer_flush_loop_cntr")=335
+	Set gtmtypes("sgmnt_data",336,"name")="sgmnt_data.spcfc_buffer_flush_retries_cntr"
+	Set gtmtypes("sgmnt_data",336,"off")=3332
 	Set gtmtypes("sgmnt_data",336,"len")=4
 	Set gtmtypes("sgmnt_data",336,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","spcfc_buffer_flush_retries_cntr")=336
+	Set gtmtypes("sgmnt_data",337,"name")="sgmnt_data.spcfc_buffer_flushed_during_lockwait_cntr"
+	Set gtmtypes("sgmnt_data",337,"off")=3336
 	Set gtmtypes("sgmnt_data",337,"len")=4
 	Set gtmtypes("sgmnt_data",337,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","spcfc_buffer_flushed_during_lockwait_cntr")=337
+	Set gtmtypes("sgmnt_data",338,"name")="sgmnt_data.tp_crit_retries_cntr"
+	Set gtmtypes("sgmnt_data",338,"off")=3340
 	Set gtmtypes("sgmnt_data",338,"len")=4
 	Set gtmtypes("sgmnt_data",338,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","tp_crit_retries_cntr")=338
+	Set gtmtypes("sgmnt_data",339,"name")="sgmnt_data.db_csh_getn_flush_dirty_cntr"
+	Set gtmtypes("sgmnt_data",339,"off")=3344
 	Set gtmtypes("sgmnt_data",339,"len")=4
 	Set gtmtypes("sgmnt_data",339,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","db_csh_getn_flush_dirty_cntr")=339
+	Set gtmtypes("sgmnt_data",340,"name")="sgmnt_data.db_csh_getn_rip_wait_cntr"
+	Set gtmtypes("sgmnt_data",340,"off")=3348
 	Set gtmtypes("sgmnt_data",340,"len")=4
 	Set gtmtypes("sgmnt_data",340,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","db_csh_getn_rip_wait_cntr")=340
+	Set gtmtypes("sgmnt_data",341,"name")="sgmnt_data.db_csh_getn_buf_owner_stuck_cntr"
+	Set gtmtypes("sgmnt_data",341,"off")=3352
 	Set gtmtypes("sgmnt_data",341,"len")=4
 	Set gtmtypes("sgmnt_data",341,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","db_csh_getn_buf_owner_stuck_cntr")=341
+	Set gtmtypes("sgmnt_data",342,"name")="sgmnt_data.db_csh_getn_out_of_design_cntr"
+	Set gtmtypes("sgmnt_data",342,"off")=3356
 	Set gtmtypes("sgmnt_data",342,"len")=4
 	Set gtmtypes("sgmnt_data",342,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","db_csh_getn_out_of_design_cntr")=342
+	Set gtmtypes("sgmnt_data",343,"name")="sgmnt_data.t_qread_buf_owner_stuck_cntr"
+	Set gtmtypes("sgmnt_data",343,"off")=3360
 	Set gtmtypes("sgmnt_data",343,"len")=4
 	Set gtmtypes("sgmnt_data",343,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","t_qread_buf_owner_stuck_cntr")=343
+	Set gtmtypes("sgmnt_data",344,"name")="sgmnt_data.t_qread_out_of_design_cntr"
+	Set gtmtypes("sgmnt_data",344,"off")=3364
 	Set gtmtypes("sgmnt_data",344,"len")=4
 	Set gtmtypes("sgmnt_data",344,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","t_qread_out_of_design_cntr")=344
+	Set gtmtypes("sgmnt_data",345,"name")="sgmnt_data.bt_put_flush_dirty_cntr"
+	Set gtmtypes("sgmnt_data",345,"off")=3368
 	Set gtmtypes("sgmnt_data",345,"len")=4
 	Set gtmtypes("sgmnt_data",345,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","bt_put_flush_dirty_cntr")=345
+	Set gtmtypes("sgmnt_data",346,"name")="sgmnt_data.mlock_wakeups_cntr"
+	Set gtmtypes("sgmnt_data",346,"off")=3372
 	Set gtmtypes("sgmnt_data",346,"len")=4
 	Set gtmtypes("sgmnt_data",346,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","mlock_wakeups_cntr")=346
+	Set gtmtypes("sgmnt_data",347,"name")="sgmnt_data.wc_blocked_wcs_recover_invoked_cntr"
+	Set gtmtypes("sgmnt_data",347,"off")=3376
 	Set gtmtypes("sgmnt_data",347,"len")=4
 	Set gtmtypes("sgmnt_data",347,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","wc_blocked_wcs_recover_invoked_cntr")=347
+	Set gtmtypes("sgmnt_data",348,"name")="sgmnt_data.wc_blocked_wcs_verify_passed_cntr"
+	Set gtmtypes("sgmnt_data",348,"off")=3380
 	Set gtmtypes("sgmnt_data",348,"len")=4
 	Set gtmtypes("sgmnt_data",348,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","wc_blocked_wcs_verify_passed_cntr")=348
+	Set gtmtypes("sgmnt_data",349,"name")="sgmnt_data.wc_blocked_t_qread_db_csh_getn_invalid_blk_cntr"
+	Set gtmtypes("sgmnt_data",349,"off")=3384
 	Set gtmtypes("sgmnt_data",349,"len")=4
 	Set gtmtypes("sgmnt_data",349,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","wc_blocked_t_qread_db_csh_getn_invalid_blk_cntr")=349
+	Set gtmtypes("sgmnt_data",350,"name")="sgmnt_data.wc_blocked_t_qread_db_csh_get_invalid_blk_cntr"
+	Set gtmtypes("sgmnt_data",350,"off")=3388
 	Set gtmtypes("sgmnt_data",350,"len")=4
 	Set gtmtypes("sgmnt_data",350,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","wc_blocked_t_qread_db_csh_get_invalid_blk_cntr")=350
+	Set gtmtypes("sgmnt_data",351,"name")="sgmnt_data.wc_blocked_db_csh_getn_loopexceed_cntr"
+	Set gtmtypes("sgmnt_data",351,"off")=3392
 	Set gtmtypes("sgmnt_data",351,"len")=4
 	Set gtmtypes("sgmnt_data",351,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","wc_blocked_db_csh_getn_loopexceed_cntr")=351
+	Set gtmtypes("sgmnt_data",352,"name")="sgmnt_data.wc_blocked_db_csh_getn_wcsstarvewrt_cntr"
+	Set gtmtypes("sgmnt_data",352,"off")=3396
 	Set gtmtypes("sgmnt_data",352,"len")=4
 	Set gtmtypes("sgmnt_data",352,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","wc_blocked_db_csh_getn_wcsstarvewrt_cntr")=352
+	Set gtmtypes("sgmnt_data",353,"name")="sgmnt_data.wc_blocked_db_csh_get_cntr"
+	Set gtmtypes("sgmnt_data",353,"off")=3400
 	Set gtmtypes("sgmnt_data",353,"len")=4
 	Set gtmtypes("sgmnt_data",353,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","wc_blocked_db_csh_get_cntr")=353
+	Set gtmtypes("sgmnt_data",354,"name")="sgmnt_data.wc_blocked_tp_tend_wcsgetspace_cntr"
+	Set gtmtypes("sgmnt_data",354,"off")=3404
 	Set gtmtypes("sgmnt_data",354,"len")=4
 	Set gtmtypes("sgmnt_data",354,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","wc_blocked_tp_tend_wcsgetspace_cntr")=354
+	Set gtmtypes("sgmnt_data",355,"name")="sgmnt_data.wc_blocked_tp_tend_t1_cntr"
+	Set gtmtypes("sgmnt_data",355,"off")=3408
 	Set gtmtypes("sgmnt_data",355,"len")=4
 	Set gtmtypes("sgmnt_data",355,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","wc_blocked_tp_tend_t1_cntr")=355
+	Set gtmtypes("sgmnt_data",356,"name")="sgmnt_data.wc_blocked_tp_tend_bitmap_cntr"
+	Set gtmtypes("sgmnt_data",356,"off")=3412
 	Set gtmtypes("sgmnt_data",356,"len")=4
 	Set gtmtypes("sgmnt_data",356,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","wc_blocked_tp_tend_bitmap_cntr")=356
+	Set gtmtypes("sgmnt_data",357,"name")="sgmnt_data.wc_blocked_tp_tend_jnl_cwset_cntr"
+	Set gtmtypes("sgmnt_data",357,"off")=3416
 	Set gtmtypes("sgmnt_data",357,"len")=4
 	Set gtmtypes("sgmnt_data",357,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","wc_blocked_tp_tend_jnl_cwset_cntr")=357
+	Set gtmtypes("sgmnt_data",358,"name")="sgmnt_data.wc_blocked_tp_tend_jnl_wcsflu_cntr"
+	Set gtmtypes("sgmnt_data",358,"off")=3420
 	Set gtmtypes("sgmnt_data",358,"len")=4
 	Set gtmtypes("sgmnt_data",358,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","wc_blocked_tp_tend_jnl_wcsflu_cntr")=358
+	Set gtmtypes("sgmnt_data",359,"name")="sgmnt_data.wc_blocked_t_end_hist_cntr"
+	Set gtmtypes("sgmnt_data",359,"off")=3424
 	Set gtmtypes("sgmnt_data",359,"len")=4
 	Set gtmtypes("sgmnt_data",359,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","wc_blocked_t_end_hist_cntr")=359
+	Set gtmtypes("sgmnt_data",360,"name")="sgmnt_data.wc_blocked_t_end_hist1_nullbt_cntr"
+	Set gtmtypes("sgmnt_data",360,"off")=3428
 	Set gtmtypes("sgmnt_data",360,"len")=4
 	Set gtmtypes("sgmnt_data",360,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","wc_blocked_t_end_hist1_nullbt_cntr")=360
+	Set gtmtypes("sgmnt_data",361,"name")="sgmnt_data.wc_blocked_t_end_hist1_nonnullbt_cntr"
+	Set gtmtypes("sgmnt_data",361,"off")=3432
 	Set gtmtypes("sgmnt_data",361,"len")=4
 	Set gtmtypes("sgmnt_data",361,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","wc_blocked_t_end_hist1_nonnullbt_cntr")=361
+	Set gtmtypes("sgmnt_data",362,"name")="sgmnt_data.wc_blocked_t_end_bitmap_nullbt_cntr"
+	Set gtmtypes("sgmnt_data",362,"off")=3436
 	Set gtmtypes("sgmnt_data",362,"len")=4
 	Set gtmtypes("sgmnt_data",362,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","wc_blocked_t_end_bitmap_nullbt_cntr")=362
+	Set gtmtypes("sgmnt_data",363,"name")="sgmnt_data.wc_blocked_t_end_bitmap_nonnullbt_cntr"
+	Set gtmtypes("sgmnt_data",363,"off")=3440
 	Set gtmtypes("sgmnt_data",363,"len")=4
 	Set gtmtypes("sgmnt_data",363,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","wc_blocked_t_end_bitmap_nonnullbt_cntr")=363
+	Set gtmtypes("sgmnt_data",364,"name")="sgmnt_data.wc_blocked_t_end_jnl_cwset_cntr"
+	Set gtmtypes("sgmnt_data",364,"off")=3444
 	Set gtmtypes("sgmnt_data",364,"len")=4
 	Set gtmtypes("sgmnt_data",364,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","wc_blocked_t_end_jnl_cwset_cntr")=364
+	Set gtmtypes("sgmnt_data",365,"name")="sgmnt_data.wc_blocked_t_end_jnl_wcsflu_cntr"
+	Set gtmtypes("sgmnt_data",365,"off")=3448
 	Set gtmtypes("sgmnt_data",365,"len")=4
 	Set gtmtypes("sgmnt_data",365,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","wc_blocked_t_end_jnl_wcsflu_cntr")=365
+	Set gtmtypes("sgmnt_data",366,"name")="sgmnt_data.db_csh_get_too_many_loops_cntr"
+	Set gtmtypes("sgmnt_data",366,"off")=3452
 	Set gtmtypes("sgmnt_data",366,"len")=4
 	Set gtmtypes("sgmnt_data",366,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","db_csh_get_too_many_loops_cntr")=366
+	Set gtmtypes("sgmnt_data",367,"name")="sgmnt_data.wc_blocked_tpckh_hist1_nullbt_cntr"
+	Set gtmtypes("sgmnt_data",367,"off")=3456
 	Set gtmtypes("sgmnt_data",367,"len")=4
 	Set gtmtypes("sgmnt_data",367,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","wc_blocked_tpckh_hist1_nullbt_cntr")=367
+	Set gtmtypes("sgmnt_data",368,"name")="sgmnt_data.wc_blocked_tpckh_hist1_nonnullbt_cntr"
+	Set gtmtypes("sgmnt_data",368,"off")=3460
 	Set gtmtypes("sgmnt_data",368,"len")=4
 	Set gtmtypes("sgmnt_data",368,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","wc_blocked_tpckh_hist1_nonnullbt_cntr")=368
+	Set gtmtypes("sgmnt_data",369,"name")="sgmnt_data.jnl_blocked_writer_lost_cntr"
+	Set gtmtypes("sgmnt_data",369,"off")=3464
 	Set gtmtypes("sgmnt_data",369,"len")=4
 	Set gtmtypes("sgmnt_data",369,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","jnl_blocked_writer_lost_cntr")=369
+	Set gtmtypes("sgmnt_data",370,"name")="sgmnt_data.jnl_blocked_writer_stuck_cntr"
+	Set gtmtypes("sgmnt_data",370,"off")=3468
 	Set gtmtypes("sgmnt_data",370,"len")=4
 	Set gtmtypes("sgmnt_data",370,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","jnl_blocked_writer_stuck_cntr")=370
+	Set gtmtypes("sgmnt_data",371,"name")="sgmnt_data.jnl_blocked_writer_blocked_cntr"
+	Set gtmtypes("sgmnt_data",371,"off")=3472
 	Set gtmtypes("sgmnt_data",371,"len")=4
 	Set gtmtypes("sgmnt_data",371,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","jnl_blocked_writer_blocked_cntr")=371
+	Set gtmtypes("sgmnt_data",372,"name")="sgmnt_data.n_jnl_fsyncs_cntr"
+	Set gtmtypes("sgmnt_data",372,"off")=3476
 	Set gtmtypes("sgmnt_data",372,"len")=4
 	Set gtmtypes("sgmnt_data",372,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","n_jnl_fsyncs_cntr")=372
+	Set gtmtypes("sgmnt_data",373,"name")="sgmnt_data.n_jnl_fsync_tries_cntr"
+	Set gtmtypes("sgmnt_data",373,"off")=3480
 	Set gtmtypes("sgmnt_data",373,"len")=4
 	Set gtmtypes("sgmnt_data",373,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","n_jnl_fsync_tries_cntr")=373
+	Set gtmtypes("sgmnt_data",374,"name")="sgmnt_data.n_jnl_fsync_recovers_cntr"
+	Set gtmtypes("sgmnt_data",374,"off")=3484
 	Set gtmtypes("sgmnt_data",374,"len")=4
 	Set gtmtypes("sgmnt_data",374,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","n_jnl_fsync_recovers_cntr")=374
+	Set gtmtypes("sgmnt_data",375,"name")="sgmnt_data.n_db_fsyncs_cntr"
+	Set gtmtypes("sgmnt_data",375,"off")=3488
 	Set gtmtypes("sgmnt_data",375,"len")=4
 	Set gtmtypes("sgmnt_data",375,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","n_db_fsyncs_cntr")=375
+	Set gtmtypes("sgmnt_data",376,"name")="sgmnt_data.n_db_fsyncs_in_crit_cntr"
+	Set gtmtypes("sgmnt_data",376,"off")=3492
 	Set gtmtypes("sgmnt_data",376,"len")=4
 	Set gtmtypes("sgmnt_data",376,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","n_db_fsyncs_in_crit_cntr")=376
+	Set gtmtypes("sgmnt_data",377,"name")="sgmnt_data.n_dbsync_timers_cntr"
+	Set gtmtypes("sgmnt_data",377,"off")=3496
 	Set gtmtypes("sgmnt_data",377,"len")=4
 	Set gtmtypes("sgmnt_data",377,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","n_dbsync_timers_cntr")=377
+	Set gtmtypes("sgmnt_data",378,"name")="sgmnt_data.n_dbsync_writes_cntr"
+	Set gtmtypes("sgmnt_data",378,"off")=3500
 	Set gtmtypes("sgmnt_data",378,"len")=4
 	Set gtmtypes("sgmnt_data",378,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","n_dbsync_writes_cntr")=378
+	Set gtmtypes("sgmnt_data",379,"name")="sgmnt_data.mutex_queue_full_cntr"
+	Set gtmtypes("sgmnt_data",379,"off")=3504
 	Set gtmtypes("sgmnt_data",379,"len")=4
 	Set gtmtypes("sgmnt_data",379,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","mutex_queue_full_cntr")=379
+	Set gtmtypes("sgmnt_data",380,"name")="sgmnt_data.wcb_bt_put_cntr"
+	Set gtmtypes("sgmnt_data",380,"off")=3508
 	Set gtmtypes("sgmnt_data",380,"len")=4
 	Set gtmtypes("sgmnt_data",380,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","wcb_bt_put_cntr")=380
+	Set gtmtypes("sgmnt_data",381,"name")="sgmnt_data.wcb_mutex_salvage_cntr"
+	Set gtmtypes("sgmnt_data",381,"off")=3512
 	Set gtmtypes("sgmnt_data",381,"len")=4
 	Set gtmtypes("sgmnt_data",381,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","wcb_mutex_salvage_cntr")=381
+	Set gtmtypes("sgmnt_data",382,"name")="sgmnt_data.wcb_wcs_flu0_cntr"
+	Set gtmtypes("sgmnt_data",382,"off")=3516
 	Set gtmtypes("sgmnt_data",382,"len")=4
 	Set gtmtypes("sgmnt_data",382,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","wcb_wcs_flu0_cntr")=382
+	Set gtmtypes("sgmnt_data",383,"name")="sgmnt_data.wcb_t_end_sysops_nocr_invcr_cntr"
+	Set gtmtypes("sgmnt_data",383,"off")=3520
 	Set gtmtypes("sgmnt_data",383,"len")=4
 	Set gtmtypes("sgmnt_data",383,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","wcb_t_end_sysops_nocr_invcr_cntr")=383
+	Set gtmtypes("sgmnt_data",384,"name")="sgmnt_data.wcb_t_end_sysops_cr_invcr_cntr"
+	Set gtmtypes("sgmnt_data",384,"off")=3524
 	Set gtmtypes("sgmnt_data",384,"len")=4
 	Set gtmtypes("sgmnt_data",384,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","wcb_t_end_sysops_cr_invcr_cntr")=384
+	Set gtmtypes("sgmnt_data",385,"name")="sgmnt_data.wcb_t_end_sysops_rip_wait_cntr"
+	Set gtmtypes("sgmnt_data",385,"off")=3528
 	Set gtmtypes("sgmnt_data",385,"len")=4
 	Set gtmtypes("sgmnt_data",385,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","wcb_t_end_sysops_rip_wait_cntr")=385
+	Set gtmtypes("sgmnt_data",386,"name")="sgmnt_data.wcb_t_end_sysops_dirtyripwait_cntr"
+	Set gtmtypes("sgmnt_data",386,"off")=3532
 	Set gtmtypes("sgmnt_data",386,"len")=4
 	Set gtmtypes("sgmnt_data",386,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","wcb_t_end_sysops_dirtyripwait_cntr")=386
+	Set gtmtypes("sgmnt_data",387,"name")="sgmnt_data.wcb_gds_rundown1_cntr"
+	Set gtmtypes("sgmnt_data",387,"off")=3536
 	Set gtmtypes("sgmnt_data",387,"len")=4
 	Set gtmtypes("sgmnt_data",387,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","wcb_gds_rundown1_cntr")=387
+	Set gtmtypes("sgmnt_data",388,"name")="sgmnt_data.wcb_wcs_flu1_cntr"
+	Set gtmtypes("sgmnt_data",388,"off")=3540
 	Set gtmtypes("sgmnt_data",388,"len")=4
 	Set gtmtypes("sgmnt_data",388,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","wcb_wcs_flu1_cntr")=388
+	Set gtmtypes("sgmnt_data",389,"name")="sgmnt_data.wcb_mu_back_cntr"
+	Set gtmtypes("sgmnt_data",389,"off")=3544
 	Set gtmtypes("sgmnt_data",389,"len")=4
 	Set gtmtypes("sgmnt_data",389,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","wcb_mu_back_cntr")=389
+	Set gtmtypes("sgmnt_data",390,"name")="sgmnt_data.wcb_t_end_sysops_dirty_invcr_cntr"
+	Set gtmtypes("sgmnt_data",390,"off")=3548
 	Set gtmtypes("sgmnt_data",390,"len")=4
 	Set gtmtypes("sgmnt_data",390,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","wcb_t_end_sysops_dirty_invcr_cntr")=390
+	Set gtmtypes("sgmnt_data",391,"name")="sgmnt_data.wcb_t_end_sysops_wtfini_fail_cntr"
+	Set gtmtypes("sgmnt_data",391,"off")=3552
 	Set gtmtypes("sgmnt_data",391,"len")=4
 	Set gtmtypes("sgmnt_data",391,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","wcb_t_end_sysops_wtfini_fail_cntr")=391
+	Set gtmtypes("sgmnt_data",392,"name")="sgmnt_data.wcb_t_end_sysops_twin_stuck_cntr"
+	Set gtmtypes("sgmnt_data",392,"off")=3556
 	Set gtmtypes("sgmnt_data",392,"len")=4
 	Set gtmtypes("sgmnt_data",392,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","wcb_t_end_sysops_twin_stuck_cntr")=392
+	Set gtmtypes("sgmnt_data",393,"name")="sgmnt_data.db_csh_getn_wrt_latch_stuck_cntr"
+	Set gtmtypes("sgmnt_data",393,"off")=3560
 	Set gtmtypes("sgmnt_data",393,"len")=4
 	Set gtmtypes("sgmnt_data",393,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","db_csh_getn_wrt_latch_stuck_cntr")=393
+	Set gtmtypes("sgmnt_data",394,"name")="sgmnt_data.wcb_secshr_db_clnup_now_crit_cntr"
+	Set gtmtypes("sgmnt_data",394,"off")=3564
 	Set gtmtypes("sgmnt_data",394,"len")=4
 	Set gtmtypes("sgmnt_data",394,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","wcb_secshr_db_clnup_now_crit_cntr")=394
+	Set gtmtypes("sgmnt_data",395,"name")="sgmnt_data.wc_blocked_t_qread_bad_bt_index1_cntr"
+	Set gtmtypes("sgmnt_data",395,"off")=3568
 	Set gtmtypes("sgmnt_data",395,"len")=4
 	Set gtmtypes("sgmnt_data",395,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","wc_blocked_t_qread_bad_bt_index1_cntr")=395
+	Set gtmtypes("sgmnt_data",396,"name")="sgmnt_data.wc_blocked_t_qread_bad_bt_index2_cntr"
+	Set gtmtypes("sgmnt_data",396,"off")=3572
 	Set gtmtypes("sgmnt_data",396,"len")=4
 	Set gtmtypes("sgmnt_data",396,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","wc_blocked_t_qread_bad_bt_index2_cntr")=396
+	Set gtmtypes("sgmnt_data",397,"name")="sgmnt_data.wc_blocked_t_end_crbtmismatch1_cntr"
+	Set gtmtypes("sgmnt_data",397,"off")=3576
 	Set gtmtypes("sgmnt_data",397,"len")=4
 	Set gtmtypes("sgmnt_data",397,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","wc_blocked_t_end_crbtmismatch1_cntr")=397
+	Set gtmtypes("sgmnt_data",398,"name")="sgmnt_data.wc_blocked_t_end_crbtmismatch2_cntr"
+	Set gtmtypes("sgmnt_data",398,"off")=3580
 	Set gtmtypes("sgmnt_data",398,"len")=4
 	Set gtmtypes("sgmnt_data",398,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","wc_blocked_t_end_crbtmismatch2_cntr")=398
+	Set gtmtypes("sgmnt_data",399,"name")="sgmnt_data.wc_blocked_t_end_crbtmismatch3_cntr"
+	Set gtmtypes("sgmnt_data",399,"off")=3584
 	Set gtmtypes("sgmnt_data",399,"len")=4
 	Set gtmtypes("sgmnt_data",399,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","wc_blocked_t_end_crbtmismatch3_cntr")=399
+	Set gtmtypes("sgmnt_data",400,"name")="sgmnt_data.wc_blocked_tp_tend_crbtmismatch1_cntr"
+	Set gtmtypes("sgmnt_data",400,"off")=3588
 	Set gtmtypes("sgmnt_data",400,"len")=4
 	Set gtmtypes("sgmnt_data",400,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","wc_blocked_tp_tend_crbtmismatch1_cntr")=400
+	Set gtmtypes("sgmnt_data",401,"name")="sgmnt_data.wc_blocked_tp_tend_crbtmismatch2_cntr"
+	Set gtmtypes("sgmnt_data",401,"off")=3592
 	Set gtmtypes("sgmnt_data",401,"len")=4
 	Set gtmtypes("sgmnt_data",401,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","wc_blocked_tp_tend_crbtmismatch2_cntr")=401
+	Set gtmtypes("sgmnt_data",402,"name")="sgmnt_data.wc_blocked_tp_tend_crbtmismatch3_cntr"
+	Set gtmtypes("sgmnt_data",402,"off")=3596
 	Set gtmtypes("sgmnt_data",402,"len")=4
 	Set gtmtypes("sgmnt_data",402,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","wc_blocked_tp_tend_crbtmismatch3_cntr")=402
+	Set gtmtypes("sgmnt_data",403,"name")="sgmnt_data.wc_blocked_wcs_wtstart_bad_cr_cntr"
+	Set gtmtypes("sgmnt_data",403,"off")=3600
 	Set gtmtypes("sgmnt_data",403,"len")=4
 	Set gtmtypes("sgmnt_data",403,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","wc_blocked_wcs_wtstart_bad_cr_cntr")=403
+	Set gtmtypes("sgmnt_data",404,"name")="sgmnt_data.wc_blocked_wcs_wtfini_bad_cr_cntr"
+	Set gtmtypes("sgmnt_data",404,"off")=3604
 	Set gtmtypes("sgmnt_data",404,"len")=4
 	Set gtmtypes("sgmnt_data",404,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","wc_blocked_wcs_wtfini_bad_cr_cntr")=404
+	Set gtmtypes("sgmnt_data",405,"name")="sgmnt_data.wc_blocked_bt_get_cntr"
+	Set gtmtypes("sgmnt_data",405,"off")=3608
 	Set gtmtypes("sgmnt_data",405,"len")=4
 	Set gtmtypes("sgmnt_data",405,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","wc_blocked_bt_get_cntr")=405
+	Set gtmtypes("sgmnt_data",406,"name")="sgmnt_data.wc_blocked_wcs_cdb_sc_final_retry_cntr"
+	Set gtmtypes("sgmnt_data",406,"off")=3612
 	Set gtmtypes("sgmnt_data",406,"len")=4
 	Set gtmtypes("sgmnt_data",406,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","wc_blocked_wcs_cdb_sc_final_retry_cntr")=406
+	Set gtmtypes("sgmnt_data",407,"name")="sgmnt_data.wcb_bg_update_lckfail1_cntr"
+	Set gtmtypes("sgmnt_data",407,"off")=3616
 	Set gtmtypes("sgmnt_data",407,"len")=4
 	Set gtmtypes("sgmnt_data",407,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","wcb_bg_update_lckfail1_cntr")=407
+	Set gtmtypes("sgmnt_data",408,"name")="sgmnt_data.wcb_bg_update_lckfail2_cntr"
+	Set gtmtypes("sgmnt_data",408,"off")=3620
 	Set gtmtypes("sgmnt_data",408,"len")=4
 	Set gtmtypes("sgmnt_data",408,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","wcb_bg_update_lckfail2_cntr")=408
+	Set gtmtypes("sgmnt_data",409,"name")="sgmnt_data.wcb_wtstart_lckfail1_cntr"
+	Set gtmtypes("sgmnt_data",409,"off")=3624
 	Set gtmtypes("sgmnt_data",409,"len")=4
 	Set gtmtypes("sgmnt_data",409,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","wcb_wtstart_lckfail1_cntr")=409
+	Set gtmtypes("sgmnt_data",410,"name")="sgmnt_data.wcb_wtstart_lckfail2_cntr"
+	Set gtmtypes("sgmnt_data",410,"off")=3628
 	Set gtmtypes("sgmnt_data",410,"len")=4
 	Set gtmtypes("sgmnt_data",410,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","wcb_wtstart_lckfail2_cntr")=410
+	Set gtmtypes("sgmnt_data",411,"name")="sgmnt_data.wcb_wtstart_lckfail3_cntr"
+	Set gtmtypes("sgmnt_data",411,"off")=3632
 	Set gtmtypes("sgmnt_data",411,"len")=4
 	Set gtmtypes("sgmnt_data",411,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","wcb_wtstart_lckfail3_cntr")=411
+	Set gtmtypes("sgmnt_data",412,"name")="sgmnt_data.wcb_wtstart_lckfail4_cntr"
+	Set gtmtypes("sgmnt_data",412,"off")=3636
 	Set gtmtypes("sgmnt_data",412,"len")=4
 	Set gtmtypes("sgmnt_data",412,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","wcb_wtstart_lckfail4_cntr")=412
+	Set gtmtypes("sgmnt_data",413,"name")="sgmnt_data.wcb_wtfini_lckfail1_cntr"
+	Set gtmtypes("sgmnt_data",413,"off")=3640
 	Set gtmtypes("sgmnt_data",413,"len")=4
 	Set gtmtypes("sgmnt_data",413,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","wcb_wtfini_lckfail1_cntr")=413
+	Set gtmtypes("sgmnt_data",414,"name")="sgmnt_data.wcb_wtfini_lckfail2_cntr"
+	Set gtmtypes("sgmnt_data",414,"off")=3644
 	Set gtmtypes("sgmnt_data",414,"len")=4
 	Set gtmtypes("sgmnt_data",414,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","wcb_wtfini_lckfail2_cntr")=414
+	Set gtmtypes("sgmnt_data",415,"name")="sgmnt_data.wcb_wtfini_lckfail3_cntr"
+	Set gtmtypes("sgmnt_data",415,"off")=3648
 	Set gtmtypes("sgmnt_data",415,"len")=4
 	Set gtmtypes("sgmnt_data",415,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","wcb_wtfini_lckfail3_cntr")=415
+	Set gtmtypes("sgmnt_data",416,"name")="sgmnt_data.wcb_wtfini_lckfail4_cntr"
+	Set gtmtypes("sgmnt_data",416,"off")=3652
 	Set gtmtypes("sgmnt_data",416,"len")=4
 	Set gtmtypes("sgmnt_data",416,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","wcb_wtfini_lckfail4_cntr")=416
+	Set gtmtypes("sgmnt_data",417,"name")="sgmnt_data.wcb_t_end_sysops_dirtystuck1_cntr"
+	Set gtmtypes("sgmnt_data",417,"off")=3656
 	Set gtmtypes("sgmnt_data",417,"len")=4
 	Set gtmtypes("sgmnt_data",417,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","wcb_t_end_sysops_dirtystuck1_cntr")=417
+	Set gtmtypes("sgmnt_data",418,"name")="sgmnt_data.wcb_t_end_sysops_dirtystuck2_cntr"
+	Set gtmtypes("sgmnt_data",418,"off")=3660
 	Set gtmtypes("sgmnt_data",418,"len")=4
 	Set gtmtypes("sgmnt_data",418,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","wcb_t_end_sysops_dirtystuck2_cntr")=418
+	Set gtmtypes("sgmnt_data",419,"name")="sgmnt_data.wcb_secshr_db_clnup_wbuf_dqd_cntr"
+	Set gtmtypes("sgmnt_data",419,"off")=3664
 	Set gtmtypes("sgmnt_data",419,"len")=4
 	Set gtmtypes("sgmnt_data",419,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","wcb_secshr_db_clnup_wbuf_dqd_cntr")=419
+	Set gtmtypes("sgmnt_data",420,"name")="sgmnt_data.dwngrd_refmts_syncio_cntr"
+	Set gtmtypes("sgmnt_data",420,"off")=3668
 	Set gtmtypes("sgmnt_data",420,"len")=4
 	Set gtmtypes("sgmnt_data",420,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","dwngrd_refmts_syncio_cntr")=420
+	Set gtmtypes("sgmnt_data",421,"name")="sgmnt_data.dwngrd_refmts_asyncio_cntr"
+	Set gtmtypes("sgmnt_data",421,"off")=3672
 	Set gtmtypes("sgmnt_data",421,"len")=4
 	Set gtmtypes("sgmnt_data",421,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","dwngrd_refmts_asyncio_cntr")=421
+	Set gtmtypes("sgmnt_data",422,"name")="sgmnt_data.shmpool_refmt_harvests_cntr"
+	Set gtmtypes("sgmnt_data",422,"off")=3676
 	Set gtmtypes("sgmnt_data",422,"len")=4
 	Set gtmtypes("sgmnt_data",422,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","shmpool_refmt_harvests_cntr")=422
+	Set gtmtypes("sgmnt_data",423,"name")="sgmnt_data.shmpool_recovery_cntr"
+	Set gtmtypes("sgmnt_data",423,"off")=3680
 	Set gtmtypes("sgmnt_data",423,"len")=4
 	Set gtmtypes("sgmnt_data",423,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","shmpool_recovery_cntr")=423
+	Set gtmtypes("sgmnt_data",424,"name")="sgmnt_data.shmpool_blkd_by_sdc_cntr"
+	Set gtmtypes("sgmnt_data",424,"off")=3684
 	Set gtmtypes("sgmnt_data",424,"len")=4
 	Set gtmtypes("sgmnt_data",424,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","shmpool_blkd_by_sdc_cntr")=424
+	Set gtmtypes("sgmnt_data",425,"name")="sgmnt_data.shmpool_alloc_bbflush_cntr"
+	Set gtmtypes("sgmnt_data",425,"off")=3688
 	Set gtmtypes("sgmnt_data",425,"len")=4
 	Set gtmtypes("sgmnt_data",425,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","shmpool_alloc_bbflush_cntr")=425
+	Set gtmtypes("sgmnt_data",426,"name")="sgmnt_data.refmt_hvst_blk_released_replaced_cntr"
+	Set gtmtypes("sgmnt_data",426,"off")=3692
 	Set gtmtypes("sgmnt_data",426,"len")=4
 	Set gtmtypes("sgmnt_data",426,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","refmt_hvst_blk_released_replaced_cntr")=426
+	Set gtmtypes("sgmnt_data",427,"name")="sgmnt_data.refmt_hvst_blk_released_io_complete_cntr"
+	Set gtmtypes("sgmnt_data",427,"off")=3696
 	Set gtmtypes("sgmnt_data",427,"len")=4
 	Set gtmtypes("sgmnt_data",427,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","refmt_hvst_blk_released_io_complete_cntr")=427
+	Set gtmtypes("sgmnt_data",428,"name")="sgmnt_data.refmt_hvst_blk_kept_cntr"
+	Set gtmtypes("sgmnt_data",428,"off")=3700
 	Set gtmtypes("sgmnt_data",428,"len")=4
 	Set gtmtypes("sgmnt_data",428,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","refmt_hvst_blk_kept_cntr")=428
+	Set gtmtypes("sgmnt_data",429,"name")="sgmnt_data.refmt_hvst_blk_ignored_cntr"
+	Set gtmtypes("sgmnt_data",429,"off")=3704
 	Set gtmtypes("sgmnt_data",429,"len")=4
 	Set gtmtypes("sgmnt_data",429,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","refmt_hvst_blk_ignored_cntr")=429
+	Set gtmtypes("sgmnt_data",430,"name")="sgmnt_data.refmt_blk_chk_blk_freed_cntr"
+	Set gtmtypes("sgmnt_data",430,"off")=3708
 	Set gtmtypes("sgmnt_data",430,"len")=4
 	Set gtmtypes("sgmnt_data",430,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","refmt_blk_chk_blk_freed_cntr")=430
+	Set gtmtypes("sgmnt_data",431,"name")="sgmnt_data.refmt_blk_chk_blk_kept_cntr"
+	Set gtmtypes("sgmnt_data",431,"off")=3712
 	Set gtmtypes("sgmnt_data",431,"len")=4
 	Set gtmtypes("sgmnt_data",431,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","refmt_blk_chk_blk_kept_cntr")=431
+	Set gtmtypes("sgmnt_data",432,"name")="sgmnt_data.active_lvl_trigger_cntr"
+	Set gtmtypes("sgmnt_data",432,"off")=3716
 	Set gtmtypes("sgmnt_data",432,"len")=4
 	Set gtmtypes("sgmnt_data",432,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","active_lvl_trigger_cntr")=432
+	Set gtmtypes("sgmnt_data",433,"name")="sgmnt_data.new_buff_cntr"
+	Set gtmtypes("sgmnt_data",433,"off")=3720
 	Set gtmtypes("sgmnt_data",433,"len")=4
 	Set gtmtypes("sgmnt_data",433,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","new_buff_cntr")=433
+	Set gtmtypes("sgmnt_data",434,"name")="sgmnt_data.phase2_commit_wait_sleep_in_crit_cntr"
+	Set gtmtypes("sgmnt_data",434,"off")=3724
 	Set gtmtypes("sgmnt_data",434,"len")=4
 	Set gtmtypes("sgmnt_data",434,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","phase2_commit_wait_sleep_in_crit_cntr")=434
+	Set gtmtypes("sgmnt_data",435,"name")="sgmnt_data.phase2_commit_wait_sleep_no_crit_cntr"
+	Set gtmtypes("sgmnt_data",435,"off")=3728
 	Set gtmtypes("sgmnt_data",435,"len")=4
 	Set gtmtypes("sgmnt_data",435,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","phase2_commit_wait_sleep_no_crit_cntr")=435
+	Set gtmtypes("sgmnt_data",436,"name")="sgmnt_data.phase2_commit_wait_pidcnt_cntr"
+	Set gtmtypes("sgmnt_data",436,"off")=3732
 	Set gtmtypes("sgmnt_data",436,"len")=4
 	Set gtmtypes("sgmnt_data",436,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","phase2_commit_wait_pidcnt_cntr")=436
+	Set gtmtypes("sgmnt_data",437,"name")="sgmnt_data.wcb_t_end_sysops_intend_wait_cntr"
+	Set gtmtypes("sgmnt_data",437,"off")=3736
 	Set gtmtypes("sgmnt_data",437,"len")=4
 	Set gtmtypes("sgmnt_data",437,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","wcb_t_end_sysops_intend_wait_cntr")=437
+	Set gtmtypes("sgmnt_data",438,"name")="sgmnt_data.wcb_secshr_db_clnup_phase2_clnup_cntr"
+	Set gtmtypes("sgmnt_data",438,"off")=3740
 	Set gtmtypes("sgmnt_data",438,"len")=4
 	Set gtmtypes("sgmnt_data",438,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","wcb_secshr_db_clnup_phase2_clnup_cntr")=438
+	Set gtmtypes("sgmnt_data",439,"name")="sgmnt_data.wcb_phase2_commit_wait_cntr"
+	Set gtmtypes("sgmnt_data",439,"off")=3744
 	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 gtmtypfldindx("sgmnt_data","wcb_phase2_commit_wait_cntr")=439
+	Set gtmtypes("sgmnt_data",440,"name")="sgmnt_data.recompute_upd_array_calls_cntr"
+	Set gtmtypes("sgmnt_data",440,"off")=3748
 	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 gtmtypfldindx("sgmnt_data","recompute_upd_array_calls_cntr")=440
+	Set gtmtypes("sgmnt_data",441,"name")="sgmnt_data.recompute_upd_array_rip_cntr"
+	Set gtmtypes("sgmnt_data",441,"off")=3752
 	Set gtmtypes("sgmnt_data",441,"len")=4
 	Set gtmtypes("sgmnt_data",441,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","recompute_upd_array_rip_cntr")=441
+	Set gtmtypes("sgmnt_data",442,"name")="sgmnt_data.recompute_upd_array_in_tend_cntr"
+	Set gtmtypes("sgmnt_data",442,"off")=3756
 	Set gtmtypes("sgmnt_data",442,"len")=4
 	Set gtmtypes("sgmnt_data",442,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","recompute_upd_array_in_tend_cntr")=442
+	Set gtmtypes("sgmnt_data",443,"name")="sgmnt_data.recompute_upd_array_search_blk_cntr"
+	Set gtmtypes("sgmnt_data",443,"off")=3760
 	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 gtmtypfldindx("sgmnt_data","recompute_upd_array_search_blk_cntr")=443
+	Set gtmtypes("sgmnt_data",444,"name")="sgmnt_data.recompute_upd_array_new_rec_cntr"
+	Set gtmtypes("sgmnt_data",444,"off")=3764
 	Set gtmtypes("sgmnt_data",444,"len")=4
 	Set gtmtypes("sgmnt_data",444,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","recompute_upd_array_new_rec_cntr")=444
+	Set gtmtypes("sgmnt_data",445,"name")="sgmnt_data.recompute_upd_array_rec_size_cntr"
+	Set gtmtypes("sgmnt_data",445,"off")=3768
 	Set gtmtypes("sgmnt_data",445,"len")=4
 	Set gtmtypes("sgmnt_data",445,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","recompute_upd_array_rec_size_cntr")=445
+	Set gtmtypes("sgmnt_data",446,"name")="sgmnt_data.recompute_upd_array_rec_cmpc_cntr"
+	Set gtmtypes("sgmnt_data",446,"off")=3772
 	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 gtmtypfldindx("sgmnt_data","recompute_upd_array_rec_cmpc_cntr")=446
+	Set gtmtypes("sgmnt_data",447,"name")="sgmnt_data.recompute_upd_array_blk_fini_cntr"
+	Set gtmtypes("sgmnt_data",447,"off")=3776
 	Set gtmtypes("sgmnt_data",447,"len")=4
 	Set gtmtypes("sgmnt_data",447,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","recompute_upd_array_blk_fini_cntr")=447
+	Set gtmtypes("sgmnt_data",448,"name")="sgmnt_data.recompute_upd_array_blk_split_cntr"
+	Set gtmtypes("sgmnt_data",448,"off")=3780
 	Set gtmtypes("sgmnt_data",448,"len")=4
 	Set gtmtypes("sgmnt_data",448,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","recompute_upd_array_blk_split_cntr")=448
+	Set gtmtypes("sgmnt_data",449,"name")="sgmnt_data.t_qread_ripsleep_cnt_cntr"
+	Set gtmtypes("sgmnt_data",449,"off")=3784
 	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 gtmtypfldindx("sgmnt_data","t_qread_ripsleep_cnt_cntr")=449
+	Set gtmtypes("sgmnt_data",450,"name")="sgmnt_data.t_qread_ripsleep_nblks_cntr"
+	Set gtmtypes("sgmnt_data",450,"off")=3788
 	Set gtmtypes("sgmnt_data",450,"len")=4
 	Set gtmtypes("sgmnt_data",450,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","t_qread_ripsleep_nblks_cntr")=450
+	Set gtmtypes("sgmnt_data",451,"name")="sgmnt_data.wcs_wtfini_invoked_cntr"
+	Set gtmtypes("sgmnt_data",451,"off")=3792
 	Set gtmtypes("sgmnt_data",451,"len")=4
 	Set gtmtypes("sgmnt_data",451,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","wcs_wtfini_invoked_cntr")=451
+	Set gtmtypes("sgmnt_data",452,"name")="sgmnt_data.wcs_wterror_invoked_cntr"
+	Set gtmtypes("sgmnt_data",452,"off")=3796
 	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 gtmtypfldindx("sgmnt_data","wcs_wterror_invoked_cntr")=452
+	Set gtmtypes("sgmnt_data",453,"name")="sgmnt_data.wcs_wt_restart_invoked_cntr"
+	Set gtmtypes("sgmnt_data",453,"off")=3800
 	Set gtmtypes("sgmnt_data",453,"len")=4
 	Set gtmtypes("sgmnt_data",453,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","wcs_wt_restart_invoked_cntr")=453
+	Set gtmtypes("sgmnt_data",454,"name")="sgmnt_data.wcs_wt_restart_eagain_cntr"
+	Set gtmtypes("sgmnt_data",454,"off")=3804
 	Set gtmtypes("sgmnt_data",454,"len")=4
 	Set gtmtypes("sgmnt_data",454,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","wcs_wt_restart_eagain_cntr")=454
+	Set gtmtypes("sgmnt_data",455,"name")="sgmnt_data.wcs_wt_restart_reinsert_cntr"
+	Set gtmtypes("sgmnt_data",455,"off")=3808
 	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 gtmtypfldindx("sgmnt_data","wcs_wt_restart_reinsert_cntr")=455
+	Set gtmtypes("sgmnt_data",456,"name")="sgmnt_data.wcs_wtstart_eagain_cntr"
+	Set gtmtypes("sgmnt_data",456,"off")=3812
+	Set gtmtypes("sgmnt_data",456,"len")=4
+	Set gtmtypes("sgmnt_data",456,"type")="int"
+	Set gtmtypfldindx("sgmnt_data","wcs_wtstart_eagain_cntr")=456
+	Set gtmtypes("sgmnt_data",457,"name")="sgmnt_data.wcs_wtstart_eagain_incrit_cntr"
+	Set gtmtypes("sgmnt_data",457,"off")=3816
+	Set gtmtypes("sgmnt_data",457,"len")=4
+	Set gtmtypes("sgmnt_data",457,"type")="int"
+	Set gtmtypfldindx("sgmnt_data","wcs_wtstart_eagain_incrit_cntr")=457
+	Set gtmtypes("sgmnt_data",458,"name")="sgmnt_data.async_restart_eagain_cntr"
+	Set gtmtypes("sgmnt_data",458,"off")=3820
 	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 gtmtypfldindx("sgmnt_data","async_restart_eagain_cntr")=458
+	Set gtmtypes("sgmnt_data",459,"name")="sgmnt_data.jnlbuff_phs2cmt_array_full_cntr"
+	Set gtmtypes("sgmnt_data",459,"off")=3824
 	Set gtmtypes("sgmnt_data",459,"len")=4
 	Set gtmtypes("sgmnt_data",459,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","jnlbuff_phs2cmt_array_full_cntr")=459
+	Set gtmtypes("sgmnt_data",460,"name")="sgmnt_data.jnl_phase2_cleanup_if_possible_cntr"
+	Set gtmtypes("sgmnt_data",460,"off")=3828
+	Set gtmtypes("sgmnt_data",460,"len")=4
+	Set gtmtypes("sgmnt_data",460,"type")="int"
+	Set gtmtypfldindx("sgmnt_data","jnl_phase2_cleanup_if_possible_cntr")=460
+	Set gtmtypes("sgmnt_data",461,"name")="sgmnt_data.jnlbuff_phs2cmt_isprcalv_cntr"
+	Set gtmtypes("sgmnt_data",461,"off")=3832
 	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_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 gtmtypfldindx("sgmnt_data","jnlbuff_phs2cmt_isprcalv_cntr")=461
+	Set gtmtypes("sgmnt_data",462,"name")="sgmnt_data.bg_trc_rec_cntr_filler"
+	Set gtmtypes("sgmnt_data",462,"off")=3836
+	Set gtmtypes("sgmnt_data",462,"len")=12
+	Set gtmtypes("sgmnt_data",462,"type")="char"
+	Set gtmtypfldindx("sgmnt_data","bg_trc_rec_cntr_filler")=462
+	Set gtmtypes("sgmnt_data",463,"name")="sgmnt_data.n_gvcst_srches"
+	Set gtmtypes("sgmnt_data",463,"off")=3848
 	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 gtmtypfldindx("sgmnt_data","n_gvcst_srches")=463
+	Set gtmtypes("sgmnt_data",464,"name")="sgmnt_data.n_gvcst_srches.curr_count"
+	Set gtmtypes("sgmnt_data",464,"off")=3848
 	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 gtmtypfldindx("sgmnt_data","n_gvcst_srches.curr_count")=464
+	Set gtmtypes("sgmnt_data",465,"name")="sgmnt_data.n_gvcst_srches.cumul_count"
+	Set gtmtypes("sgmnt_data",465,"off")=3852
 	Set gtmtypes("sgmnt_data",465,"len")=4
 	Set gtmtypes("sgmnt_data",465,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","n_gvcst_srches.cumul_count")=465
+	Set gtmtypes("sgmnt_data",466,"name")="sgmnt_data.n_gvcst_srch_clues"
+	Set gtmtypes("sgmnt_data",466,"off")=3856
 	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 gtmtypfldindx("sgmnt_data","n_gvcst_srch_clues")=466
+	Set gtmtypes("sgmnt_data",467,"name")="sgmnt_data.n_gvcst_srch_clues.curr_count"
+	Set gtmtypes("sgmnt_data",467,"off")=3856
 	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 gtmtypfldindx("sgmnt_data","n_gvcst_srch_clues.curr_count")=467
+	Set gtmtypes("sgmnt_data",468,"name")="sgmnt_data.n_gvcst_srch_clues.cumul_count"
+	Set gtmtypes("sgmnt_data",468,"off")=3860
 	Set gtmtypes("sgmnt_data",468,"len")=4
 	Set gtmtypes("sgmnt_data",468,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","n_gvcst_srch_clues.cumul_count")=468
+	Set gtmtypes("sgmnt_data",469,"name")="sgmnt_data.n_clue_used_head"
+	Set gtmtypes("sgmnt_data",469,"off")=3864
 	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 gtmtypfldindx("sgmnt_data","n_clue_used_head")=469
+	Set gtmtypes("sgmnt_data",470,"name")="sgmnt_data.n_clue_used_head.curr_count"
+	Set gtmtypes("sgmnt_data",470,"off")=3864
 	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 gtmtypfldindx("sgmnt_data","n_clue_used_head.curr_count")=470
+	Set gtmtypes("sgmnt_data",471,"name")="sgmnt_data.n_clue_used_head.cumul_count"
+	Set gtmtypes("sgmnt_data",471,"off")=3868
 	Set gtmtypes("sgmnt_data",471,"len")=4
 	Set gtmtypes("sgmnt_data",471,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","n_clue_used_head.cumul_count")=471
+	Set gtmtypes("sgmnt_data",472,"name")="sgmnt_data.n_clue_used_same"
+	Set gtmtypes("sgmnt_data",472,"off")=3872
 	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 gtmtypfldindx("sgmnt_data","n_clue_used_same")=472
+	Set gtmtypes("sgmnt_data",473,"name")="sgmnt_data.n_clue_used_same.curr_count"
+	Set gtmtypes("sgmnt_data",473,"off")=3872
 	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 gtmtypfldindx("sgmnt_data","n_clue_used_same.curr_count")=473
+	Set gtmtypes("sgmnt_data",474,"name")="sgmnt_data.n_clue_used_same.cumul_count"
+	Set gtmtypes("sgmnt_data",474,"off")=3876
 	Set gtmtypes("sgmnt_data",474,"len")=4
 	Set gtmtypes("sgmnt_data",474,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","n_clue_used_same.cumul_count")=474
+	Set gtmtypes("sgmnt_data",475,"name")="sgmnt_data.n_clue_used_tail"
+	Set gtmtypes("sgmnt_data",475,"off")=3880
 	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 gtmtypfldindx("sgmnt_data","n_clue_used_tail")=475
+	Set gtmtypes("sgmnt_data",476,"name")="sgmnt_data.n_clue_used_tail.curr_count"
+	Set gtmtypes("sgmnt_data",476,"off")=3880
 	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 gtmtypfldindx("sgmnt_data","n_clue_used_tail.curr_count")=476
+	Set gtmtypes("sgmnt_data",477,"name")="sgmnt_data.n_clue_used_tail.cumul_count"
+	Set gtmtypes("sgmnt_data",477,"off")=3884
 	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 gtmtypfldindx("sgmnt_data","n_clue_used_tail.cumul_count")=477
+	Set gtmtypes("sgmnt_data",478,"name")="sgmnt_data.n_t_qreads"
+	Set gtmtypes("sgmnt_data",478,"off")=3888
 	Set gtmtypes("sgmnt_data",478,"len")=8
 	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 gtmtypfldindx("sgmnt_data","n_t_qreads")=478
+	Set gtmtypes("sgmnt_data",479,"name")="sgmnt_data.n_t_qreads.curr_count"
+	Set gtmtypes("sgmnt_data",479,"off")=3888
 	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 gtmtypfldindx("sgmnt_data","n_t_qreads.curr_count")=479
+	Set gtmtypes("sgmnt_data",480,"name")="sgmnt_data.n_t_qreads.cumul_count"
+	Set gtmtypes("sgmnt_data",480,"off")=3892
 	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 gtmtypfldindx("sgmnt_data","n_t_qreads.cumul_count")=480
+	Set gtmtypes("sgmnt_data",481,"name")="sgmnt_data.unused_dsk_reads"
+	Set gtmtypes("sgmnt_data",481,"off")=3896
 	Set gtmtypes("sgmnt_data",481,"len")=8
 	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 gtmtypfldindx("sgmnt_data","unused_dsk_reads")=481
+	Set gtmtypes("sgmnt_data",482,"name")="sgmnt_data.unused_dsk_reads.curr_count"
+	Set gtmtypes("sgmnt_data",482,"off")=3896
 	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 gtmtypfldindx("sgmnt_data","unused_dsk_reads.curr_count")=482
+	Set gtmtypes("sgmnt_data",483,"name")="sgmnt_data.unused_dsk_reads.cumul_count"
+	Set gtmtypes("sgmnt_data",483,"off")=3900
 	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 gtmtypfldindx("sgmnt_data","unused_dsk_reads.cumul_count")=483
+	Set gtmtypes("sgmnt_data",484,"name")="sgmnt_data.n_bgmm_updates"
+	Set gtmtypes("sgmnt_data",484,"off")=3904
 	Set gtmtypes("sgmnt_data",484,"len")=8
 	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 gtmtypfldindx("sgmnt_data","n_bgmm_updates")=484
+	Set gtmtypes("sgmnt_data",485,"name")="sgmnt_data.n_bgmm_updates.curr_count"
+	Set gtmtypes("sgmnt_data",485,"off")=3904
 	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 gtmtypfldindx("sgmnt_data","n_bgmm_updates.curr_count")=485
+	Set gtmtypes("sgmnt_data",486,"name")="sgmnt_data.n_bgmm_updates.cumul_count"
+	Set gtmtypes("sgmnt_data",486,"off")=3908
 	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 gtmtypfldindx("sgmnt_data","n_bgmm_updates.cumul_count")=486
+	Set gtmtypes("sgmnt_data",487,"name")="sgmnt_data.unused_dsk_writes"
+	Set gtmtypes("sgmnt_data",487,"off")=3912
 	Set gtmtypes("sgmnt_data",487,"len")=8
 	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 gtmtypfldindx("sgmnt_data","unused_dsk_writes")=487
+	Set gtmtypes("sgmnt_data",488,"name")="sgmnt_data.unused_dsk_writes.curr_count"
+	Set gtmtypes("sgmnt_data",488,"off")=3912
 	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 gtmtypfldindx("sgmnt_data","unused_dsk_writes.curr_count")=488
+	Set gtmtypes("sgmnt_data",489,"name")="sgmnt_data.unused_dsk_writes.cumul_count"
+	Set gtmtypes("sgmnt_data",489,"off")=3916
 	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 gtmtypfldindx("sgmnt_data","unused_dsk_writes.cumul_count")=489
+	Set gtmtypes("sgmnt_data",490,"name")="sgmnt_data.n_bg_update_creates"
+	Set gtmtypes("sgmnt_data",490,"off")=3920
 	Set gtmtypes("sgmnt_data",490,"len")=8
 	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 gtmtypfldindx("sgmnt_data","n_bg_update_creates")=490
+	Set gtmtypes("sgmnt_data",491,"name")="sgmnt_data.n_bg_update_creates.curr_count"
+	Set gtmtypes("sgmnt_data",491,"off")=3920
 	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 gtmtypfldindx("sgmnt_data","n_bg_update_creates.curr_count")=491
+	Set gtmtypes("sgmnt_data",492,"name")="sgmnt_data.n_bg_update_creates.cumul_count"
+	Set gtmtypes("sgmnt_data",492,"off")=3924
 	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_set")=495
-	Set gtmtypes("sgmnt_data",496,"name")="sgmnt_data.gvstats_rec.n_kill"
-	Set gtmtypes("sgmnt_data",496,"off")=4104
+	Set gtmtypfldindx("sgmnt_data","n_bg_update_creates.cumul_count")=492
+	Set gtmtypes("sgmnt_data",493,"name")="sgmnt_data.n_db_csh_getns"
+	Set gtmtypes("sgmnt_data",493,"off")=3928
+	Set gtmtypes("sgmnt_data",493,"len")=8
+	Set gtmtypes("sgmnt_data",493,"type")="db_csh_acct_rec"
+	Set gtmtypfldindx("sgmnt_data","n_db_csh_getns")=493
+	Set gtmtypes("sgmnt_data",494,"name")="sgmnt_data.n_db_csh_getns.curr_count"
+	Set gtmtypes("sgmnt_data",494,"off")=3928
+	Set gtmtypes("sgmnt_data",494,"len")=4
+	Set gtmtypes("sgmnt_data",494,"type")="int"
+	Set gtmtypfldindx("sgmnt_data","n_db_csh_getns.curr_count")=494
+	Set gtmtypes("sgmnt_data",495,"name")="sgmnt_data.n_db_csh_getns.cumul_count"
+	Set gtmtypes("sgmnt_data",495,"off")=3932
+	Set gtmtypes("sgmnt_data",495,"len")=4
+	Set gtmtypes("sgmnt_data",495,"type")="int"
+	Set gtmtypfldindx("sgmnt_data","n_db_csh_getns.cumul_count")=495
+	Set gtmtypes("sgmnt_data",496,"name")="sgmnt_data.n_db_csh_getn_lcnt"
+	Set gtmtypes("sgmnt_data",496,"off")=3936
 	Set gtmtypes("sgmnt_data",496,"len")=8
-	Set gtmtypes("sgmnt_data",496,"type")="uint64_t"
-	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_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_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_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_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",496,"type")="db_csh_acct_rec"
+	Set gtmtypfldindx("sgmnt_data","n_db_csh_getn_lcnt")=496
+	Set gtmtypes("sgmnt_data",497,"name")="sgmnt_data.n_db_csh_getn_lcnt.curr_count"
+	Set gtmtypes("sgmnt_data",497,"off")=3936
+	Set gtmtypes("sgmnt_data",497,"len")=4
+	Set gtmtypes("sgmnt_data",497,"type")="int"
+	Set gtmtypfldindx("sgmnt_data","n_db_csh_getn_lcnt.curr_count")=497
+	Set gtmtypes("sgmnt_data",498,"name")="sgmnt_data.n_db_csh_getn_lcnt.cumul_count"
+	Set gtmtypes("sgmnt_data",498,"off")=3940
+	Set gtmtypes("sgmnt_data",498,"len")=4
+	Set gtmtypes("sgmnt_data",498,"type")="int"
+	Set gtmtypfldindx("sgmnt_data","n_db_csh_getn_lcnt.cumul_count")=498
+	Set gtmtypes("sgmnt_data",499,"name")="sgmnt_data.db_csh_acct_rec_filler_4k"
+	Set gtmtypes("sgmnt_data",499,"off")=3944
+	Set gtmtypes("sgmnt_data",499,"len")=152
+	Set gtmtypes("sgmnt_data",499,"type")="char"
+	Set gtmtypfldindx("sgmnt_data","db_csh_acct_rec_filler_4k")=499
+	Set gtmtypes("sgmnt_data",500,"name")="sgmnt_data.gvstats_rec"
+	Set gtmtypes("sgmnt_data",500,"off")=4096
+	Set gtmtypes("sgmnt_data",500,"len")=472
+	Set gtmtypes("sgmnt_data",500,"type")="gvstats_rec_t"
+	Set gtmtypfldindx("sgmnt_data","gvstats_rec")=500
+	Set gtmtypes("sgmnt_data",501,"name")="sgmnt_data.gvstats_rec.n_set"
+	Set gtmtypes("sgmnt_data",501,"off")=4096
 	Set gtmtypes("sgmnt_data",501,"len")=8
 	Set gtmtypes("sgmnt_data",501,"type")="uint64_t"
-	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 gtmtypfldindx("sgmnt_data","gvstats_rec.n_set")=501
+	Set gtmtypes("sgmnt_data",502,"name")="sgmnt_data.gvstats_rec.n_kill"
+	Set gtmtypes("sgmnt_data",502,"off")=4104
 	Set gtmtypes("sgmnt_data",502,"len")=8
 	Set gtmtypes("sgmnt_data",502,"type")="uint64_t"
-	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 gtmtypfldindx("sgmnt_data","gvstats_rec.n_kill")=502
+	Set gtmtypes("sgmnt_data",503,"name")="sgmnt_data.gvstats_rec.n_get"
+	Set gtmtypes("sgmnt_data",503,"off")=4112
 	Set gtmtypes("sgmnt_data",503,"len")=8
 	Set gtmtypes("sgmnt_data",503,"type")="uint64_t"
-	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 gtmtypfldindx("sgmnt_data","gvstats_rec.n_get")=503
+	Set gtmtypes("sgmnt_data",504,"name")="sgmnt_data.gvstats_rec.n_data"
+	Set gtmtypes("sgmnt_data",504,"off")=4120
 	Set gtmtypes("sgmnt_data",504,"len")=8
 	Set gtmtypes("sgmnt_data",504,"type")="uint64_t"
-	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 gtmtypfldindx("sgmnt_data","gvstats_rec.n_data")=504
+	Set gtmtypes("sgmnt_data",505,"name")="sgmnt_data.gvstats_rec.n_order"
+	Set gtmtypes("sgmnt_data",505,"off")=4128
 	Set gtmtypes("sgmnt_data",505,"len")=8
 	Set gtmtypes("sgmnt_data",505,"type")="uint64_t"
-	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 gtmtypfldindx("sgmnt_data","gvstats_rec.n_order")=505
+	Set gtmtypes("sgmnt_data",506,"name")="sgmnt_data.gvstats_rec.n_zprev"
+	Set gtmtypes("sgmnt_data",506,"off")=4136
 	Set gtmtypes("sgmnt_data",506,"len")=8
 	Set gtmtypes("sgmnt_data",506,"type")="uint64_t"
-	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 gtmtypfldindx("sgmnt_data","gvstats_rec.n_zprev")=506
+	Set gtmtypes("sgmnt_data",507,"name")="sgmnt_data.gvstats_rec.n_query"
+	Set gtmtypes("sgmnt_data",507,"off")=4144
 	Set gtmtypes("sgmnt_data",507,"len")=8
 	Set gtmtypes("sgmnt_data",507,"type")="uint64_t"
-	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 gtmtypfldindx("sgmnt_data","gvstats_rec.n_query")=507
+	Set gtmtypes("sgmnt_data",508,"name")="sgmnt_data.gvstats_rec.n_lock_success"
+	Set gtmtypes("sgmnt_data",508,"off")=4152
 	Set gtmtypes("sgmnt_data",508,"len")=8
 	Set gtmtypes("sgmnt_data",508,"type")="uint64_t"
-	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 gtmtypfldindx("sgmnt_data","gvstats_rec.n_lock_success")=508
+	Set gtmtypes("sgmnt_data",509,"name")="sgmnt_data.gvstats_rec.n_lock_fail"
+	Set gtmtypes("sgmnt_data",509,"off")=4160
 	Set gtmtypes("sgmnt_data",509,"len")=8
 	Set gtmtypes("sgmnt_data",509,"type")="uint64_t"
-	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 gtmtypfldindx("sgmnt_data","gvstats_rec.n_lock_fail")=509
+	Set gtmtypes("sgmnt_data",510,"name")="sgmnt_data.gvstats_rec.db_curr_tn"
+	Set gtmtypes("sgmnt_data",510,"off")=4168
 	Set gtmtypes("sgmnt_data",510,"len")=8
 	Set gtmtypes("sgmnt_data",510,"type")="uint64_t"
-	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 gtmtypfldindx("sgmnt_data","gvstats_rec.db_curr_tn")=510
+	Set gtmtypes("sgmnt_data",511,"name")="sgmnt_data.gvstats_rec.n_dsk_read"
+	Set gtmtypes("sgmnt_data",511,"off")=4176
 	Set gtmtypes("sgmnt_data",511,"len")=8
 	Set gtmtypes("sgmnt_data",511,"type")="uint64_t"
-	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 gtmtypfldindx("sgmnt_data","gvstats_rec.n_dsk_read")=511
+	Set gtmtypes("sgmnt_data",512,"name")="sgmnt_data.gvstats_rec.n_dsk_write"
+	Set gtmtypes("sgmnt_data",512,"off")=4184
 	Set gtmtypes("sgmnt_data",512,"len")=8
 	Set gtmtypes("sgmnt_data",512,"type")="uint64_t"
-	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 gtmtypfldindx("sgmnt_data","gvstats_rec.n_dsk_write")=512
+	Set gtmtypes("sgmnt_data",513,"name")="sgmnt_data.gvstats_rec.n_nontp_readwrite"
+	Set gtmtypes("sgmnt_data",513,"off")=4192
 	Set gtmtypes("sgmnt_data",513,"len")=8
 	Set gtmtypes("sgmnt_data",513,"type")="uint64_t"
-	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 gtmtypfldindx("sgmnt_data","gvstats_rec.n_nontp_readwrite")=513
+	Set gtmtypes("sgmnt_data",514,"name")="sgmnt_data.gvstats_rec.n_nontp_readonly"
+	Set gtmtypes("sgmnt_data",514,"off")=4200
 	Set gtmtypes("sgmnt_data",514,"len")=8
 	Set gtmtypes("sgmnt_data",514,"type")="uint64_t"
-	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 gtmtypfldindx("sgmnt_data","gvstats_rec.n_nontp_readonly")=514
+	Set gtmtypes("sgmnt_data",515,"name")="sgmnt_data.gvstats_rec.n_nontp_blkwrite"
+	Set gtmtypes("sgmnt_data",515,"off")=4208
 	Set gtmtypes("sgmnt_data",515,"len")=8
 	Set gtmtypes("sgmnt_data",515,"type")="uint64_t"
-	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 gtmtypfldindx("sgmnt_data","gvstats_rec.n_nontp_blkwrite")=515
+	Set gtmtypes("sgmnt_data",516,"name")="sgmnt_data.gvstats_rec.n_nontp_blkread"
+	Set gtmtypes("sgmnt_data",516,"off")=4216
 	Set gtmtypes("sgmnt_data",516,"len")=8
 	Set gtmtypes("sgmnt_data",516,"type")="uint64_t"
-	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 gtmtypfldindx("sgmnt_data","gvstats_rec.n_nontp_blkread")=516
+	Set gtmtypes("sgmnt_data",517,"name")="sgmnt_data.gvstats_rec.n_nontp_retries_0"
+	Set gtmtypes("sgmnt_data",517,"off")=4224
 	Set gtmtypes("sgmnt_data",517,"len")=8
 	Set gtmtypes("sgmnt_data",517,"type")="uint64_t"
-	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 gtmtypfldindx("sgmnt_data","gvstats_rec.n_nontp_retries_0")=517
+	Set gtmtypes("sgmnt_data",518,"name")="sgmnt_data.gvstats_rec.n_nontp_retries_1"
+	Set gtmtypes("sgmnt_data",518,"off")=4232
 	Set gtmtypes("sgmnt_data",518,"len")=8
 	Set gtmtypes("sgmnt_data",518,"type")="uint64_t"
-	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 gtmtypfldindx("sgmnt_data","gvstats_rec.n_nontp_retries_1")=518
+	Set gtmtypes("sgmnt_data",519,"name")="sgmnt_data.gvstats_rec.n_nontp_retries_2"
+	Set gtmtypes("sgmnt_data",519,"off")=4240
 	Set gtmtypes("sgmnt_data",519,"len")=8
 	Set gtmtypes("sgmnt_data",519,"type")="uint64_t"
-	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 gtmtypfldindx("sgmnt_data","gvstats_rec.n_nontp_retries_2")=519
+	Set gtmtypes("sgmnt_data",520,"name")="sgmnt_data.gvstats_rec.n_nontp_retries_3"
+	Set gtmtypes("sgmnt_data",520,"off")=4248
 	Set gtmtypes("sgmnt_data",520,"len")=8
 	Set gtmtypes("sgmnt_data",520,"type")="uint64_t"
-	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 gtmtypfldindx("sgmnt_data","gvstats_rec.n_nontp_retries_3")=520
+	Set gtmtypes("sgmnt_data",521,"name")="sgmnt_data.gvstats_rec.n_tp_readwrite"
+	Set gtmtypes("sgmnt_data",521,"off")=4256
 	Set gtmtypes("sgmnt_data",521,"len")=8
 	Set gtmtypes("sgmnt_data",521,"type")="uint64_t"
-	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 gtmtypfldindx("sgmnt_data","gvstats_rec.n_tp_readwrite")=521
+	Set gtmtypes("sgmnt_data",522,"name")="sgmnt_data.gvstats_rec.n_tp_readonly"
+	Set gtmtypes("sgmnt_data",522,"off")=4264
 	Set gtmtypes("sgmnt_data",522,"len")=8
 	Set gtmtypes("sgmnt_data",522,"type")="uint64_t"
-	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 gtmtypfldindx("sgmnt_data","gvstats_rec.n_tp_readonly")=522
+	Set gtmtypes("sgmnt_data",523,"name")="sgmnt_data.gvstats_rec.n_tp_rolledback"
+	Set gtmtypes("sgmnt_data",523,"off")=4272
 	Set gtmtypes("sgmnt_data",523,"len")=8
 	Set gtmtypes("sgmnt_data",523,"type")="uint64_t"
-	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 gtmtypfldindx("sgmnt_data","gvstats_rec.n_tp_rolledback")=523
+	Set gtmtypes("sgmnt_data",524,"name")="sgmnt_data.gvstats_rec.n_tp_blkwrite"
+	Set gtmtypes("sgmnt_data",524,"off")=4280
 	Set gtmtypes("sgmnt_data",524,"len")=8
 	Set gtmtypes("sgmnt_data",524,"type")="uint64_t"
-	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 gtmtypfldindx("sgmnt_data","gvstats_rec.n_tp_blkwrite")=524
+	Set gtmtypes("sgmnt_data",525,"name")="sgmnt_data.gvstats_rec.n_tp_blkread"
+	Set gtmtypes("sgmnt_data",525,"off")=4288
 	Set gtmtypes("sgmnt_data",525,"len")=8
 	Set gtmtypes("sgmnt_data",525,"type")="uint64_t"
-	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 gtmtypfldindx("sgmnt_data","gvstats_rec.n_tp_blkread")=525
+	Set gtmtypes("sgmnt_data",526,"name")="sgmnt_data.gvstats_rec.n_tp_tot_retries_0"
+	Set gtmtypes("sgmnt_data",526,"off")=4296
 	Set gtmtypes("sgmnt_data",526,"len")=8
 	Set gtmtypes("sgmnt_data",526,"type")="uint64_t"
-	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 gtmtypfldindx("sgmnt_data","gvstats_rec.n_tp_tot_retries_0")=526
+	Set gtmtypes("sgmnt_data",527,"name")="sgmnt_data.gvstats_rec.n_tp_tot_retries_1"
+	Set gtmtypes("sgmnt_data",527,"off")=4304
 	Set gtmtypes("sgmnt_data",527,"len")=8
 	Set gtmtypes("sgmnt_data",527,"type")="uint64_t"
-	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 gtmtypfldindx("sgmnt_data","gvstats_rec.n_tp_tot_retries_1")=527
+	Set gtmtypes("sgmnt_data",528,"name")="sgmnt_data.gvstats_rec.n_tp_tot_retries_2"
+	Set gtmtypes("sgmnt_data",528,"off")=4312
 	Set gtmtypes("sgmnt_data",528,"len")=8
 	Set gtmtypes("sgmnt_data",528,"type")="uint64_t"
-	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 gtmtypfldindx("sgmnt_data","gvstats_rec.n_tp_tot_retries_2")=528
+	Set gtmtypes("sgmnt_data",529,"name")="sgmnt_data.gvstats_rec.n_tp_tot_retries_3"
+	Set gtmtypes("sgmnt_data",529,"off")=4320
 	Set gtmtypes("sgmnt_data",529,"len")=8
 	Set gtmtypes("sgmnt_data",529,"type")="uint64_t"
-	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 gtmtypfldindx("sgmnt_data","gvstats_rec.n_tp_tot_retries_3")=529
+	Set gtmtypes("sgmnt_data",530,"name")="sgmnt_data.gvstats_rec.n_tp_tot_retries_4"
+	Set gtmtypes("sgmnt_data",530,"off")=4328
 	Set gtmtypes("sgmnt_data",530,"len")=8
 	Set gtmtypes("sgmnt_data",530,"type")="uint64_t"
-	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 gtmtypfldindx("sgmnt_data","gvstats_rec.n_tp_tot_retries_4")=530
+	Set gtmtypes("sgmnt_data",531,"name")="sgmnt_data.gvstats_rec.n_tp_cnflct_retries_0"
+	Set gtmtypes("sgmnt_data",531,"off")=4336
 	Set gtmtypes("sgmnt_data",531,"len")=8
 	Set gtmtypes("sgmnt_data",531,"type")="uint64_t"
-	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 gtmtypfldindx("sgmnt_data","gvstats_rec.n_tp_cnflct_retries_0")=531
+	Set gtmtypes("sgmnt_data",532,"name")="sgmnt_data.gvstats_rec.n_tp_cnflct_retries_1"
+	Set gtmtypes("sgmnt_data",532,"off")=4344
 	Set gtmtypes("sgmnt_data",532,"len")=8
 	Set gtmtypes("sgmnt_data",532,"type")="uint64_t"
-	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 gtmtypfldindx("sgmnt_data","gvstats_rec.n_tp_cnflct_retries_1")=532
+	Set gtmtypes("sgmnt_data",533,"name")="sgmnt_data.gvstats_rec.n_tp_cnflct_retries_2"
+	Set gtmtypes("sgmnt_data",533,"off")=4352
 	Set gtmtypes("sgmnt_data",533,"len")=8
 	Set gtmtypes("sgmnt_data",533,"type")="uint64_t"
-	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 gtmtypfldindx("sgmnt_data","gvstats_rec.n_tp_cnflct_retries_2")=533
+	Set gtmtypes("sgmnt_data",534,"name")="sgmnt_data.gvstats_rec.n_tp_cnflct_retries_3"
+	Set gtmtypes("sgmnt_data",534,"off")=4360
 	Set gtmtypes("sgmnt_data",534,"len")=8
 	Set gtmtypes("sgmnt_data",534,"type")="uint64_t"
-	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 gtmtypfldindx("sgmnt_data","gvstats_rec.n_tp_cnflct_retries_3")=534
+	Set gtmtypes("sgmnt_data",535,"name")="sgmnt_data.gvstats_rec.n_tp_cnflct_retries_4"
+	Set gtmtypes("sgmnt_data",535,"off")=4368
 	Set gtmtypes("sgmnt_data",535,"len")=8
 	Set gtmtypes("sgmnt_data",535,"type")="uint64_t"
-	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 gtmtypfldindx("sgmnt_data","gvstats_rec.n_tp_cnflct_retries_4")=535
+	Set gtmtypes("sgmnt_data",536,"name")="sgmnt_data.gvstats_rec.n_ztrigger"
+	Set gtmtypes("sgmnt_data",536,"off")=4376
 	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 gtmtypfldindx("sgmnt_data","gvstats_rec.n_ztrigger")=536
+	Set gtmtypes("sgmnt_data",537,"name")="sgmnt_data.gvstats_rec.n_db_flush"
+	Set gtmtypes("sgmnt_data",537,"off")=4384
 	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 gtmtypfldindx("sgmnt_data","gvstats_rec.n_db_flush")=537
+	Set gtmtypes("sgmnt_data",538,"name")="sgmnt_data.gvstats_rec.n_db_fsync"
+	Set gtmtypes("sgmnt_data",538,"off")=4392
 	Set gtmtypes("sgmnt_data",538,"len")=8
 	Set gtmtypes("sgmnt_data",538,"type")="uint64_t"
-	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 gtmtypfldindx("sgmnt_data","gvstats_rec.n_db_fsync")=538
+	Set gtmtypes("sgmnt_data",539,"name")="sgmnt_data.gvstats_rec.n_jnl_flush"
+	Set gtmtypes("sgmnt_data",539,"off")=4400
 	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 gtmtypfldindx("sgmnt_data","gvstats_rec.n_jnl_flush")=539
+	Set gtmtypes("sgmnt_data",540,"name")="sgmnt_data.gvstats_rec.n_jnl_fsync"
+	Set gtmtypes("sgmnt_data",540,"off")=4408
 	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 gtmtypfldindx("sgmnt_data","gvstats_rec.n_jnl_fsync")=540
+	Set gtmtypes("sgmnt_data",541,"name")="sgmnt_data.gvstats_rec.n_jbuff_bytes"
+	Set gtmtypes("sgmnt_data",541,"off")=4416
 	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 gtmtypfldindx("sgmnt_data","gvstats_rec.n_jbuff_bytes")=541
+	Set gtmtypes("sgmnt_data",542,"name")="sgmnt_data.gvstats_rec.n_jfile_bytes"
+	Set gtmtypes("sgmnt_data",542,"off")=4424
 	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 gtmtypfldindx("sgmnt_data","gvstats_rec.n_jfile_bytes")=542
+	Set gtmtypes("sgmnt_data",543,"name")="sgmnt_data.gvstats_rec.n_jfile_writes"
+	Set gtmtypes("sgmnt_data",543,"off")=4432
 	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 gtmtypfldindx("sgmnt_data","gvstats_rec.n_jfile_writes")=543
+	Set gtmtypes("sgmnt_data",544,"name")="sgmnt_data.gvstats_rec.n_jrec_logical"
+	Set gtmtypes("sgmnt_data",544,"off")=4440
 	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 gtmtypfldindx("sgmnt_data","gvstats_rec.n_jrec_logical")=544
+	Set gtmtypes("sgmnt_data",545,"name")="sgmnt_data.gvstats_rec.n_jrec_pblk"
+	Set gtmtypes("sgmnt_data",545,"off")=4448
 	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 gtmtypfldindx("sgmnt_data","gvstats_rec.n_jrec_pblk")=545
+	Set gtmtypes("sgmnt_data",546,"name")="sgmnt_data.gvstats_rec.n_jrec_epoch_regular"
+	Set gtmtypes("sgmnt_data",546,"off")=4456
 	Set gtmtypes("sgmnt_data",546,"len")=8
 	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 gtmtypfldindx("sgmnt_data","gvstats_rec.n_jrec_epoch_regular")=546
+	Set gtmtypes("sgmnt_data",547,"name")="sgmnt_data.gvstats_rec.n_jrec_epoch_idle"
+	Set gtmtypes("sgmnt_data",547,"off")=4464
 	Set gtmtypes("sgmnt_data",547,"len")=8
 	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 gtmtypfldindx("sgmnt_data","gvstats_rec.n_jrec_epoch_idle")=547
+	Set gtmtypes("sgmnt_data",548,"name")="sgmnt_data.gvstats_rec.n_jrec_other"
+	Set gtmtypes("sgmnt_data",548,"off")=4472
 	Set gtmtypes("sgmnt_data",548,"len")=8
 	Set gtmtypes("sgmnt_data",548,"type")="uint64_t"
-	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 gtmtypfldindx("sgmnt_data","gvstats_rec.n_jrec_other")=548
+	Set gtmtypes("sgmnt_data",549,"name")="sgmnt_data.gvstats_rec.n_jnl_extends"
+	Set gtmtypes("sgmnt_data",549,"off")=4480
 	Set gtmtypes("sgmnt_data",549,"len")=8
 	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 gtmtypfldindx("sgmnt_data","gvstats_rec.n_jnl_extends")=549
+	Set gtmtypes("sgmnt_data",550,"name")="sgmnt_data.gvstats_rec.n_db_extends"
+	Set gtmtypes("sgmnt_data",550,"off")=4488
 	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 gtmtypfldindx("sgmnt_data","gvstats_rec.n_db_extends")=550
+	Set gtmtypes("sgmnt_data",551,"name")="sgmnt_data.gvstats_rec.n_crit_success"
+	Set gtmtypes("sgmnt_data",551,"off")=4496
 	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 gtmtypfldindx("sgmnt_data","gvstats_rec.n_crit_success")=551
+	Set gtmtypes("sgmnt_data",552,"name")="sgmnt_data.gvstats_rec.n_crits_in_epch"
+	Set gtmtypes("sgmnt_data",552,"off")=4504
 	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 gtmtypfldindx("sgmnt_data","gvstats_rec.n_crits_in_epch")=552
+	Set gtmtypes("sgmnt_data",553,"name")="sgmnt_data.gvstats_rec.sq_crit_failed"
+	Set gtmtypes("sgmnt_data",553,"off")=4512
 	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 gtmtypfldindx("sgmnt_data","gvstats_rec.sq_crit_failed")=553
+	Set gtmtypes("sgmnt_data",554,"name")="sgmnt_data.gvstats_rec.n_crit_failed"
+	Set gtmtypes("sgmnt_data",554,"off")=4520
+	Set gtmtypes("sgmnt_data",554,"len")=8
+	Set gtmtypes("sgmnt_data",554,"type")="uint64_t"
+	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_crit_failed")=554
+	Set gtmtypes("sgmnt_data",555,"name")="sgmnt_data.gvstats_rec.sq_crit_que_slps"
+	Set gtmtypes("sgmnt_data",555,"off")=4528
+	Set gtmtypes("sgmnt_data",555,"len")=8
+	Set gtmtypes("sgmnt_data",555,"type")="uint64_t"
+	Set gtmtypfldindx("sgmnt_data","gvstats_rec.sq_crit_que_slps")=555
+	Set gtmtypes("sgmnt_data",556,"name")="sgmnt_data.gvstats_rec.n_crit_que_slps"
+	Set gtmtypes("sgmnt_data",556,"off")=4536
+	Set gtmtypes("sgmnt_data",556,"len")=8
 	Set gtmtypes("sgmnt_data",556,"type")="uint64_t"
-	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.creation_db_ver"
-	Set gtmtypes("sgmnt_data",557,"off")=5104
-	Set gtmtypes("sgmnt_data",557,"len")=4
-	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")="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")="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")="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")="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 gtmtypfldindx("sgmnt_data","gvstats_rec.n_crit_que_slps")=556
+	Set gtmtypes("sgmnt_data",557,"name")="sgmnt_data.gvstats_rec.sq_crit_yields"
+	Set gtmtypes("sgmnt_data",557,"off")=4544
+	Set gtmtypes("sgmnt_data",557,"len")=8
+	Set gtmtypes("sgmnt_data",557,"type")="uint64_t"
+	Set gtmtypfldindx("sgmnt_data","gvstats_rec.sq_crit_yields")=557
+	Set gtmtypes("sgmnt_data",558,"name")="sgmnt_data.gvstats_rec.n_crit_yields"
+	Set gtmtypes("sgmnt_data",558,"off")=4552
+	Set gtmtypes("sgmnt_data",558,"len")=8
+	Set gtmtypes("sgmnt_data",558,"type")="uint64_t"
+	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_crit_yields")=558
+	Set gtmtypes("sgmnt_data",559,"name")="sgmnt_data.gvstats_rec.n_clean2dirty"
+	Set gtmtypes("sgmnt_data",559,"off")=4560
+	Set gtmtypes("sgmnt_data",559,"len")=8
+	Set gtmtypes("sgmnt_data",559,"type")="uint64_t"
+	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_clean2dirty")=559
+	Set gtmtypes("sgmnt_data",560,"name")="sgmnt_data.gvstats_rec_filler_4k_plus_512"
+	Set gtmtypes("sgmnt_data",560,"off")=4568
+	Set gtmtypes("sgmnt_data",560,"len")=40
+	Set gtmtypes("sgmnt_data",560,"type")="char"
+	Set gtmtypfldindx("sgmnt_data","gvstats_rec_filler_4k_plus_512")=560
+	Set gtmtypes("sgmnt_data",561,"name")="sgmnt_data.filler_4k_plus_512"
+	Set gtmtypes("sgmnt_data",561,"off")=4608
+	Set gtmtypes("sgmnt_data",561,"len")=368
+	Set gtmtypes("sgmnt_data",561,"type")="char"
+	Set gtmtypfldindx("sgmnt_data","filler_4k_plus_512")=561
+	Set gtmtypes("sgmnt_data",562,"name")="sgmnt_data.intrpt_recov_resync_strm_seqno"
+	Set gtmtypes("sgmnt_data",562,"off")=4976
+	Set gtmtypes("sgmnt_data",562,"len")=128
+	Set gtmtypes("sgmnt_data",562,"type")="uint64_t"
+	Set gtmtypfldindx("sgmnt_data","intrpt_recov_resync_strm_seqno")=562
+	Set gtmtypes("sgmnt_data",562,"dim")=16
+	Set gtmtypes("sgmnt_data",563,"name")="sgmnt_data.creation_db_ver"
+	Set gtmtypes("sgmnt_data",563,"off")=5104
+	Set gtmtypes("sgmnt_data",563,"len")=4
+	Set gtmtypes("sgmnt_data",563,"type")="int"
+	Set gtmtypfldindx("sgmnt_data","creation_db_ver")=563
+	Set gtmtypes("sgmnt_data",564,"name")="sgmnt_data.creation_mdb_ver"
+	Set gtmtypes("sgmnt_data",564,"off")=5108
+	Set gtmtypes("sgmnt_data",564,"len")=4
+	Set gtmtypes("sgmnt_data",564,"type")="int"
+	Set gtmtypfldindx("sgmnt_data","creation_mdb_ver")=564
+	Set gtmtypes("sgmnt_data",565,"name")="sgmnt_data.certified_for_upgrade_to"
+	Set gtmtypes("sgmnt_data",565,"off")=5112
+	Set gtmtypes("sgmnt_data",565,"len")=4
+	Set gtmtypes("sgmnt_data",565,"type")="int"
+	Set gtmtypfldindx("sgmnt_data","certified_for_upgrade_to")=565
+	Set gtmtypes("sgmnt_data",566,"name")="sgmnt_data.filler_5k"
+	Set gtmtypes("sgmnt_data",566,"off")=5116
+	Set gtmtypes("sgmnt_data",566,"len")=4
+	Set gtmtypes("sgmnt_data",566,"type")="int"
+	Set gtmtypfldindx("sgmnt_data","filler_5k")=566
+	Set gtmtypes("sgmnt_data",567,"name")="sgmnt_data.secshr_ops_index_filler"
+	Set gtmtypes("sgmnt_data",567,"off")=5120
+	Set gtmtypes("sgmnt_data",567,"len")=4
+	Set gtmtypes("sgmnt_data",567,"type")="int"
+	Set gtmtypfldindx("sgmnt_data","secshr_ops_index_filler")=567
+	Set gtmtypes("sgmnt_data",568,"name")="sgmnt_data.secshr_ops_array_filler"
+	Set gtmtypes("sgmnt_data",568,"off")=5124
+	Set gtmtypes("sgmnt_data",568,"len")=1020
 	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 gtmtypfldindx("sgmnt_data","secshr_ops_array_filler")=568
+	Set gtmtypes("sgmnt_data",568,"dim")=255
+	Set gtmtypes("sgmnt_data",569,"name")="sgmnt_data.next_upgrd_warn"
+	Set gtmtypes("sgmnt_data",569,"off")=6144
+	Set gtmtypes("sgmnt_data",569,"len")=24
+	Set gtmtypes("sgmnt_data",569,"type")="compswap_time_field"
+	Set gtmtypfldindx("sgmnt_data","next_upgrd_warn")=569
+	Set gtmtypes("sgmnt_data",570,"name")="sgmnt_data.next_upgrd_warn.time_latch"
+	Set gtmtypes("sgmnt_data",570,"off")=6144
+	Set gtmtypes("sgmnt_data",570,"len")=8
+	Set gtmtypes("sgmnt_data",570,"type")="global_latch_t"
+	Set gtmtypfldindx("sgmnt_data","next_upgrd_warn.time_latch")=570
+	Set gtmtypes("sgmnt_data",571,"name")="sgmnt_data.next_upgrd_warn.time_latch.u"
+	Set gtmtypes("sgmnt_data",571,"off")=6144
+	Set gtmtypes("sgmnt_data",571,"len")=8
+	Set gtmtypes("sgmnt_data",571,"type")="union"
+	Set gtmtypfldindx("sgmnt_data","next_upgrd_warn.time_latch.u")=571
+	Set gtmtypes("sgmnt_data",572,"name")="sgmnt_data.next_upgrd_warn.time_latch.u.pid_imgcnt"
+	Set gtmtypes("sgmnt_data",572,"off")=6144
+	Set gtmtypes("sgmnt_data",572,"len")=8
+	Set gtmtypes("sgmnt_data",572,"type")="uint64_t"
+	Set gtmtypfldindx("sgmnt_data","next_upgrd_warn.time_latch.u.pid_imgcnt")=572
+	Set gtmtypes("sgmnt_data",573,"name")="sgmnt_data.next_upgrd_warn.time_latch.u.parts"
+	Set gtmtypes("sgmnt_data",573,"off")=6144
+	Set gtmtypes("sgmnt_data",573,"len")=8
+	Set gtmtypes("sgmnt_data",573,"type")="struct"
+	Set gtmtypfldindx("sgmnt_data","next_upgrd_warn.time_latch.u.parts")=573
+	Set gtmtypes("sgmnt_data",574,"name")="sgmnt_data.next_upgrd_warn.time_latch.u.parts.latch_pid"
+	Set gtmtypes("sgmnt_data",574,"off")=6144
+	Set gtmtypes("sgmnt_data",574,"len")=4
+	Set gtmtypes("sgmnt_data",574,"type")="int"
+	Set gtmtypfldindx("sgmnt_data","next_upgrd_warn.time_latch.u.parts.latch_pid")=574
+	Set gtmtypes("sgmnt_data",575,"name")="sgmnt_data.next_upgrd_warn.time_latch.u.parts.latch_word"
+	Set gtmtypes("sgmnt_data",575,"off")=6148
 	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",575,"type")="int"
+	Set gtmtypfldindx("sgmnt_data","next_upgrd_warn.time_latch.u.parts.latch_word")=575
+	Set gtmtypes("sgmnt_data",576,"name")="sgmnt_data.next_upgrd_warn.hp_latch_space"
+	Set gtmtypes("sgmnt_data",576,"off")=6152
+	Set gtmtypes("sgmnt_data",576,"len")=16
+	Set gtmtypes("sgmnt_data",576,"type")="int"
+	Set gtmtypfldindx("sgmnt_data","next_upgrd_warn.hp_latch_space")=576
+	Set gtmtypes("sgmnt_data",576,"dim")=4
+	Set gtmtypes("sgmnt_data",577,"name")="sgmnt_data.is_encrypted"
+	Set gtmtypes("sgmnt_data",577,"off")=6168
 	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",577,"type")="unsigned-int"
+	Set gtmtypfldindx("sgmnt_data","is_encrypted")=577
+	Set gtmtypes("sgmnt_data",578,"name")="sgmnt_data.db_trigger_cycle"
+	Set gtmtypes("sgmnt_data",578,"off")=6172
 	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",578,"type")="unsigned-int"
+	Set gtmtypfldindx("sgmnt_data","db_trigger_cycle")=578
+	Set gtmtypes("sgmnt_data",579,"name")="sgmnt_data.strm_reg_seqno"
+	Set gtmtypes("sgmnt_data",579,"off")=6176
+	Set gtmtypes("sgmnt_data",579,"len")=128
+	Set gtmtypes("sgmnt_data",579,"type")="uint64_t"
+	Set gtmtypfldindx("sgmnt_data","strm_reg_seqno")=579
+	Set gtmtypes("sgmnt_data",579,"dim")=16
+	Set gtmtypes("sgmnt_data",580,"name")="sgmnt_data.save_strm_reg_seqno"
+	Set gtmtypes("sgmnt_data",580,"off")=6304
+	Set gtmtypes("sgmnt_data",580,"len")=128
+	Set gtmtypes("sgmnt_data",580,"type")="uint64_t"
+	Set gtmtypfldindx("sgmnt_data","save_strm_reg_seqno")=580
+	Set gtmtypes("sgmnt_data",580,"dim")=16
+	Set gtmtypes("sgmnt_data",581,"name")="sgmnt_data.freeze_on_fail"
+	Set gtmtypes("sgmnt_data",581,"off")=6432
 	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 gtmtypfldindx("sgmnt_data","freeze_on_fail")=581
+	Set gtmtypes("sgmnt_data",582,"name")="sgmnt_data.span_node_absent"
+	Set gtmtypes("sgmnt_data",582,"off")=6436
 	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 gtmtypfldindx("sgmnt_data","span_node_absent")=582
+	Set gtmtypes("sgmnt_data",583,"name")="sgmnt_data.maxkeysz_assured"
+	Set gtmtypes("sgmnt_data",583,"off")=6440
 	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("sgmnt_data",583,"type")="boolean_t"
+	Set gtmtypfldindx("sgmnt_data","maxkeysz_assured")=583
+	Set gtmtypes("sgmnt_data",584,"name")="sgmnt_data.hasht_upgrade_needed"
+	Set gtmtypes("sgmnt_data",584,"off")=6444
+	Set gtmtypes("sgmnt_data",584,"len")=4
+	Set gtmtypes("sgmnt_data",584,"type")="boolean_t"
+	Set gtmtypfldindx("sgmnt_data","hasht_upgrade_needed")=584
+	Set gtmtypes("sgmnt_data",585,"name")="sgmnt_data.defer_allocate"
+	Set gtmtypes("sgmnt_data",585,"off")=6448
+	Set gtmtypes("sgmnt_data",585,"len")=4
+	Set gtmtypes("sgmnt_data",585,"type")="boolean_t"
+	Set gtmtypfldindx("sgmnt_data","defer_allocate")=585
+	Set gtmtypes("sgmnt_data",586,"name")="sgmnt_data.filler_ftok_counter_halted"
+	Set gtmtypes("sgmnt_data",586,"off")=6452
+	Set gtmtypes("sgmnt_data",586,"len")=4
+	Set gtmtypes("sgmnt_data",586,"type")="boolean_t"
+	Set gtmtypfldindx("sgmnt_data","filler_ftok_counter_halted")=586
+	Set gtmtypes("sgmnt_data",587,"name")="sgmnt_data.filler_access_counter_halted"
+	Set gtmtypes("sgmnt_data",587,"off")=6456
+	Set gtmtypes("sgmnt_data",587,"len")=4
+	Set gtmtypes("sgmnt_data",587,"type")="boolean_t"
+	Set gtmtypfldindx("sgmnt_data","filler_access_counter_halted")=587
+	Set gtmtypes("sgmnt_data",588,"name")="sgmnt_data.lock_crit_with_db"
+	Set gtmtypes("sgmnt_data",588,"off")=6460
+	Set gtmtypes("sgmnt_data",588,"len")=4
+	Set gtmtypes("sgmnt_data",588,"type")="boolean_t"
+	Set gtmtypfldindx("sgmnt_data","lock_crit_with_db")=588
+	Set gtmtypes("sgmnt_data",589,"name")="sgmnt_data.basedb_fname_len"
+	Set gtmtypes("sgmnt_data",589,"off")=6464
+	Set gtmtypes("sgmnt_data",589,"len")=4
+	Set gtmtypes("sgmnt_data",589,"type")="unsigned-int"
+	Set gtmtypfldindx("sgmnt_data","basedb_fname_len")=589
+	Set gtmtypes("sgmnt_data",590,"name")="sgmnt_data.basedb_fname"
+	Set gtmtypes("sgmnt_data",590,"off")=6468
+	Set gtmtypes("sgmnt_data",590,"len")=256
+	Set gtmtypes("sgmnt_data",590,"type")="unsigned-char"
+	Set gtmtypfldindx("sgmnt_data","basedb_fname")=590
+	Set gtmtypes("sgmnt_data",591,"name")="sgmnt_data.filler_7k"
+	Set gtmtypes("sgmnt_data",591,"off")=6724
+	Set gtmtypes("sgmnt_data",591,"len")=444
+	Set gtmtypes("sgmnt_data",591,"type")="char"
+	Set gtmtypfldindx("sgmnt_data","filler_7k")=591
+	Set gtmtypes("sgmnt_data",592,"name")="sgmnt_data.filler_8k"
+	Set gtmtypes("sgmnt_data",592,"off")=7168
+	Set gtmtypes("sgmnt_data",592,"len")=1024
+	Set gtmtypes("sgmnt_data",592,"type")="char"
+	Set gtmtypfldindx("sgmnt_data","filler_8k")=592
 	;
 	Set gtmtypes("shm_forw_multi_t")="struct"
 	Set gtmtypes("shm_forw_multi_t",0)=20
@@ -30067,7 +31051,7 @@ Init
 	Set gtmtypes("shm_reg_ctl_t",9,"dim")=3
 	;
 	Set gtmtypes("shm_snapshot_t")="struct"
-	Set gtmtypes("shm_snapshot_t",0)=608
+	Set gtmtypes("shm_snapshot_t",0)=614
 	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
@@ -31060,11 +32044,11 @@ Init
 	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.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,"name")="shm_snapshot_t.shadow_file_header.wcb_gds_rundown2_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_bgtrcrec1_tn")=197
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_gds_rundown2_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
@@ -31355,11 +32339,11 @@ Init
 	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_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,"name")="shm_snapshot_t.shadow_file_header.wcb_wcs_flu0_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_tp_grab_crit_tn")=256
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_wcs_flu0_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
@@ -31380,11 +32364,11 @@ Init
 	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_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,"name")="shm_snapshot_t.shadow_file_header.wcb_gds_rundown1_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_gds_rundown_tn")=261
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_gds_rundown1_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
@@ -31740,1391 +32724,1421 @@ Init
 	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,"name")="shm_snapshot_t.shadow_file_header.jnlbuff_phs2cmt_array_full_tn"
 	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.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.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.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",333,"len")=8
+	Set gtmtypes("shm_snapshot_t",333,"type")="uint64_t"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.jnlbuff_phs2cmt_array_full_tn")=333
+	Set gtmtypes("shm_snapshot_t",334,"name")="shm_snapshot_t.shadow_file_header.jnl_phase2_cleanup_if_possible_tn"
+	Set gtmtypes("shm_snapshot_t",334,"off")=7376
+	Set gtmtypes("shm_snapshot_t",334,"len")=8
+	Set gtmtypes("shm_snapshot_t",334,"type")="uint64_t"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.jnl_phase2_cleanup_if_possible_tn")=334
+	Set gtmtypes("shm_snapshot_t",335,"name")="shm_snapshot_t.shadow_file_header.jnlbuff_phs2cmt_isprcalv_tn"
+	Set gtmtypes("shm_snapshot_t",335,"off")=7384
+	Set gtmtypes("shm_snapshot_t",335,"len")=8
+	Set gtmtypes("shm_snapshot_t",335,"type")="uint64_t"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.jnlbuff_phs2cmt_isprcalv_tn")=335
+	Set gtmtypes("shm_snapshot_t",336,"name")="shm_snapshot_t.shadow_file_header.bg_trc_rec_tn_filler"
+	Set gtmtypes("shm_snapshot_t",336,"off")=7392
+	Set gtmtypes("shm_snapshot_t",336,"len")=24
+	Set gtmtypes("shm_snapshot_t",336,"type")="char"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.bg_trc_rec_tn_filler")=336
+	Set gtmtypes("shm_snapshot_t",337,"name")="shm_snapshot_t.shadow_file_header.total_buffer_flush_cntr"
+	Set gtmtypes("shm_snapshot_t",337,"off")=7416
 	Set gtmtypes("shm_snapshot_t",337,"len")=4
 	Set gtmtypes("shm_snapshot_t",337,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.total_buffer_flush_cntr")=337
+	Set gtmtypes("shm_snapshot_t",338,"name")="shm_snapshot_t.shadow_file_header.bufct_buffer_flush_cntr"
+	Set gtmtypes("shm_snapshot_t",338,"off")=7420
 	Set gtmtypes("shm_snapshot_t",338,"len")=4
 	Set gtmtypes("shm_snapshot_t",338,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.bufct_buffer_flush_cntr")=338
+	Set gtmtypes("shm_snapshot_t",339,"name")="shm_snapshot_t.shadow_file_header.bufct_buffer_flush_loop_cntr"
+	Set gtmtypes("shm_snapshot_t",339,"off")=7424
 	Set gtmtypes("shm_snapshot_t",339,"len")=4
 	Set gtmtypes("shm_snapshot_t",339,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.bufct_buffer_flush_loop_cntr")=339
+	Set gtmtypes("shm_snapshot_t",340,"name")="shm_snapshot_t.shadow_file_header.wrt_calls_cntr"
+	Set gtmtypes("shm_snapshot_t",340,"off")=7428
 	Set gtmtypes("shm_snapshot_t",340,"len")=4
 	Set gtmtypes("shm_snapshot_t",340,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.wrt_calls_cntr")=340
+	Set gtmtypes("shm_snapshot_t",341,"name")="shm_snapshot_t.shadow_file_header.wrt_count_cntr"
+	Set gtmtypes("shm_snapshot_t",341,"off")=7432
 	Set gtmtypes("shm_snapshot_t",341,"len")=4
 	Set gtmtypes("shm_snapshot_t",341,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.wrt_count_cntr")=341
+	Set gtmtypes("shm_snapshot_t",342,"name")="shm_snapshot_t.shadow_file_header.wrt_blocked_cntr"
+	Set gtmtypes("shm_snapshot_t",342,"off")=7436
 	Set gtmtypes("shm_snapshot_t",342,"len")=4
 	Set gtmtypes("shm_snapshot_t",342,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.wrt_blocked_cntr")=342
+	Set gtmtypes("shm_snapshot_t",343,"name")="shm_snapshot_t.shadow_file_header.wrt_busy_cntr"
+	Set gtmtypes("shm_snapshot_t",343,"off")=7440
 	Set gtmtypes("shm_snapshot_t",343,"len")=4
 	Set gtmtypes("shm_snapshot_t",343,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.wrt_busy_cntr")=343
+	Set gtmtypes("shm_snapshot_t",344,"name")="shm_snapshot_t.shadow_file_header.wrt_noblks_wrtn_cntr"
+	Set gtmtypes("shm_snapshot_t",344,"off")=7444
 	Set gtmtypes("shm_snapshot_t",344,"len")=4
 	Set gtmtypes("shm_snapshot_t",344,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.wrt_noblks_wrtn_cntr")=344
+	Set gtmtypes("shm_snapshot_t",345,"name")="shm_snapshot_t.shadow_file_header.wcb_gds_rundown2_cntr"
+	Set gtmtypes("shm_snapshot_t",345,"off")=7448
 	Set gtmtypes("shm_snapshot_t",345,"len")=4
 	Set gtmtypes("shm_snapshot_t",345,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_gds_rundown2_cntr")=345
+	Set gtmtypes("shm_snapshot_t",346,"name")="shm_snapshot_t.shadow_file_header.reserved_bgtrcrec2_cntr"
+	Set gtmtypes("shm_snapshot_t",346,"off")=7452
 	Set gtmtypes("shm_snapshot_t",346,"len")=4
 	Set gtmtypes("shm_snapshot_t",346,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.reserved_bgtrcrec2_cntr")=346
+	Set gtmtypes("shm_snapshot_t",347,"name")="shm_snapshot_t.shadow_file_header.reserved_bgtrcrec3_cntr"
+	Set gtmtypes("shm_snapshot_t",347,"off")=7456
 	Set gtmtypes("shm_snapshot_t",347,"len")=4
 	Set gtmtypes("shm_snapshot_t",347,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.reserved_bgtrcrec3_cntr")=347
+	Set gtmtypes("shm_snapshot_t",348,"name")="shm_snapshot_t.shadow_file_header.lost_block_recovery_cntr"
+	Set gtmtypes("shm_snapshot_t",348,"off")=7460
 	Set gtmtypes("shm_snapshot_t",348,"len")=4
 	Set gtmtypes("shm_snapshot_t",348,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.lost_block_recovery_cntr")=348
+	Set gtmtypes("shm_snapshot_t",349,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_onln_rlbk_cntr"
+	Set gtmtypes("shm_snapshot_t",349,"off")=7464
 	Set gtmtypes("shm_snapshot_t",349,"len")=4
 	Set gtmtypes("shm_snapshot_t",349,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_onln_rlbk_cntr")=349
+	Set gtmtypes("shm_snapshot_t",350,"name")="shm_snapshot_t.shadow_file_header.stale_cntr"
+	Set gtmtypes("shm_snapshot_t",350,"off")=7468
 	Set gtmtypes("shm_snapshot_t",350,"len")=4
 	Set gtmtypes("shm_snapshot_t",350,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.stale_cntr")=350
+	Set gtmtypes("shm_snapshot_t",351,"name")="shm_snapshot_t.shadow_file_header.starved_cntr"
+	Set gtmtypes("shm_snapshot_t",351,"off")=7472
 	Set gtmtypes("shm_snapshot_t",351,"len")=4
 	Set gtmtypes("shm_snapshot_t",351,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.starved_cntr")=351
+	Set gtmtypes("shm_snapshot_t",352,"name")="shm_snapshot_t.shadow_file_header.stale_timer_started_cntr"
+	Set gtmtypes("shm_snapshot_t",352,"off")=7476
 	Set gtmtypes("shm_snapshot_t",352,"len")=4
 	Set gtmtypes("shm_snapshot_t",352,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.stale_timer_started_cntr")=352
+	Set gtmtypes("shm_snapshot_t",353,"name")="shm_snapshot_t.shadow_file_header.stale_timer_pop_cntr"
+	Set gtmtypes("shm_snapshot_t",353,"off")=7480
 	Set gtmtypes("shm_snapshot_t",353,"len")=4
 	Set gtmtypes("shm_snapshot_t",353,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.stale_timer_pop_cntr")=353
+	Set gtmtypes("shm_snapshot_t",354,"name")="shm_snapshot_t.shadow_file_header.stale_process_defer_cntr"
+	Set gtmtypes("shm_snapshot_t",354,"off")=7484
 	Set gtmtypes("shm_snapshot_t",354,"len")=4
 	Set gtmtypes("shm_snapshot_t",354,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.stale_process_defer_cntr")=354
+	Set gtmtypes("shm_snapshot_t",355,"name")="shm_snapshot_t.shadow_file_header.stale_defer_processed_cntr"
+	Set gtmtypes("shm_snapshot_t",355,"off")=7488
 	Set gtmtypes("shm_snapshot_t",355,"len")=4
 	Set gtmtypes("shm_snapshot_t",355,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.stale_defer_processed_cntr")=355
+	Set gtmtypes("shm_snapshot_t",356,"name")="shm_snapshot_t.shadow_file_header.spcfc_buffer_flush_cntr"
+	Set gtmtypes("shm_snapshot_t",356,"off")=7492
 	Set gtmtypes("shm_snapshot_t",356,"len")=4
 	Set gtmtypes("shm_snapshot_t",356,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.spcfc_buffer_flush_cntr")=356
+	Set gtmtypes("shm_snapshot_t",357,"name")="shm_snapshot_t.shadow_file_header.spcfc_buffer_flush_loop_cntr"
+	Set gtmtypes("shm_snapshot_t",357,"off")=7496
 	Set gtmtypes("shm_snapshot_t",357,"len")=4
 	Set gtmtypes("shm_snapshot_t",357,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.spcfc_buffer_flush_loop_cntr")=357
+	Set gtmtypes("shm_snapshot_t",358,"name")="shm_snapshot_t.shadow_file_header.spcfc_buffer_flush_retries_cntr"
+	Set gtmtypes("shm_snapshot_t",358,"off")=7500
 	Set gtmtypes("shm_snapshot_t",358,"len")=4
 	Set gtmtypes("shm_snapshot_t",358,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.spcfc_buffer_flush_retries_cntr")=358
+	Set gtmtypes("shm_snapshot_t",359,"name")="shm_snapshot_t.shadow_file_header.spcfc_buffer_flushed_during_lockwait_cntr"
+	Set gtmtypes("shm_snapshot_t",359,"off")=7504
 	Set gtmtypes("shm_snapshot_t",359,"len")=4
 	Set gtmtypes("shm_snapshot_t",359,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.spcfc_buffer_flushed_during_lockwait_cntr")=359
+	Set gtmtypes("shm_snapshot_t",360,"name")="shm_snapshot_t.shadow_file_header.tp_crit_retries_cntr"
+	Set gtmtypes("shm_snapshot_t",360,"off")=7508
 	Set gtmtypes("shm_snapshot_t",360,"len")=4
 	Set gtmtypes("shm_snapshot_t",360,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.tp_crit_retries_cntr")=360
+	Set gtmtypes("shm_snapshot_t",361,"name")="shm_snapshot_t.shadow_file_header.db_csh_getn_flush_dirty_cntr"
+	Set gtmtypes("shm_snapshot_t",361,"off")=7512
 	Set gtmtypes("shm_snapshot_t",361,"len")=4
 	Set gtmtypes("shm_snapshot_t",361,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.db_csh_getn_flush_dirty_cntr")=361
+	Set gtmtypes("shm_snapshot_t",362,"name")="shm_snapshot_t.shadow_file_header.db_csh_getn_rip_wait_cntr"
+	Set gtmtypes("shm_snapshot_t",362,"off")=7516
 	Set gtmtypes("shm_snapshot_t",362,"len")=4
 	Set gtmtypes("shm_snapshot_t",362,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.db_csh_getn_rip_wait_cntr")=362
+	Set gtmtypes("shm_snapshot_t",363,"name")="shm_snapshot_t.shadow_file_header.db_csh_getn_buf_owner_stuck_cntr"
+	Set gtmtypes("shm_snapshot_t",363,"off")=7520
 	Set gtmtypes("shm_snapshot_t",363,"len")=4
 	Set gtmtypes("shm_snapshot_t",363,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.db_csh_getn_buf_owner_stuck_cntr")=363
+	Set gtmtypes("shm_snapshot_t",364,"name")="shm_snapshot_t.shadow_file_header.db_csh_getn_out_of_design_cntr"
+	Set gtmtypes("shm_snapshot_t",364,"off")=7524
 	Set gtmtypes("shm_snapshot_t",364,"len")=4
 	Set gtmtypes("shm_snapshot_t",364,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.db_csh_getn_out_of_design_cntr")=364
+	Set gtmtypes("shm_snapshot_t",365,"name")="shm_snapshot_t.shadow_file_header.t_qread_buf_owner_stuck_cntr"
+	Set gtmtypes("shm_snapshot_t",365,"off")=7528
 	Set gtmtypes("shm_snapshot_t",365,"len")=4
 	Set gtmtypes("shm_snapshot_t",365,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.t_qread_buf_owner_stuck_cntr")=365
+	Set gtmtypes("shm_snapshot_t",366,"name")="shm_snapshot_t.shadow_file_header.t_qread_out_of_design_cntr"
+	Set gtmtypes("shm_snapshot_t",366,"off")=7532
 	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_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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.t_qread_out_of_design_cntr")=366
+	Set gtmtypes("shm_snapshot_t",367,"name")="shm_snapshot_t.shadow_file_header.bt_put_flush_dirty_cntr"
+	Set gtmtypes("shm_snapshot_t",367,"off")=7536
 	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_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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.bt_put_flush_dirty_cntr")=367
+	Set gtmtypes("shm_snapshot_t",368,"name")="shm_snapshot_t.shadow_file_header.mlock_wakeups_cntr"
+	Set gtmtypes("shm_snapshot_t",368,"off")=7540
 	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_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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.mlock_wakeups_cntr")=368
+	Set gtmtypes("shm_snapshot_t",369,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_wcs_recover_invoked_cntr"
+	Set gtmtypes("shm_snapshot_t",369,"off")=7544
 	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_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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_wcs_recover_invoked_cntr")=369
+	Set gtmtypes("shm_snapshot_t",370,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_wcs_verify_passed_cntr"
+	Set gtmtypes("shm_snapshot_t",370,"off")=7548
 	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_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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_wcs_verify_passed_cntr")=370
+	Set gtmtypes("shm_snapshot_t",371,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_t_qread_db_csh_getn_invalid_blk_cntr"
+	Set gtmtypes("shm_snapshot_t",371,"off")=7552
 	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_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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_t_qread_db_csh_getn_invalid_blk_cntr")=371
+	Set gtmtypes("shm_snapshot_t",372,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_t_qread_db_csh_get_invalid_blk_cntr"
+	Set gtmtypes("shm_snapshot_t",372,"off")=7556
 	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_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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_t_qread_db_csh_get_invalid_blk_cntr")=372
+	Set gtmtypes("shm_snapshot_t",373,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_db_csh_getn_loopexceed_cntr"
+	Set gtmtypes("shm_snapshot_t",373,"off")=7560
 	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_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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_db_csh_getn_loopexceed_cntr")=373
+	Set gtmtypes("shm_snapshot_t",374,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_db_csh_getn_wcsstarvewrt_cntr"
+	Set gtmtypes("shm_snapshot_t",374,"off")=7564
 	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_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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_db_csh_getn_wcsstarvewrt_cntr")=374
+	Set gtmtypes("shm_snapshot_t",375,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_db_csh_get_cntr"
+	Set gtmtypes("shm_snapshot_t",375,"off")=7568
 	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_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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_db_csh_get_cntr")=375
+	Set gtmtypes("shm_snapshot_t",376,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_tp_tend_wcsgetspace_cntr"
+	Set gtmtypes("shm_snapshot_t",376,"off")=7572
 	Set gtmtypes("shm_snapshot_t",376,"len")=4
 	Set gtmtypes("shm_snapshot_t",376,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_tp_tend_wcsgetspace_cntr")=376
+	Set gtmtypes("shm_snapshot_t",377,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_tp_tend_t1_cntr"
+	Set gtmtypes("shm_snapshot_t",377,"off")=7576
 	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_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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_tp_tend_t1_cntr")=377
+	Set gtmtypes("shm_snapshot_t",378,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_tp_tend_bitmap_cntr"
+	Set gtmtypes("shm_snapshot_t",378,"off")=7580
 	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_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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_tp_tend_bitmap_cntr")=378
+	Set gtmtypes("shm_snapshot_t",379,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_tp_tend_jnl_cwset_cntr"
+	Set gtmtypes("shm_snapshot_t",379,"off")=7584
 	Set gtmtypes("shm_snapshot_t",379,"len")=4
 	Set gtmtypes("shm_snapshot_t",379,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_tp_tend_jnl_cwset_cntr")=379
+	Set gtmtypes("shm_snapshot_t",380,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_tp_tend_jnl_wcsflu_cntr"
+	Set gtmtypes("shm_snapshot_t",380,"off")=7588
 	Set gtmtypes("shm_snapshot_t",380,"len")=4
 	Set gtmtypes("shm_snapshot_t",380,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_tp_tend_jnl_wcsflu_cntr")=380
+	Set gtmtypes("shm_snapshot_t",381,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_t_end_hist_cntr"
+	Set gtmtypes("shm_snapshot_t",381,"off")=7592
 	Set gtmtypes("shm_snapshot_t",381,"len")=4
 	Set gtmtypes("shm_snapshot_t",381,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_t_end_hist_cntr")=381
+	Set gtmtypes("shm_snapshot_t",382,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_t_end_hist1_nullbt_cntr"
+	Set gtmtypes("shm_snapshot_t",382,"off")=7596
 	Set gtmtypes("shm_snapshot_t",382,"len")=4
 	Set gtmtypes("shm_snapshot_t",382,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_t_end_hist1_nullbt_cntr")=382
+	Set gtmtypes("shm_snapshot_t",383,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_t_end_hist1_nonnullbt_cntr"
+	Set gtmtypes("shm_snapshot_t",383,"off")=7600
 	Set gtmtypes("shm_snapshot_t",383,"len")=4
 	Set gtmtypes("shm_snapshot_t",383,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_t_end_hist1_nonnullbt_cntr")=383
+	Set gtmtypes("shm_snapshot_t",384,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_t_end_bitmap_nullbt_cntr"
+	Set gtmtypes("shm_snapshot_t",384,"off")=7604
 	Set gtmtypes("shm_snapshot_t",384,"len")=4
 	Set gtmtypes("shm_snapshot_t",384,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_t_end_bitmap_nullbt_cntr")=384
+	Set gtmtypes("shm_snapshot_t",385,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_t_end_bitmap_nonnullbt_cntr"
+	Set gtmtypes("shm_snapshot_t",385,"off")=7608
 	Set gtmtypes("shm_snapshot_t",385,"len")=4
 	Set gtmtypes("shm_snapshot_t",385,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_t_end_bitmap_nonnullbt_cntr")=385
+	Set gtmtypes("shm_snapshot_t",386,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_t_end_jnl_cwset_cntr"
+	Set gtmtypes("shm_snapshot_t",386,"off")=7612
 	Set gtmtypes("shm_snapshot_t",386,"len")=4
 	Set gtmtypes("shm_snapshot_t",386,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_t_end_jnl_cwset_cntr")=386
+	Set gtmtypes("shm_snapshot_t",387,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_t_end_jnl_wcsflu_cntr"
+	Set gtmtypes("shm_snapshot_t",387,"off")=7616
 	Set gtmtypes("shm_snapshot_t",387,"len")=4
 	Set gtmtypes("shm_snapshot_t",387,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_t_end_jnl_wcsflu_cntr")=387
+	Set gtmtypes("shm_snapshot_t",388,"name")="shm_snapshot_t.shadow_file_header.db_csh_get_too_many_loops_cntr"
+	Set gtmtypes("shm_snapshot_t",388,"off")=7620
 	Set gtmtypes("shm_snapshot_t",388,"len")=4
 	Set gtmtypes("shm_snapshot_t",388,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.db_csh_get_too_many_loops_cntr")=388
+	Set gtmtypes("shm_snapshot_t",389,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_tpckh_hist1_nullbt_cntr"
+	Set gtmtypes("shm_snapshot_t",389,"off")=7624
 	Set gtmtypes("shm_snapshot_t",389,"len")=4
 	Set gtmtypes("shm_snapshot_t",389,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_tpckh_hist1_nullbt_cntr")=389
+	Set gtmtypes("shm_snapshot_t",390,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_tpckh_hist1_nonnullbt_cntr"
+	Set gtmtypes("shm_snapshot_t",390,"off")=7628
 	Set gtmtypes("shm_snapshot_t",390,"len")=4
 	Set gtmtypes("shm_snapshot_t",390,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_tpckh_hist1_nonnullbt_cntr")=390
+	Set gtmtypes("shm_snapshot_t",391,"name")="shm_snapshot_t.shadow_file_header.jnl_blocked_writer_lost_cntr"
+	Set gtmtypes("shm_snapshot_t",391,"off")=7632
 	Set gtmtypes("shm_snapshot_t",391,"len")=4
 	Set gtmtypes("shm_snapshot_t",391,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.jnl_blocked_writer_lost_cntr")=391
+	Set gtmtypes("shm_snapshot_t",392,"name")="shm_snapshot_t.shadow_file_header.jnl_blocked_writer_stuck_cntr"
+	Set gtmtypes("shm_snapshot_t",392,"off")=7636
 	Set gtmtypes("shm_snapshot_t",392,"len")=4
 	Set gtmtypes("shm_snapshot_t",392,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.jnl_blocked_writer_stuck_cntr")=392
+	Set gtmtypes("shm_snapshot_t",393,"name")="shm_snapshot_t.shadow_file_header.jnl_blocked_writer_blocked_cntr"
+	Set gtmtypes("shm_snapshot_t",393,"off")=7640
 	Set gtmtypes("shm_snapshot_t",393,"len")=4
 	Set gtmtypes("shm_snapshot_t",393,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.jnl_blocked_writer_blocked_cntr")=393
+	Set gtmtypes("shm_snapshot_t",394,"name")="shm_snapshot_t.shadow_file_header.n_jnl_fsyncs_cntr"
+	Set gtmtypes("shm_snapshot_t",394,"off")=7644
 	Set gtmtypes("shm_snapshot_t",394,"len")=4
 	Set gtmtypes("shm_snapshot_t",394,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_jnl_fsyncs_cntr")=394
+	Set gtmtypes("shm_snapshot_t",395,"name")="shm_snapshot_t.shadow_file_header.n_jnl_fsync_tries_cntr"
+	Set gtmtypes("shm_snapshot_t",395,"off")=7648
 	Set gtmtypes("shm_snapshot_t",395,"len")=4
 	Set gtmtypes("shm_snapshot_t",395,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_jnl_fsync_tries_cntr")=395
+	Set gtmtypes("shm_snapshot_t",396,"name")="shm_snapshot_t.shadow_file_header.n_jnl_fsync_recovers_cntr"
+	Set gtmtypes("shm_snapshot_t",396,"off")=7652
 	Set gtmtypes("shm_snapshot_t",396,"len")=4
 	Set gtmtypes("shm_snapshot_t",396,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_jnl_fsync_recovers_cntr")=396
+	Set gtmtypes("shm_snapshot_t",397,"name")="shm_snapshot_t.shadow_file_header.n_db_fsyncs_cntr"
+	Set gtmtypes("shm_snapshot_t",397,"off")=7656
 	Set gtmtypes("shm_snapshot_t",397,"len")=4
 	Set gtmtypes("shm_snapshot_t",397,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_db_fsyncs_cntr")=397
+	Set gtmtypes("shm_snapshot_t",398,"name")="shm_snapshot_t.shadow_file_header.n_db_fsyncs_in_crit_cntr"
+	Set gtmtypes("shm_snapshot_t",398,"off")=7660
 	Set gtmtypes("shm_snapshot_t",398,"len")=4
 	Set gtmtypes("shm_snapshot_t",398,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_db_fsyncs_in_crit_cntr")=398
+	Set gtmtypes("shm_snapshot_t",399,"name")="shm_snapshot_t.shadow_file_header.n_dbsync_timers_cntr"
+	Set gtmtypes("shm_snapshot_t",399,"off")=7664
 	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_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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_dbsync_timers_cntr")=399
+	Set gtmtypes("shm_snapshot_t",400,"name")="shm_snapshot_t.shadow_file_header.n_dbsync_writes_cntr"
+	Set gtmtypes("shm_snapshot_t",400,"off")=7668
 	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_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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_dbsync_writes_cntr")=400
+	Set gtmtypes("shm_snapshot_t",401,"name")="shm_snapshot_t.shadow_file_header.mutex_queue_full_cntr"
+	Set gtmtypes("shm_snapshot_t",401,"off")=7672
 	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_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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.mutex_queue_full_cntr")=401
+	Set gtmtypes("shm_snapshot_t",402,"name")="shm_snapshot_t.shadow_file_header.wcb_bt_put_cntr"
+	Set gtmtypes("shm_snapshot_t",402,"off")=7676
 	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_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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_bt_put_cntr")=402
+	Set gtmtypes("shm_snapshot_t",403,"name")="shm_snapshot_t.shadow_file_header.wcb_mutex_salvage_cntr"
+	Set gtmtypes("shm_snapshot_t",403,"off")=7680
 	Set gtmtypes("shm_snapshot_t",403,"len")=4
 	Set gtmtypes("shm_snapshot_t",403,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_mutex_salvage_cntr")=403
+	Set gtmtypes("shm_snapshot_t",404,"name")="shm_snapshot_t.shadow_file_header.wcb_wcs_flu0_cntr"
+	Set gtmtypes("shm_snapshot_t",404,"off")=7684
 	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_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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_wcs_flu0_cntr")=404
+	Set gtmtypes("shm_snapshot_t",405,"name")="shm_snapshot_t.shadow_file_header.wcb_t_end_sysops_nocr_invcr_cntr"
+	Set gtmtypes("shm_snapshot_t",405,"off")=7688
 	Set gtmtypes("shm_snapshot_t",405,"len")=4
 	Set gtmtypes("shm_snapshot_t",405,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_t_end_sysops_nocr_invcr_cntr")=405
+	Set gtmtypes("shm_snapshot_t",406,"name")="shm_snapshot_t.shadow_file_header.wcb_t_end_sysops_cr_invcr_cntr"
+	Set gtmtypes("shm_snapshot_t",406,"off")=7692
 	Set gtmtypes("shm_snapshot_t",406,"len")=4
 	Set gtmtypes("shm_snapshot_t",406,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_t_end_sysops_cr_invcr_cntr")=406
+	Set gtmtypes("shm_snapshot_t",407,"name")="shm_snapshot_t.shadow_file_header.wcb_t_end_sysops_rip_wait_cntr"
+	Set gtmtypes("shm_snapshot_t",407,"off")=7696
 	Set gtmtypes("shm_snapshot_t",407,"len")=4
 	Set gtmtypes("shm_snapshot_t",407,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_t_end_sysops_rip_wait_cntr")=407
+	Set gtmtypes("shm_snapshot_t",408,"name")="shm_snapshot_t.shadow_file_header.wcb_t_end_sysops_dirtyripwait_cntr"
+	Set gtmtypes("shm_snapshot_t",408,"off")=7700
 	Set gtmtypes("shm_snapshot_t",408,"len")=4
 	Set gtmtypes("shm_snapshot_t",408,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_t_end_sysops_dirtyripwait_cntr")=408
+	Set gtmtypes("shm_snapshot_t",409,"name")="shm_snapshot_t.shadow_file_header.wcb_gds_rundown1_cntr"
+	Set gtmtypes("shm_snapshot_t",409,"off")=7704
 	Set gtmtypes("shm_snapshot_t",409,"len")=4
 	Set gtmtypes("shm_snapshot_t",409,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_gds_rundown1_cntr")=409
+	Set gtmtypes("shm_snapshot_t",410,"name")="shm_snapshot_t.shadow_file_header.wcb_wcs_flu1_cntr"
+	Set gtmtypes("shm_snapshot_t",410,"off")=7708
 	Set gtmtypes("shm_snapshot_t",410,"len")=4
 	Set gtmtypes("shm_snapshot_t",410,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_wcs_flu1_cntr")=410
+	Set gtmtypes("shm_snapshot_t",411,"name")="shm_snapshot_t.shadow_file_header.wcb_mu_back_cntr"
+	Set gtmtypes("shm_snapshot_t",411,"off")=7712
 	Set gtmtypes("shm_snapshot_t",411,"len")=4
 	Set gtmtypes("shm_snapshot_t",411,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_mu_back_cntr")=411
+	Set gtmtypes("shm_snapshot_t",412,"name")="shm_snapshot_t.shadow_file_header.wcb_t_end_sysops_dirty_invcr_cntr"
+	Set gtmtypes("shm_snapshot_t",412,"off")=7716
 	Set gtmtypes("shm_snapshot_t",412,"len")=4
 	Set gtmtypes("shm_snapshot_t",412,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_t_end_sysops_dirty_invcr_cntr")=412
+	Set gtmtypes("shm_snapshot_t",413,"name")="shm_snapshot_t.shadow_file_header.wcb_t_end_sysops_wtfini_fail_cntr"
+	Set gtmtypes("shm_snapshot_t",413,"off")=7720
 	Set gtmtypes("shm_snapshot_t",413,"len")=4
 	Set gtmtypes("shm_snapshot_t",413,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_t_end_sysops_wtfini_fail_cntr")=413
+	Set gtmtypes("shm_snapshot_t",414,"name")="shm_snapshot_t.shadow_file_header.wcb_t_end_sysops_twin_stuck_cntr"
+	Set gtmtypes("shm_snapshot_t",414,"off")=7724
 	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_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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_t_end_sysops_twin_stuck_cntr")=414
+	Set gtmtypes("shm_snapshot_t",415,"name")="shm_snapshot_t.shadow_file_header.db_csh_getn_wrt_latch_stuck_cntr"
+	Set gtmtypes("shm_snapshot_t",415,"off")=7728
 	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_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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.db_csh_getn_wrt_latch_stuck_cntr")=415
+	Set gtmtypes("shm_snapshot_t",416,"name")="shm_snapshot_t.shadow_file_header.wcb_secshr_db_clnup_now_crit_cntr"
+	Set gtmtypes("shm_snapshot_t",416,"off")=7732
 	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_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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_secshr_db_clnup_now_crit_cntr")=416
+	Set gtmtypes("shm_snapshot_t",417,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_t_qread_bad_bt_index1_cntr"
+	Set gtmtypes("shm_snapshot_t",417,"off")=7736
 	Set gtmtypes("shm_snapshot_t",417,"len")=4
 	Set gtmtypes("shm_snapshot_t",417,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_t_qread_bad_bt_index1_cntr")=417
+	Set gtmtypes("shm_snapshot_t",418,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_t_qread_bad_bt_index2_cntr"
+	Set gtmtypes("shm_snapshot_t",418,"off")=7740
 	Set gtmtypes("shm_snapshot_t",418,"len")=4
 	Set gtmtypes("shm_snapshot_t",418,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_t_qread_bad_bt_index2_cntr")=418
+	Set gtmtypes("shm_snapshot_t",419,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_t_end_crbtmismatch1_cntr"
+	Set gtmtypes("shm_snapshot_t",419,"off")=7744
 	Set gtmtypes("shm_snapshot_t",419,"len")=4
 	Set gtmtypes("shm_snapshot_t",419,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_t_end_crbtmismatch1_cntr")=419
+	Set gtmtypes("shm_snapshot_t",420,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_t_end_crbtmismatch2_cntr"
+	Set gtmtypes("shm_snapshot_t",420,"off")=7748
 	Set gtmtypes("shm_snapshot_t",420,"len")=4
 	Set gtmtypes("shm_snapshot_t",420,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_t_end_crbtmismatch2_cntr")=420
+	Set gtmtypes("shm_snapshot_t",421,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_t_end_crbtmismatch3_cntr"
+	Set gtmtypes("shm_snapshot_t",421,"off")=7752
 	Set gtmtypes("shm_snapshot_t",421,"len")=4
 	Set gtmtypes("shm_snapshot_t",421,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_t_end_crbtmismatch3_cntr")=421
+	Set gtmtypes("shm_snapshot_t",422,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_tp_tend_crbtmismatch1_cntr"
+	Set gtmtypes("shm_snapshot_t",422,"off")=7756
 	Set gtmtypes("shm_snapshot_t",422,"len")=4
 	Set gtmtypes("shm_snapshot_t",422,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_tp_tend_crbtmismatch1_cntr")=422
+	Set gtmtypes("shm_snapshot_t",423,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_tp_tend_crbtmismatch2_cntr"
+	Set gtmtypes("shm_snapshot_t",423,"off")=7760
 	Set gtmtypes("shm_snapshot_t",423,"len")=4
 	Set gtmtypes("shm_snapshot_t",423,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_tp_tend_crbtmismatch2_cntr")=423
+	Set gtmtypes("shm_snapshot_t",424,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_tp_tend_crbtmismatch3_cntr"
+	Set gtmtypes("shm_snapshot_t",424,"off")=7764
 	Set gtmtypes("shm_snapshot_t",424,"len")=4
 	Set gtmtypes("shm_snapshot_t",424,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_tp_tend_crbtmismatch3_cntr")=424
+	Set gtmtypes("shm_snapshot_t",425,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_wcs_wtstart_bad_cr_cntr"
+	Set gtmtypes("shm_snapshot_t",425,"off")=7768
 	Set gtmtypes("shm_snapshot_t",425,"len")=4
 	Set gtmtypes("shm_snapshot_t",425,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_wcs_wtstart_bad_cr_cntr")=425
+	Set gtmtypes("shm_snapshot_t",426,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_wcs_wtfini_bad_cr_cntr"
+	Set gtmtypes("shm_snapshot_t",426,"off")=7772
 	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_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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_wcs_wtfini_bad_cr_cntr")=426
+	Set gtmtypes("shm_snapshot_t",427,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_bt_get_cntr"
+	Set gtmtypes("shm_snapshot_t",427,"off")=7776
 	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_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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_bt_get_cntr")=427
+	Set gtmtypes("shm_snapshot_t",428,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_wcs_cdb_sc_final_retry_cntr"
+	Set gtmtypes("shm_snapshot_t",428,"off")=7780
 	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_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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_wcs_cdb_sc_final_retry_cntr")=428
+	Set gtmtypes("shm_snapshot_t",429,"name")="shm_snapshot_t.shadow_file_header.wcb_bg_update_lckfail1_cntr"
+	Set gtmtypes("shm_snapshot_t",429,"off")=7784
 	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_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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_bg_update_lckfail1_cntr")=429
+	Set gtmtypes("shm_snapshot_t",430,"name")="shm_snapshot_t.shadow_file_header.wcb_bg_update_lckfail2_cntr"
+	Set gtmtypes("shm_snapshot_t",430,"off")=7788
 	Set gtmtypes("shm_snapshot_t",430,"len")=4
 	Set gtmtypes("shm_snapshot_t",430,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_bg_update_lckfail2_cntr")=430
+	Set gtmtypes("shm_snapshot_t",431,"name")="shm_snapshot_t.shadow_file_header.wcb_wtstart_lckfail1_cntr"
+	Set gtmtypes("shm_snapshot_t",431,"off")=7792
 	Set gtmtypes("shm_snapshot_t",431,"len")=4
 	Set gtmtypes("shm_snapshot_t",431,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_wtstart_lckfail1_cntr")=431
+	Set gtmtypes("shm_snapshot_t",432,"name")="shm_snapshot_t.shadow_file_header.wcb_wtstart_lckfail2_cntr"
+	Set gtmtypes("shm_snapshot_t",432,"off")=7796
 	Set gtmtypes("shm_snapshot_t",432,"len")=4
 	Set gtmtypes("shm_snapshot_t",432,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_wtstart_lckfail2_cntr")=432
+	Set gtmtypes("shm_snapshot_t",433,"name")="shm_snapshot_t.shadow_file_header.wcb_wtstart_lckfail3_cntr"
+	Set gtmtypes("shm_snapshot_t",433,"off")=7800
 	Set gtmtypes("shm_snapshot_t",433,"len")=4
 	Set gtmtypes("shm_snapshot_t",433,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_wtstart_lckfail3_cntr")=433
+	Set gtmtypes("shm_snapshot_t",434,"name")="shm_snapshot_t.shadow_file_header.wcb_wtstart_lckfail4_cntr"
+	Set gtmtypes("shm_snapshot_t",434,"off")=7804
 	Set gtmtypes("shm_snapshot_t",434,"len")=4
 	Set gtmtypes("shm_snapshot_t",434,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_wtstart_lckfail4_cntr")=434
+	Set gtmtypes("shm_snapshot_t",435,"name")="shm_snapshot_t.shadow_file_header.wcb_wtfini_lckfail1_cntr"
+	Set gtmtypes("shm_snapshot_t",435,"off")=7808
 	Set gtmtypes("shm_snapshot_t",435,"len")=4
 	Set gtmtypes("shm_snapshot_t",435,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_wtfini_lckfail1_cntr")=435
+	Set gtmtypes("shm_snapshot_t",436,"name")="shm_snapshot_t.shadow_file_header.wcb_wtfini_lckfail2_cntr"
+	Set gtmtypes("shm_snapshot_t",436,"off")=7812
 	Set gtmtypes("shm_snapshot_t",436,"len")=4
 	Set gtmtypes("shm_snapshot_t",436,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_wtfini_lckfail2_cntr")=436
+	Set gtmtypes("shm_snapshot_t",437,"name")="shm_snapshot_t.shadow_file_header.wcb_wtfini_lckfail3_cntr"
+	Set gtmtypes("shm_snapshot_t",437,"off")=7816
 	Set gtmtypes("shm_snapshot_t",437,"len")=4
 	Set gtmtypes("shm_snapshot_t",437,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_wtfini_lckfail3_cntr")=437
+	Set gtmtypes("shm_snapshot_t",438,"name")="shm_snapshot_t.shadow_file_header.wcb_wtfini_lckfail4_cntr"
+	Set gtmtypes("shm_snapshot_t",438,"off")=7820
 	Set gtmtypes("shm_snapshot_t",438,"len")=4
 	Set gtmtypes("shm_snapshot_t",438,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_wtfini_lckfail4_cntr")=438
+	Set gtmtypes("shm_snapshot_t",439,"name")="shm_snapshot_t.shadow_file_header.wcb_t_end_sysops_dirtystuck1_cntr"
+	Set gtmtypes("shm_snapshot_t",439,"off")=7824
 	Set gtmtypes("shm_snapshot_t",439,"len")=4
 	Set gtmtypes("shm_snapshot_t",439,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_t_end_sysops_dirtystuck1_cntr")=439
+	Set gtmtypes("shm_snapshot_t",440,"name")="shm_snapshot_t.shadow_file_header.wcb_t_end_sysops_dirtystuck2_cntr"
+	Set gtmtypes("shm_snapshot_t",440,"off")=7828
 	Set gtmtypes("shm_snapshot_t",440,"len")=4
 	Set gtmtypes("shm_snapshot_t",440,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_t_end_sysops_dirtystuck2_cntr")=440
+	Set gtmtypes("shm_snapshot_t",441,"name")="shm_snapshot_t.shadow_file_header.wcb_secshr_db_clnup_wbuf_dqd_cntr"
+	Set gtmtypes("shm_snapshot_t",441,"off")=7832
 	Set gtmtypes("shm_snapshot_t",441,"len")=4
 	Set gtmtypes("shm_snapshot_t",441,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_secshr_db_clnup_wbuf_dqd_cntr")=441
+	Set gtmtypes("shm_snapshot_t",442,"name")="shm_snapshot_t.shadow_file_header.dwngrd_refmts_syncio_cntr"
+	Set gtmtypes("shm_snapshot_t",442,"off")=7836
 	Set gtmtypes("shm_snapshot_t",442,"len")=4
 	Set gtmtypes("shm_snapshot_t",442,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.dwngrd_refmts_syncio_cntr")=442
+	Set gtmtypes("shm_snapshot_t",443,"name")="shm_snapshot_t.shadow_file_header.dwngrd_refmts_asyncio_cntr"
+	Set gtmtypes("shm_snapshot_t",443,"off")=7840
 	Set gtmtypes("shm_snapshot_t",443,"len")=4
 	Set gtmtypes("shm_snapshot_t",443,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.dwngrd_refmts_asyncio_cntr")=443
+	Set gtmtypes("shm_snapshot_t",444,"name")="shm_snapshot_t.shadow_file_header.shmpool_refmt_harvests_cntr"
+	Set gtmtypes("shm_snapshot_t",444,"off")=7844
 	Set gtmtypes("shm_snapshot_t",444,"len")=4
 	Set gtmtypes("shm_snapshot_t",444,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.shmpool_refmt_harvests_cntr")=444
+	Set gtmtypes("shm_snapshot_t",445,"name")="shm_snapshot_t.shadow_file_header.shmpool_recovery_cntr"
+	Set gtmtypes("shm_snapshot_t",445,"off")=7848
 	Set gtmtypes("shm_snapshot_t",445,"len")=4
 	Set gtmtypes("shm_snapshot_t",445,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.shmpool_recovery_cntr")=445
+	Set gtmtypes("shm_snapshot_t",446,"name")="shm_snapshot_t.shadow_file_header.shmpool_blkd_by_sdc_cntr"
+	Set gtmtypes("shm_snapshot_t",446,"off")=7852
 	Set gtmtypes("shm_snapshot_t",446,"len")=4
 	Set gtmtypes("shm_snapshot_t",446,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.shmpool_blkd_by_sdc_cntr")=446
+	Set gtmtypes("shm_snapshot_t",447,"name")="shm_snapshot_t.shadow_file_header.shmpool_alloc_bbflush_cntr"
+	Set gtmtypes("shm_snapshot_t",447,"off")=7856
 	Set gtmtypes("shm_snapshot_t",447,"len")=4
 	Set gtmtypes("shm_snapshot_t",447,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.shmpool_alloc_bbflush_cntr")=447
+	Set gtmtypes("shm_snapshot_t",448,"name")="shm_snapshot_t.shadow_file_header.refmt_hvst_blk_released_replaced_cntr"
+	Set gtmtypes("shm_snapshot_t",448,"off")=7860
 	Set gtmtypes("shm_snapshot_t",448,"len")=4
 	Set gtmtypes("shm_snapshot_t",448,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.refmt_hvst_blk_released_replaced_cntr")=448
+	Set gtmtypes("shm_snapshot_t",449,"name")="shm_snapshot_t.shadow_file_header.refmt_hvst_blk_released_io_complete_cntr"
+	Set gtmtypes("shm_snapshot_t",449,"off")=7864
 	Set gtmtypes("shm_snapshot_t",449,"len")=4
 	Set gtmtypes("shm_snapshot_t",449,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.refmt_hvst_blk_released_io_complete_cntr")=449
+	Set gtmtypes("shm_snapshot_t",450,"name")="shm_snapshot_t.shadow_file_header.refmt_hvst_blk_kept_cntr"
+	Set gtmtypes("shm_snapshot_t",450,"off")=7868
 	Set gtmtypes("shm_snapshot_t",450,"len")=4
 	Set gtmtypes("shm_snapshot_t",450,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.refmt_hvst_blk_kept_cntr")=450
+	Set gtmtypes("shm_snapshot_t",451,"name")="shm_snapshot_t.shadow_file_header.refmt_hvst_blk_ignored_cntr"
+	Set gtmtypes("shm_snapshot_t",451,"off")=7872
 	Set gtmtypes("shm_snapshot_t",451,"len")=4
 	Set gtmtypes("shm_snapshot_t",451,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.refmt_hvst_blk_ignored_cntr")=451
+	Set gtmtypes("shm_snapshot_t",452,"name")="shm_snapshot_t.shadow_file_header.refmt_blk_chk_blk_freed_cntr"
+	Set gtmtypes("shm_snapshot_t",452,"off")=7876
 	Set gtmtypes("shm_snapshot_t",452,"len")=4
 	Set gtmtypes("shm_snapshot_t",452,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.refmt_blk_chk_blk_freed_cntr")=452
+	Set gtmtypes("shm_snapshot_t",453,"name")="shm_snapshot_t.shadow_file_header.refmt_blk_chk_blk_kept_cntr"
+	Set gtmtypes("shm_snapshot_t",453,"off")=7880
 	Set gtmtypes("shm_snapshot_t",453,"len")=4
 	Set gtmtypes("shm_snapshot_t",453,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.refmt_blk_chk_blk_kept_cntr")=453
+	Set gtmtypes("shm_snapshot_t",454,"name")="shm_snapshot_t.shadow_file_header.active_lvl_trigger_cntr"
+	Set gtmtypes("shm_snapshot_t",454,"off")=7884
 	Set gtmtypes("shm_snapshot_t",454,"len")=4
 	Set gtmtypes("shm_snapshot_t",454,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.active_lvl_trigger_cntr")=454
+	Set gtmtypes("shm_snapshot_t",455,"name")="shm_snapshot_t.shadow_file_header.new_buff_cntr"
+	Set gtmtypes("shm_snapshot_t",455,"off")=7888
 	Set gtmtypes("shm_snapshot_t",455,"len")=4
 	Set gtmtypes("shm_snapshot_t",455,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.new_buff_cntr")=455
+	Set gtmtypes("shm_snapshot_t",456,"name")="shm_snapshot_t.shadow_file_header.phase2_commit_wait_sleep_in_crit_cntr"
+	Set gtmtypes("shm_snapshot_t",456,"off")=7892
 	Set gtmtypes("shm_snapshot_t",456,"len")=4
 	Set gtmtypes("shm_snapshot_t",456,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.phase2_commit_wait_sleep_in_crit_cntr")=456
+	Set gtmtypes("shm_snapshot_t",457,"name")="shm_snapshot_t.shadow_file_header.phase2_commit_wait_sleep_no_crit_cntr"
+	Set gtmtypes("shm_snapshot_t",457,"off")=7896
 	Set gtmtypes("shm_snapshot_t",457,"len")=4
 	Set gtmtypes("shm_snapshot_t",457,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.phase2_commit_wait_sleep_no_crit_cntr")=457
+	Set gtmtypes("shm_snapshot_t",458,"name")="shm_snapshot_t.shadow_file_header.phase2_commit_wait_pidcnt_cntr"
+	Set gtmtypes("shm_snapshot_t",458,"off")=7900
 	Set gtmtypes("shm_snapshot_t",458,"len")=4
 	Set gtmtypes("shm_snapshot_t",458,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.phase2_commit_wait_pidcnt_cntr")=458
+	Set gtmtypes("shm_snapshot_t",459,"name")="shm_snapshot_t.shadow_file_header.wcb_t_end_sysops_intend_wait_cntr"
+	Set gtmtypes("shm_snapshot_t",459,"off")=7904
 	Set gtmtypes("shm_snapshot_t",459,"len")=4
 	Set gtmtypes("shm_snapshot_t",459,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_t_end_sysops_intend_wait_cntr")=459
+	Set gtmtypes("shm_snapshot_t",460,"name")="shm_snapshot_t.shadow_file_header.wcb_secshr_db_clnup_phase2_clnup_cntr"
+	Set gtmtypes("shm_snapshot_t",460,"off")=7908
 	Set gtmtypes("shm_snapshot_t",460,"len")=4
 	Set gtmtypes("shm_snapshot_t",460,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_secshr_db_clnup_phase2_clnup_cntr")=460
+	Set gtmtypes("shm_snapshot_t",461,"name")="shm_snapshot_t.shadow_file_header.wcb_phase2_commit_wait_cntr"
+	Set gtmtypes("shm_snapshot_t",461,"off")=7912
 	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_phase2_commit_wait_cntr")=461
+	Set gtmtypes("shm_snapshot_t",462,"name")="shm_snapshot_t.shadow_file_header.recompute_upd_array_calls_cntr"
+	Set gtmtypes("shm_snapshot_t",462,"off")=7916
 	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.recompute_upd_array_calls_cntr")=462
+	Set gtmtypes("shm_snapshot_t",463,"name")="shm_snapshot_t.shadow_file_header.recompute_upd_array_rip_cntr"
+	Set gtmtypes("shm_snapshot_t",463,"off")=7920
 	Set gtmtypes("shm_snapshot_t",463,"len")=4
 	Set gtmtypes("shm_snapshot_t",463,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.recompute_upd_array_rip_cntr")=463
+	Set gtmtypes("shm_snapshot_t",464,"name")="shm_snapshot_t.shadow_file_header.recompute_upd_array_in_tend_cntr"
+	Set gtmtypes("shm_snapshot_t",464,"off")=7924
 	Set gtmtypes("shm_snapshot_t",464,"len")=4
 	Set gtmtypes("shm_snapshot_t",464,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.recompute_upd_array_in_tend_cntr")=464
+	Set gtmtypes("shm_snapshot_t",465,"name")="shm_snapshot_t.shadow_file_header.recompute_upd_array_search_blk_cntr"
+	Set gtmtypes("shm_snapshot_t",465,"off")=7928
 	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.recompute_upd_array_search_blk_cntr")=465
+	Set gtmtypes("shm_snapshot_t",466,"name")="shm_snapshot_t.shadow_file_header.recompute_upd_array_new_rec_cntr"
+	Set gtmtypes("shm_snapshot_t",466,"off")=7932
 	Set gtmtypes("shm_snapshot_t",466,"len")=4
 	Set gtmtypes("shm_snapshot_t",466,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.recompute_upd_array_new_rec_cntr")=466
+	Set gtmtypes("shm_snapshot_t",467,"name")="shm_snapshot_t.shadow_file_header.recompute_upd_array_rec_size_cntr"
+	Set gtmtypes("shm_snapshot_t",467,"off")=7936
 	Set gtmtypes("shm_snapshot_t",467,"len")=4
 	Set gtmtypes("shm_snapshot_t",467,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.recompute_upd_array_rec_size_cntr")=467
+	Set gtmtypes("shm_snapshot_t",468,"name")="shm_snapshot_t.shadow_file_header.recompute_upd_array_rec_cmpc_cntr"
+	Set gtmtypes("shm_snapshot_t",468,"off")=7940
 	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.recompute_upd_array_rec_cmpc_cntr")=468
+	Set gtmtypes("shm_snapshot_t",469,"name")="shm_snapshot_t.shadow_file_header.recompute_upd_array_blk_fini_cntr"
+	Set gtmtypes("shm_snapshot_t",469,"off")=7944
 	Set gtmtypes("shm_snapshot_t",469,"len")=4
 	Set gtmtypes("shm_snapshot_t",469,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.recompute_upd_array_blk_fini_cntr")=469
+	Set gtmtypes("shm_snapshot_t",470,"name")="shm_snapshot_t.shadow_file_header.recompute_upd_array_blk_split_cntr"
+	Set gtmtypes("shm_snapshot_t",470,"off")=7948
 	Set gtmtypes("shm_snapshot_t",470,"len")=4
 	Set gtmtypes("shm_snapshot_t",470,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.recompute_upd_array_blk_split_cntr")=470
+	Set gtmtypes("shm_snapshot_t",471,"name")="shm_snapshot_t.shadow_file_header.t_qread_ripsleep_cnt_cntr"
+	Set gtmtypes("shm_snapshot_t",471,"off")=7952
 	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.t_qread_ripsleep_cnt_cntr")=471
+	Set gtmtypes("shm_snapshot_t",472,"name")="shm_snapshot_t.shadow_file_header.t_qread_ripsleep_nblks_cntr"
+	Set gtmtypes("shm_snapshot_t",472,"off")=7956
 	Set gtmtypes("shm_snapshot_t",472,"len")=4
 	Set gtmtypes("shm_snapshot_t",472,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.t_qread_ripsleep_nblks_cntr")=472
+	Set gtmtypes("shm_snapshot_t",473,"name")="shm_snapshot_t.shadow_file_header.wcs_wtfini_invoked_cntr"
+	Set gtmtypes("shm_snapshot_t",473,"off")=7960
 	Set gtmtypes("shm_snapshot_t",473,"len")=4
 	Set gtmtypes("shm_snapshot_t",473,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcs_wtfini_invoked_cntr")=473
+	Set gtmtypes("shm_snapshot_t",474,"name")="shm_snapshot_t.shadow_file_header.wcs_wterror_invoked_cntr"
+	Set gtmtypes("shm_snapshot_t",474,"off")=7964
 	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcs_wterror_invoked_cntr")=474
+	Set gtmtypes("shm_snapshot_t",475,"name")="shm_snapshot_t.shadow_file_header.wcs_wt_restart_invoked_cntr"
+	Set gtmtypes("shm_snapshot_t",475,"off")=7968
 	Set gtmtypes("shm_snapshot_t",475,"len")=4
 	Set gtmtypes("shm_snapshot_t",475,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcs_wt_restart_invoked_cntr")=475
+	Set gtmtypes("shm_snapshot_t",476,"name")="shm_snapshot_t.shadow_file_header.wcs_wt_restart_eagain_cntr"
+	Set gtmtypes("shm_snapshot_t",476,"off")=7972
 	Set gtmtypes("shm_snapshot_t",476,"len")=4
 	Set gtmtypes("shm_snapshot_t",476,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcs_wt_restart_eagain_cntr")=476
+	Set gtmtypes("shm_snapshot_t",477,"name")="shm_snapshot_t.shadow_file_header.wcs_wt_restart_reinsert_cntr"
+	Set gtmtypes("shm_snapshot_t",477,"off")=7976
 	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcs_wt_restart_reinsert_cntr")=477
+	Set gtmtypes("shm_snapshot_t",478,"name")="shm_snapshot_t.shadow_file_header.wcs_wtstart_eagain_cntr"
+	Set gtmtypes("shm_snapshot_t",478,"off")=7980
+	Set gtmtypes("shm_snapshot_t",478,"len")=4
+	Set gtmtypes("shm_snapshot_t",478,"type")="int"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcs_wtstart_eagain_cntr")=478
+	Set gtmtypes("shm_snapshot_t",479,"name")="shm_snapshot_t.shadow_file_header.wcs_wtstart_eagain_incrit_cntr"
+	Set gtmtypes("shm_snapshot_t",479,"off")=7984
+	Set gtmtypes("shm_snapshot_t",479,"len")=4
+	Set gtmtypes("shm_snapshot_t",479,"type")="int"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcs_wtstart_eagain_incrit_cntr")=479
+	Set gtmtypes("shm_snapshot_t",480,"name")="shm_snapshot_t.shadow_file_header.async_restart_eagain_cntr"
+	Set gtmtypes("shm_snapshot_t",480,"off")=7988
 	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.async_restart_eagain_cntr")=480
+	Set gtmtypes("shm_snapshot_t",481,"name")="shm_snapshot_t.shadow_file_header.jnlbuff_phs2cmt_array_full_cntr"
+	Set gtmtypes("shm_snapshot_t",481,"off")=7992
 	Set gtmtypes("shm_snapshot_t",481,"len")=4
 	Set gtmtypes("shm_snapshot_t",481,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.jnlbuff_phs2cmt_array_full_cntr")=481
+	Set gtmtypes("shm_snapshot_t",482,"name")="shm_snapshot_t.shadow_file_header.jnl_phase2_cleanup_if_possible_cntr"
+	Set gtmtypes("shm_snapshot_t",482,"off")=7996
+	Set gtmtypes("shm_snapshot_t",482,"len")=4
+	Set gtmtypes("shm_snapshot_t",482,"type")="int"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.jnl_phase2_cleanup_if_possible_cntr")=482
+	Set gtmtypes("shm_snapshot_t",483,"name")="shm_snapshot_t.shadow_file_header.jnlbuff_phs2cmt_isprcalv_cntr"
+	Set gtmtypes("shm_snapshot_t",483,"off")=8000
 	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_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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.jnlbuff_phs2cmt_isprcalv_cntr")=483
+	Set gtmtypes("shm_snapshot_t",484,"name")="shm_snapshot_t.shadow_file_header.bg_trc_rec_cntr_filler"
+	Set gtmtypes("shm_snapshot_t",484,"off")=8004
+	Set gtmtypes("shm_snapshot_t",484,"len")=12
+	Set gtmtypes("shm_snapshot_t",484,"type")="char"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.bg_trc_rec_cntr_filler")=484
+	Set gtmtypes("shm_snapshot_t",485,"name")="shm_snapshot_t.shadow_file_header.n_gvcst_srches"
+	Set gtmtypes("shm_snapshot_t",485,"off")=8016
 	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_gvcst_srches")=485
+	Set gtmtypes("shm_snapshot_t",486,"name")="shm_snapshot_t.shadow_file_header.n_gvcst_srches.curr_count"
+	Set gtmtypes("shm_snapshot_t",486,"off")=8016
 	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_gvcst_srches.curr_count")=486
+	Set gtmtypes("shm_snapshot_t",487,"name")="shm_snapshot_t.shadow_file_header.n_gvcst_srches.cumul_count"
+	Set gtmtypes("shm_snapshot_t",487,"off")=8020
 	Set gtmtypes("shm_snapshot_t",487,"len")=4
 	Set gtmtypes("shm_snapshot_t",487,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_gvcst_srches.cumul_count")=487
+	Set gtmtypes("shm_snapshot_t",488,"name")="shm_snapshot_t.shadow_file_header.n_gvcst_srch_clues"
+	Set gtmtypes("shm_snapshot_t",488,"off")=8024
 	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_gvcst_srch_clues")=488
+	Set gtmtypes("shm_snapshot_t",489,"name")="shm_snapshot_t.shadow_file_header.n_gvcst_srch_clues.curr_count"
+	Set gtmtypes("shm_snapshot_t",489,"off")=8024
 	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_gvcst_srch_clues.curr_count")=489
+	Set gtmtypes("shm_snapshot_t",490,"name")="shm_snapshot_t.shadow_file_header.n_gvcst_srch_clues.cumul_count"
+	Set gtmtypes("shm_snapshot_t",490,"off")=8028
 	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_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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_gvcst_srch_clues.cumul_count")=490
+	Set gtmtypes("shm_snapshot_t",491,"name")="shm_snapshot_t.shadow_file_header.n_clue_used_head"
+	Set gtmtypes("shm_snapshot_t",491,"off")=8032
 	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_clue_used_head")=491
+	Set gtmtypes("shm_snapshot_t",492,"name")="shm_snapshot_t.shadow_file_header.n_clue_used_head.curr_count"
+	Set gtmtypes("shm_snapshot_t",492,"off")=8032
 	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_clue_used_head.curr_count")=492
+	Set gtmtypes("shm_snapshot_t",493,"name")="shm_snapshot_t.shadow_file_header.n_clue_used_head.cumul_count"
+	Set gtmtypes("shm_snapshot_t",493,"off")=8036
 	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_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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_clue_used_head.cumul_count")=493
+	Set gtmtypes("shm_snapshot_t",494,"name")="shm_snapshot_t.shadow_file_header.n_clue_used_same"
+	Set gtmtypes("shm_snapshot_t",494,"off")=8040
 	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_clue_used_same")=494
+	Set gtmtypes("shm_snapshot_t",495,"name")="shm_snapshot_t.shadow_file_header.n_clue_used_same.curr_count"
+	Set gtmtypes("shm_snapshot_t",495,"off")=8040
 	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_clue_used_same.curr_count")=495
+	Set gtmtypes("shm_snapshot_t",496,"name")="shm_snapshot_t.shadow_file_header.n_clue_used_same.cumul_count"
+	Set gtmtypes("shm_snapshot_t",496,"off")=8044
 	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_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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_clue_used_same.cumul_count")=496
+	Set gtmtypes("shm_snapshot_t",497,"name")="shm_snapshot_t.shadow_file_header.n_clue_used_tail"
+	Set gtmtypes("shm_snapshot_t",497,"off")=8048
 	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_clue_used_tail")=497
+	Set gtmtypes("shm_snapshot_t",498,"name")="shm_snapshot_t.shadow_file_header.n_clue_used_tail.curr_count"
+	Set gtmtypes("shm_snapshot_t",498,"off")=8048
 	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_clue_used_tail.curr_count")=498
+	Set gtmtypes("shm_snapshot_t",499,"name")="shm_snapshot_t.shadow_file_header.n_clue_used_tail.cumul_count"
+	Set gtmtypes("shm_snapshot_t",499,"off")=8052
 	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_clue_used_tail.cumul_count")=499
+	Set gtmtypes("shm_snapshot_t",500,"name")="shm_snapshot_t.shadow_file_header.n_t_qreads"
+	Set gtmtypes("shm_snapshot_t",500,"off")=8056
 	Set gtmtypes("shm_snapshot_t",500,"len")=8
 	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_t_qreads")=500
+	Set gtmtypes("shm_snapshot_t",501,"name")="shm_snapshot_t.shadow_file_header.n_t_qreads.curr_count"
+	Set gtmtypes("shm_snapshot_t",501,"off")=8056
 	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_t_qreads.curr_count")=501
+	Set gtmtypes("shm_snapshot_t",502,"name")="shm_snapshot_t.shadow_file_header.n_t_qreads.cumul_count"
+	Set gtmtypes("shm_snapshot_t",502,"off")=8060
 	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_t_qreads.cumul_count")=502
+	Set gtmtypes("shm_snapshot_t",503,"name")="shm_snapshot_t.shadow_file_header.unused_dsk_reads"
+	Set gtmtypes("shm_snapshot_t",503,"off")=8064
 	Set gtmtypes("shm_snapshot_t",503,"len")=8
 	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.unused_dsk_reads")=503
+	Set gtmtypes("shm_snapshot_t",504,"name")="shm_snapshot_t.shadow_file_header.unused_dsk_reads.curr_count"
+	Set gtmtypes("shm_snapshot_t",504,"off")=8064
 	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.unused_dsk_reads.curr_count")=504
+	Set gtmtypes("shm_snapshot_t",505,"name")="shm_snapshot_t.shadow_file_header.unused_dsk_reads.cumul_count"
+	Set gtmtypes("shm_snapshot_t",505,"off")=8068
 	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.unused_dsk_reads.cumul_count")=505
+	Set gtmtypes("shm_snapshot_t",506,"name")="shm_snapshot_t.shadow_file_header.n_bgmm_updates"
+	Set gtmtypes("shm_snapshot_t",506,"off")=8072
 	Set gtmtypes("shm_snapshot_t",506,"len")=8
 	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_bgmm_updates")=506
+	Set gtmtypes("shm_snapshot_t",507,"name")="shm_snapshot_t.shadow_file_header.n_bgmm_updates.curr_count"
+	Set gtmtypes("shm_snapshot_t",507,"off")=8072
 	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_bgmm_updates.curr_count")=507
+	Set gtmtypes("shm_snapshot_t",508,"name")="shm_snapshot_t.shadow_file_header.n_bgmm_updates.cumul_count"
+	Set gtmtypes("shm_snapshot_t",508,"off")=8076
 	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_bgmm_updates.cumul_count")=508
+	Set gtmtypes("shm_snapshot_t",509,"name")="shm_snapshot_t.shadow_file_header.unused_dsk_writes"
+	Set gtmtypes("shm_snapshot_t",509,"off")=8080
 	Set gtmtypes("shm_snapshot_t",509,"len")=8
 	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.unused_dsk_writes")=509
+	Set gtmtypes("shm_snapshot_t",510,"name")="shm_snapshot_t.shadow_file_header.unused_dsk_writes.curr_count"
+	Set gtmtypes("shm_snapshot_t",510,"off")=8080
 	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.unused_dsk_writes.curr_count")=510
+	Set gtmtypes("shm_snapshot_t",511,"name")="shm_snapshot_t.shadow_file_header.unused_dsk_writes.cumul_count"
+	Set gtmtypes("shm_snapshot_t",511,"off")=8084
 	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.unused_dsk_writes.cumul_count")=511
+	Set gtmtypes("shm_snapshot_t",512,"name")="shm_snapshot_t.shadow_file_header.n_bg_update_creates"
+	Set gtmtypes("shm_snapshot_t",512,"off")=8088
 	Set gtmtypes("shm_snapshot_t",512,"len")=8
 	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_bg_update_creates")=512
+	Set gtmtypes("shm_snapshot_t",513,"name")="shm_snapshot_t.shadow_file_header.n_bg_update_creates.curr_count"
+	Set gtmtypes("shm_snapshot_t",513,"off")=8088
 	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_bg_update_creates.curr_count")=513
+	Set gtmtypes("shm_snapshot_t",514,"name")="shm_snapshot_t.shadow_file_header.n_bg_update_creates.cumul_count"
+	Set gtmtypes("shm_snapshot_t",514,"off")=8092
 	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_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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_bg_update_creates.cumul_count")=514
+	Set gtmtypes("shm_snapshot_t",515,"name")="shm_snapshot_t.shadow_file_header.n_db_csh_getns"
+	Set gtmtypes("shm_snapshot_t",515,"off")=8096
+	Set gtmtypes("shm_snapshot_t",515,"len")=8
+	Set gtmtypes("shm_snapshot_t",515,"type")="db_csh_acct_rec"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_db_csh_getns")=515
+	Set gtmtypes("shm_snapshot_t",516,"name")="shm_snapshot_t.shadow_file_header.n_db_csh_getns.curr_count"
+	Set gtmtypes("shm_snapshot_t",516,"off")=8096
+	Set gtmtypes("shm_snapshot_t",516,"len")=4
+	Set gtmtypes("shm_snapshot_t",516,"type")="int"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_db_csh_getns.curr_count")=516
+	Set gtmtypes("shm_snapshot_t",517,"name")="shm_snapshot_t.shadow_file_header.n_db_csh_getns.cumul_count"
+	Set gtmtypes("shm_snapshot_t",517,"off")=8100
+	Set gtmtypes("shm_snapshot_t",517,"len")=4
+	Set gtmtypes("shm_snapshot_t",517,"type")="int"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_db_csh_getns.cumul_count")=517
+	Set gtmtypes("shm_snapshot_t",518,"name")="shm_snapshot_t.shadow_file_header.n_db_csh_getn_lcnt"
+	Set gtmtypes("shm_snapshot_t",518,"off")=8104
 	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_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_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_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_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_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",518,"type")="db_csh_acct_rec"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_db_csh_getn_lcnt")=518
+	Set gtmtypes("shm_snapshot_t",519,"name")="shm_snapshot_t.shadow_file_header.n_db_csh_getn_lcnt.curr_count"
+	Set gtmtypes("shm_snapshot_t",519,"off")=8104
+	Set gtmtypes("shm_snapshot_t",519,"len")=4
+	Set gtmtypes("shm_snapshot_t",519,"type")="int"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_db_csh_getn_lcnt.curr_count")=519
+	Set gtmtypes("shm_snapshot_t",520,"name")="shm_snapshot_t.shadow_file_header.n_db_csh_getn_lcnt.cumul_count"
+	Set gtmtypes("shm_snapshot_t",520,"off")=8108
+	Set gtmtypes("shm_snapshot_t",520,"len")=4
+	Set gtmtypes("shm_snapshot_t",520,"type")="int"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_db_csh_getn_lcnt.cumul_count")=520
+	Set gtmtypes("shm_snapshot_t",521,"name")="shm_snapshot_t.shadow_file_header.db_csh_acct_rec_filler_4k"
+	Set gtmtypes("shm_snapshot_t",521,"off")=8112
+	Set gtmtypes("shm_snapshot_t",521,"len")=152
+	Set gtmtypes("shm_snapshot_t",521,"type")="char"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.db_csh_acct_rec_filler_4k")=521
+	Set gtmtypes("shm_snapshot_t",522,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec"
+	Set gtmtypes("shm_snapshot_t",522,"off")=8264
+	Set gtmtypes("shm_snapshot_t",522,"len")=472
+	Set gtmtypes("shm_snapshot_t",522,"type")="gvstats_rec_t"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec")=522
+	Set gtmtypes("shm_snapshot_t",523,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_set"
+	Set gtmtypes("shm_snapshot_t",523,"off")=8264
 	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_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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_set")=523
+	Set gtmtypes("shm_snapshot_t",524,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_kill"
+	Set gtmtypes("shm_snapshot_t",524,"off")=8272
 	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_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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_kill")=524
+	Set gtmtypes("shm_snapshot_t",525,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_get"
+	Set gtmtypes("shm_snapshot_t",525,"off")=8280
 	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_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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_get")=525
+	Set gtmtypes("shm_snapshot_t",526,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_data"
+	Set gtmtypes("shm_snapshot_t",526,"off")=8288
 	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.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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_data")=526
+	Set gtmtypes("shm_snapshot_t",527,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_order"
+	Set gtmtypes("shm_snapshot_t",527,"off")=8296
 	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_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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_order")=527
+	Set gtmtypes("shm_snapshot_t",528,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_zprev"
+	Set gtmtypes("shm_snapshot_t",528,"off")=8304
 	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_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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_zprev")=528
+	Set gtmtypes("shm_snapshot_t",529,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_query"
+	Set gtmtypes("shm_snapshot_t",529,"off")=8312
 	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_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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_query")=529
+	Set gtmtypes("shm_snapshot_t",530,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_lock_success"
+	Set gtmtypes("shm_snapshot_t",530,"off")=8320
 	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_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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_lock_success")=530
+	Set gtmtypes("shm_snapshot_t",531,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_lock_fail"
+	Set gtmtypes("shm_snapshot_t",531,"off")=8328
 	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_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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_lock_fail")=531
+	Set gtmtypes("shm_snapshot_t",532,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.db_curr_tn"
+	Set gtmtypes("shm_snapshot_t",532,"off")=8336
 	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_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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.db_curr_tn")=532
+	Set gtmtypes("shm_snapshot_t",533,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_dsk_read"
+	Set gtmtypes("shm_snapshot_t",533,"off")=8344
 	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_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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_dsk_read")=533
+	Set gtmtypes("shm_snapshot_t",534,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_dsk_write"
+	Set gtmtypes("shm_snapshot_t",534,"off")=8352
 	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_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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_dsk_write")=534
+	Set gtmtypes("shm_snapshot_t",535,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_nontp_readwrite"
+	Set gtmtypes("shm_snapshot_t",535,"off")=8360
 	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_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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_nontp_readwrite")=535
+	Set gtmtypes("shm_snapshot_t",536,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_nontp_readonly"
+	Set gtmtypes("shm_snapshot_t",536,"off")=8368
 	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_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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_nontp_readonly")=536
+	Set gtmtypes("shm_snapshot_t",537,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_nontp_blkwrite"
+	Set gtmtypes("shm_snapshot_t",537,"off")=8376
 	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_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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_nontp_blkwrite")=537
+	Set gtmtypes("shm_snapshot_t",538,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_nontp_blkread"
+	Set gtmtypes("shm_snapshot_t",538,"off")=8384
 	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_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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_nontp_blkread")=538
+	Set gtmtypes("shm_snapshot_t",539,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_nontp_retries_0"
+	Set gtmtypes("shm_snapshot_t",539,"off")=8392
 	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_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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_nontp_retries_0")=539
+	Set gtmtypes("shm_snapshot_t",540,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_nontp_retries_1"
+	Set gtmtypes("shm_snapshot_t",540,"off")=8400
 	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_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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_nontp_retries_1")=540
+	Set gtmtypes("shm_snapshot_t",541,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_nontp_retries_2"
+	Set gtmtypes("shm_snapshot_t",541,"off")=8408
 	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_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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_nontp_retries_2")=541
+	Set gtmtypes("shm_snapshot_t",542,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_nontp_retries_3"
+	Set gtmtypes("shm_snapshot_t",542,"off")=8416
 	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_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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_nontp_retries_3")=542
+	Set gtmtypes("shm_snapshot_t",543,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_tp_readwrite"
+	Set gtmtypes("shm_snapshot_t",543,"off")=8424
 	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_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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_tp_readwrite")=543
+	Set gtmtypes("shm_snapshot_t",544,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_tp_readonly"
+	Set gtmtypes("shm_snapshot_t",544,"off")=8432
 	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_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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_tp_readonly")=544
+	Set gtmtypes("shm_snapshot_t",545,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_tp_rolledback"
+	Set gtmtypes("shm_snapshot_t",545,"off")=8440
 	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_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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_tp_rolledback")=545
+	Set gtmtypes("shm_snapshot_t",546,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_tp_blkwrite"
+	Set gtmtypes("shm_snapshot_t",546,"off")=8448
 	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_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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_tp_blkwrite")=546
+	Set gtmtypes("shm_snapshot_t",547,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_tp_blkread"
+	Set gtmtypes("shm_snapshot_t",547,"off")=8456
 	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_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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_tp_blkread")=547
+	Set gtmtypes("shm_snapshot_t",548,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_tp_tot_retries_0"
+	Set gtmtypes("shm_snapshot_t",548,"off")=8464
 	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_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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_tp_tot_retries_0")=548
+	Set gtmtypes("shm_snapshot_t",549,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_tp_tot_retries_1"
+	Set gtmtypes("shm_snapshot_t",549,"off")=8472
 	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_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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_tp_tot_retries_1")=549
+	Set gtmtypes("shm_snapshot_t",550,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_tp_tot_retries_2"
+	Set gtmtypes("shm_snapshot_t",550,"off")=8480
 	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_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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_tp_tot_retries_2")=550
+	Set gtmtypes("shm_snapshot_t",551,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_tp_tot_retries_3"
+	Set gtmtypes("shm_snapshot_t",551,"off")=8488
 	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_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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_tp_tot_retries_3")=551
+	Set gtmtypes("shm_snapshot_t",552,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_tp_tot_retries_4"
+	Set gtmtypes("shm_snapshot_t",552,"off")=8496
 	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.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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_tp_tot_retries_4")=552
+	Set gtmtypes("shm_snapshot_t",553,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_tp_cnflct_retries_0"
+	Set gtmtypes("shm_snapshot_t",553,"off")=8504
 	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_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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_tp_cnflct_retries_0")=553
+	Set gtmtypes("shm_snapshot_t",554,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_tp_cnflct_retries_1"
+	Set gtmtypes("shm_snapshot_t",554,"off")=8512
 	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.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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_tp_cnflct_retries_1")=554
+	Set gtmtypes("shm_snapshot_t",555,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_tp_cnflct_retries_2"
+	Set gtmtypes("shm_snapshot_t",555,"off")=8520
 	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_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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_tp_cnflct_retries_2")=555
+	Set gtmtypes("shm_snapshot_t",556,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_tp_cnflct_retries_3"
+	Set gtmtypes("shm_snapshot_t",556,"off")=8528
 	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.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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_tp_cnflct_retries_3")=556
+	Set gtmtypes("shm_snapshot_t",557,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_tp_cnflct_retries_4"
+	Set gtmtypes("shm_snapshot_t",557,"off")=8536
 	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_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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_tp_cnflct_retries_4")=557
+	Set gtmtypes("shm_snapshot_t",558,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_ztrigger"
+	Set gtmtypes("shm_snapshot_t",558,"off")=8544
 	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_ztrigger")=558
+	Set gtmtypes("shm_snapshot_t",559,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_db_flush"
+	Set gtmtypes("shm_snapshot_t",559,"off")=8552
 	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_db_flush")=559
+	Set gtmtypes("shm_snapshot_t",560,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_db_fsync"
+	Set gtmtypes("shm_snapshot_t",560,"off")=8560
 	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.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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_db_fsync")=560
+	Set gtmtypes("shm_snapshot_t",561,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_jnl_flush"
+	Set gtmtypes("shm_snapshot_t",561,"off")=8568
 	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_jnl_flush")=561
+	Set gtmtypes("shm_snapshot_t",562,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_jnl_fsync"
+	Set gtmtypes("shm_snapshot_t",562,"off")=8576
 	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_jnl_fsync")=562
+	Set gtmtypes("shm_snapshot_t",563,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_jbuff_bytes"
+	Set gtmtypes("shm_snapshot_t",563,"off")=8584
 	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_jbuff_bytes")=563
+	Set gtmtypes("shm_snapshot_t",564,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_jfile_bytes"
+	Set gtmtypes("shm_snapshot_t",564,"off")=8592
 	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_jfile_bytes")=564
+	Set gtmtypes("shm_snapshot_t",565,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_jfile_writes"
+	Set gtmtypes("shm_snapshot_t",565,"off")=8600
 	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_jfile_writes")=565
+	Set gtmtypes("shm_snapshot_t",566,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_jrec_logical"
+	Set gtmtypes("shm_snapshot_t",566,"off")=8608
 	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_jrec_logical")=566
+	Set gtmtypes("shm_snapshot_t",567,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_jrec_pblk"
+	Set gtmtypes("shm_snapshot_t",567,"off")=8616
 	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_jrec_pblk")=567
+	Set gtmtypes("shm_snapshot_t",568,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_jrec_epoch_regular"
+	Set gtmtypes("shm_snapshot_t",568,"off")=8624
 	Set gtmtypes("shm_snapshot_t",568,"len")=8
 	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_jrec_epoch_regular")=568
+	Set gtmtypes("shm_snapshot_t",569,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_jrec_epoch_idle"
+	Set gtmtypes("shm_snapshot_t",569,"off")=8632
 	Set gtmtypes("shm_snapshot_t",569,"len")=8
 	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_jrec_epoch_idle")=569
+	Set gtmtypes("shm_snapshot_t",570,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_jrec_other"
+	Set gtmtypes("shm_snapshot_t",570,"off")=8640
 	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.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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_jrec_other")=570
+	Set gtmtypes("shm_snapshot_t",571,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_jnl_extends"
+	Set gtmtypes("shm_snapshot_t",571,"off")=8648
 	Set gtmtypes("shm_snapshot_t",571,"len")=8
 	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_jnl_extends")=571
+	Set gtmtypes("shm_snapshot_t",572,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_db_extends"
+	Set gtmtypes("shm_snapshot_t",572,"off")=8656
 	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_db_extends")=572
+	Set gtmtypes("shm_snapshot_t",573,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_crit_success"
+	Set gtmtypes("shm_snapshot_t",573,"off")=8664
 	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_crit_success")=573
+	Set gtmtypes("shm_snapshot_t",574,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_crits_in_epch"
+	Set gtmtypes("shm_snapshot_t",574,"off")=8672
 	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_crits_in_epch")=574
+	Set gtmtypes("shm_snapshot_t",575,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.sq_crit_failed"
+	Set gtmtypes("shm_snapshot_t",575,"off")=8680
 	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.sq_crit_failed")=575
+	Set gtmtypes("shm_snapshot_t",576,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_crit_failed"
+	Set gtmtypes("shm_snapshot_t",576,"off")=8688
+	Set gtmtypes("shm_snapshot_t",576,"len")=8
+	Set gtmtypes("shm_snapshot_t",576,"type")="uint64_t"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_crit_failed")=576
+	Set gtmtypes("shm_snapshot_t",577,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.sq_crit_que_slps"
+	Set gtmtypes("shm_snapshot_t",577,"off")=8696
+	Set gtmtypes("shm_snapshot_t",577,"len")=8
+	Set gtmtypes("shm_snapshot_t",577,"type")="uint64_t"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.sq_crit_que_slps")=577
+	Set gtmtypes("shm_snapshot_t",578,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_crit_que_slps"
+	Set gtmtypes("shm_snapshot_t",578,"off")=8704
+	Set gtmtypes("shm_snapshot_t",578,"len")=8
 	Set gtmtypes("shm_snapshot_t",578,"type")="uint64_t"
-	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.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")="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")="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")="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")="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")="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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_crit_que_slps")=578
+	Set gtmtypes("shm_snapshot_t",579,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.sq_crit_yields"
+	Set gtmtypes("shm_snapshot_t",579,"off")=8712
+	Set gtmtypes("shm_snapshot_t",579,"len")=8
+	Set gtmtypes("shm_snapshot_t",579,"type")="uint64_t"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.sq_crit_yields")=579
+	Set gtmtypes("shm_snapshot_t",580,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_crit_yields"
+	Set gtmtypes("shm_snapshot_t",580,"off")=8720
+	Set gtmtypes("shm_snapshot_t",580,"len")=8
+	Set gtmtypes("shm_snapshot_t",580,"type")="uint64_t"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_crit_yields")=580
+	Set gtmtypes("shm_snapshot_t",581,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_clean2dirty"
+	Set gtmtypes("shm_snapshot_t",581,"off")=8728
+	Set gtmtypes("shm_snapshot_t",581,"len")=8
+	Set gtmtypes("shm_snapshot_t",581,"type")="uint64_t"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_clean2dirty")=581
+	Set gtmtypes("shm_snapshot_t",582,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec_filler_4k_plus_512"
+	Set gtmtypes("shm_snapshot_t",582,"off")=8736
+	Set gtmtypes("shm_snapshot_t",582,"len")=40
+	Set gtmtypes("shm_snapshot_t",582,"type")="char"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec_filler_4k_plus_512")=582
+	Set gtmtypes("shm_snapshot_t",583,"name")="shm_snapshot_t.shadow_file_header.filler_4k_plus_512"
+	Set gtmtypes("shm_snapshot_t",583,"off")=8776
+	Set gtmtypes("shm_snapshot_t",583,"len")=368
+	Set gtmtypes("shm_snapshot_t",583,"type")="char"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.filler_4k_plus_512")=583
+	Set gtmtypes("shm_snapshot_t",584,"name")="shm_snapshot_t.shadow_file_header.intrpt_recov_resync_strm_seqno"
+	Set gtmtypes("shm_snapshot_t",584,"off")=9144
+	Set gtmtypes("shm_snapshot_t",584,"len")=128
+	Set gtmtypes("shm_snapshot_t",584,"type")="uint64_t"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.intrpt_recov_resync_strm_seqno")=584
+	Set gtmtypes("shm_snapshot_t",584,"dim")=16
+	Set gtmtypes("shm_snapshot_t",585,"name")="shm_snapshot_t.shadow_file_header.creation_db_ver"
+	Set gtmtypes("shm_snapshot_t",585,"off")=9272
+	Set gtmtypes("shm_snapshot_t",585,"len")=4
+	Set gtmtypes("shm_snapshot_t",585,"type")="int"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.creation_db_ver")=585
+	Set gtmtypes("shm_snapshot_t",586,"name")="shm_snapshot_t.shadow_file_header.creation_mdb_ver"
+	Set gtmtypes("shm_snapshot_t",586,"off")=9276
+	Set gtmtypes("shm_snapshot_t",586,"len")=4
+	Set gtmtypes("shm_snapshot_t",586,"type")="int"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.creation_mdb_ver")=586
+	Set gtmtypes("shm_snapshot_t",587,"name")="shm_snapshot_t.shadow_file_header.certified_for_upgrade_to"
+	Set gtmtypes("shm_snapshot_t",587,"off")=9280
+	Set gtmtypes("shm_snapshot_t",587,"len")=4
+	Set gtmtypes("shm_snapshot_t",587,"type")="int"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.certified_for_upgrade_to")=587
+	Set gtmtypes("shm_snapshot_t",588,"name")="shm_snapshot_t.shadow_file_header.filler_5k"
+	Set gtmtypes("shm_snapshot_t",588,"off")=9284
+	Set gtmtypes("shm_snapshot_t",588,"len")=4
+	Set gtmtypes("shm_snapshot_t",588,"type")="int"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.filler_5k")=588
+	Set gtmtypes("shm_snapshot_t",589,"name")="shm_snapshot_t.shadow_file_header.secshr_ops_index_filler"
+	Set gtmtypes("shm_snapshot_t",589,"off")=9288
+	Set gtmtypes("shm_snapshot_t",589,"len")=4
+	Set gtmtypes("shm_snapshot_t",589,"type")="int"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.secshr_ops_index_filler")=589
+	Set gtmtypes("shm_snapshot_t",590,"name")="shm_snapshot_t.shadow_file_header.secshr_ops_array_filler"
+	Set gtmtypes("shm_snapshot_t",590,"off")=9292
+	Set gtmtypes("shm_snapshot_t",590,"len")=1020
 	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.secshr_ops_array_filler")=590
+	Set gtmtypes("shm_snapshot_t",590,"dim")=255
+	Set gtmtypes("shm_snapshot_t",591,"name")="shm_snapshot_t.shadow_file_header.next_upgrd_warn"
+	Set gtmtypes("shm_snapshot_t",591,"off")=10312
+	Set gtmtypes("shm_snapshot_t",591,"len")=24
+	Set gtmtypes("shm_snapshot_t",591,"type")="compswap_time_field"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.next_upgrd_warn")=591
+	Set gtmtypes("shm_snapshot_t",592,"name")="shm_snapshot_t.shadow_file_header.next_upgrd_warn.time_latch"
+	Set gtmtypes("shm_snapshot_t",592,"off")=10312
+	Set gtmtypes("shm_snapshot_t",592,"len")=8
+	Set gtmtypes("shm_snapshot_t",592,"type")="global_latch_t"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.next_upgrd_warn.time_latch")=592
+	Set gtmtypes("shm_snapshot_t",593,"name")="shm_snapshot_t.shadow_file_header.next_upgrd_warn.time_latch.u"
+	Set gtmtypes("shm_snapshot_t",593,"off")=10312
+	Set gtmtypes("shm_snapshot_t",593,"len")=8
+	Set gtmtypes("shm_snapshot_t",593,"type")="union"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.next_upgrd_warn.time_latch.u")=593
+	Set gtmtypes("shm_snapshot_t",594,"name")="shm_snapshot_t.shadow_file_header.next_upgrd_warn.time_latch.u.pid_imgcnt"
+	Set gtmtypes("shm_snapshot_t",594,"off")=10312
+	Set gtmtypes("shm_snapshot_t",594,"len")=8
+	Set gtmtypes("shm_snapshot_t",594,"type")="uint64_t"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.next_upgrd_warn.time_latch.u.pid_imgcnt")=594
+	Set gtmtypes("shm_snapshot_t",595,"name")="shm_snapshot_t.shadow_file_header.next_upgrd_warn.time_latch.u.parts"
+	Set gtmtypes("shm_snapshot_t",595,"off")=10312
+	Set gtmtypes("shm_snapshot_t",595,"len")=8
+	Set gtmtypes("shm_snapshot_t",595,"type")="struct"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.next_upgrd_warn.time_latch.u.parts")=595
+	Set gtmtypes("shm_snapshot_t",596,"name")="shm_snapshot_t.shadow_file_header.next_upgrd_warn.time_latch.u.parts.latch_pid"
+	Set gtmtypes("shm_snapshot_t",596,"off")=10312
+	Set gtmtypes("shm_snapshot_t",596,"len")=4
+	Set gtmtypes("shm_snapshot_t",596,"type")="int"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.next_upgrd_warn.time_latch.u.parts.latch_pid")=596
+	Set gtmtypes("shm_snapshot_t",597,"name")="shm_snapshot_t.shadow_file_header.next_upgrd_warn.time_latch.u.parts.latch_word"
+	Set gtmtypes("shm_snapshot_t",597,"off")=10316
 	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",597,"type")="int"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.next_upgrd_warn.time_latch.u.parts.latch_word")=597
+	Set gtmtypes("shm_snapshot_t",598,"name")="shm_snapshot_t.shadow_file_header.next_upgrd_warn.hp_latch_space"
+	Set gtmtypes("shm_snapshot_t",598,"off")=10320
+	Set gtmtypes("shm_snapshot_t",598,"len")=16
+	Set gtmtypes("shm_snapshot_t",598,"type")="int"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.next_upgrd_warn.hp_latch_space")=598
+	Set gtmtypes("shm_snapshot_t",598,"dim")=4
+	Set gtmtypes("shm_snapshot_t",599,"name")="shm_snapshot_t.shadow_file_header.is_encrypted"
+	Set gtmtypes("shm_snapshot_t",599,"off")=10336
 	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",599,"type")="unsigned-int"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.is_encrypted")=599
+	Set gtmtypes("shm_snapshot_t",600,"name")="shm_snapshot_t.shadow_file_header.db_trigger_cycle"
+	Set gtmtypes("shm_snapshot_t",600,"off")=10340
 	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",600,"type")="unsigned-int"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.db_trigger_cycle")=600
+	Set gtmtypes("shm_snapshot_t",601,"name")="shm_snapshot_t.shadow_file_header.strm_reg_seqno"
+	Set gtmtypes("shm_snapshot_t",601,"off")=10344
+	Set gtmtypes("shm_snapshot_t",601,"len")=128
+	Set gtmtypes("shm_snapshot_t",601,"type")="uint64_t"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.strm_reg_seqno")=601
+	Set gtmtypes("shm_snapshot_t",601,"dim")=16
+	Set gtmtypes("shm_snapshot_t",602,"name")="shm_snapshot_t.shadow_file_header.save_strm_reg_seqno"
+	Set gtmtypes("shm_snapshot_t",602,"off")=10472
+	Set gtmtypes("shm_snapshot_t",602,"len")=128
+	Set gtmtypes("shm_snapshot_t",602,"type")="uint64_t"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.save_strm_reg_seqno")=602
+	Set gtmtypes("shm_snapshot_t",602,"dim")=16
+	Set gtmtypes("shm_snapshot_t",603,"name")="shm_snapshot_t.shadow_file_header.freeze_on_fail"
+	Set gtmtypes("shm_snapshot_t",603,"off")=10600
 	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.freeze_on_fail")=603
+	Set gtmtypes("shm_snapshot_t",604,"name")="shm_snapshot_t.shadow_file_header.span_node_absent"
+	Set gtmtypes("shm_snapshot_t",604,"off")=10604
 	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.span_node_absent")=604
+	Set gtmtypes("shm_snapshot_t",605,"name")="shm_snapshot_t.shadow_file_header.maxkeysz_assured"
+	Set gtmtypes("shm_snapshot_t",605,"off")=10608
 	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("shm_snapshot_t",605,"type")="boolean_t"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.maxkeysz_assured")=605
+	Set gtmtypes("shm_snapshot_t",606,"name")="shm_snapshot_t.shadow_file_header.hasht_upgrade_needed"
+	Set gtmtypes("shm_snapshot_t",606,"off")=10612
+	Set gtmtypes("shm_snapshot_t",606,"len")=4
+	Set gtmtypes("shm_snapshot_t",606,"type")="boolean_t"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.hasht_upgrade_needed")=606
+	Set gtmtypes("shm_snapshot_t",607,"name")="shm_snapshot_t.shadow_file_header.defer_allocate"
+	Set gtmtypes("shm_snapshot_t",607,"off")=10616
+	Set gtmtypes("shm_snapshot_t",607,"len")=4
+	Set gtmtypes("shm_snapshot_t",607,"type")="boolean_t"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.defer_allocate")=607
+	Set gtmtypes("shm_snapshot_t",608,"name")="shm_snapshot_t.shadow_file_header.filler_ftok_counter_halted"
+	Set gtmtypes("shm_snapshot_t",608,"off")=10620
+	Set gtmtypes("shm_snapshot_t",608,"len")=4
+	Set gtmtypes("shm_snapshot_t",608,"type")="boolean_t"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.filler_ftok_counter_halted")=608
+	Set gtmtypes("shm_snapshot_t",609,"name")="shm_snapshot_t.shadow_file_header.filler_access_counter_halted"
+	Set gtmtypes("shm_snapshot_t",609,"off")=10624
+	Set gtmtypes("shm_snapshot_t",609,"len")=4
+	Set gtmtypes("shm_snapshot_t",609,"type")="boolean_t"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.filler_access_counter_halted")=609
+	Set gtmtypes("shm_snapshot_t",610,"name")="shm_snapshot_t.shadow_file_header.lock_crit_with_db"
+	Set gtmtypes("shm_snapshot_t",610,"off")=10628
+	Set gtmtypes("shm_snapshot_t",610,"len")=4
+	Set gtmtypes("shm_snapshot_t",610,"type")="boolean_t"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.lock_crit_with_db")=610
+	Set gtmtypes("shm_snapshot_t",611,"name")="shm_snapshot_t.shadow_file_header.basedb_fname_len"
+	Set gtmtypes("shm_snapshot_t",611,"off")=10632
+	Set gtmtypes("shm_snapshot_t",611,"len")=4
+	Set gtmtypes("shm_snapshot_t",611,"type")="unsigned-int"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.basedb_fname_len")=611
+	Set gtmtypes("shm_snapshot_t",612,"name")="shm_snapshot_t.shadow_file_header.basedb_fname"
+	Set gtmtypes("shm_snapshot_t",612,"off")=10636
+	Set gtmtypes("shm_snapshot_t",612,"len")=256
+	Set gtmtypes("shm_snapshot_t",612,"type")="unsigned-char"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.basedb_fname")=612
+	Set gtmtypes("shm_snapshot_t",613,"name")="shm_snapshot_t.shadow_file_header.filler_7k"
+	Set gtmtypes("shm_snapshot_t",613,"off")=10892
+	Set gtmtypes("shm_snapshot_t",613,"len")=444
+	Set gtmtypes("shm_snapshot_t",613,"type")="char"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.filler_7k")=613
+	Set gtmtypes("shm_snapshot_t",614,"name")="shm_snapshot_t.shadow_file_header.filler_8k"
+	Set gtmtypes("shm_snapshot_t",614,"off")=11336
+	Set gtmtypes("shm_snapshot_t",614,"len")=1024
+	Set gtmtypes("shm_snapshot_t",614,"type")="char"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.filler_8k")=614
 	;
 	Set gtmtypes("shmpool_blk_hdr")="struct"
 	Set gtmtypes("shmpool_blk_hdr",0)=11
@@ -33186,7 +34200,7 @@ Init
 	Set gtmtypfldindx("shmpool_blk_hdr","image_count")=11
 	;
 	Set gtmtypes("shmpool_buff_hdr")="struct"
-	Set gtmtypes("shmpool_buff_hdr",0)=615
+	Set gtmtypes("shmpool_buff_hdr",0)=621
 	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
@@ -34214,11 +35228,11 @@ Init
 	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.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,"name")="shmpool_buff_hdr.shadow_file_header.wcb_gds_rundown2_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_bgtrcrec1_tn")=204
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_gds_rundown2_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
@@ -34509,11 +35523,11 @@ Init
 	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_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,"name")="shmpool_buff_hdr.shadow_file_header.wcb_wcs_flu0_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_tp_grab_crit_tn")=263
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_wcs_flu0_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
@@ -34534,11 +35548,11 @@ Init
 	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_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,"name")="shmpool_buff_hdr.shadow_file_header.wcb_gds_rundown1_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_gds_rundown_tn")=268
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_gds_rundown1_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
@@ -34894,1391 +35908,1421 @@ Init
 	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,"name")="shmpool_buff_hdr.shadow_file_header.jnlbuff_phs2cmt_array_full_tn"
 	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.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.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.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",340,"len")=8
+	Set gtmtypes("shmpool_buff_hdr",340,"type")="uint64_t"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.jnlbuff_phs2cmt_array_full_tn")=340
+	Set gtmtypes("shmpool_buff_hdr",341,"name")="shmpool_buff_hdr.shadow_file_header.jnl_phase2_cleanup_if_possible_tn"
+	Set gtmtypes("shmpool_buff_hdr",341,"off")=3560
+	Set gtmtypes("shmpool_buff_hdr",341,"len")=8
+	Set gtmtypes("shmpool_buff_hdr",341,"type")="uint64_t"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.jnl_phase2_cleanup_if_possible_tn")=341
+	Set gtmtypes("shmpool_buff_hdr",342,"name")="shmpool_buff_hdr.shadow_file_header.jnlbuff_phs2cmt_isprcalv_tn"
+	Set gtmtypes("shmpool_buff_hdr",342,"off")=3568
+	Set gtmtypes("shmpool_buff_hdr",342,"len")=8
+	Set gtmtypes("shmpool_buff_hdr",342,"type")="uint64_t"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.jnlbuff_phs2cmt_isprcalv_tn")=342
+	Set gtmtypes("shmpool_buff_hdr",343,"name")="shmpool_buff_hdr.shadow_file_header.bg_trc_rec_tn_filler"
+	Set gtmtypes("shmpool_buff_hdr",343,"off")=3576
+	Set gtmtypes("shmpool_buff_hdr",343,"len")=24
+	Set gtmtypes("shmpool_buff_hdr",343,"type")="char"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.bg_trc_rec_tn_filler")=343
+	Set gtmtypes("shmpool_buff_hdr",344,"name")="shmpool_buff_hdr.shadow_file_header.total_buffer_flush_cntr"
+	Set gtmtypes("shmpool_buff_hdr",344,"off")=3600
 	Set gtmtypes("shmpool_buff_hdr",344,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",344,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.total_buffer_flush_cntr")=344
+	Set gtmtypes("shmpool_buff_hdr",345,"name")="shmpool_buff_hdr.shadow_file_header.bufct_buffer_flush_cntr"
+	Set gtmtypes("shmpool_buff_hdr",345,"off")=3604
 	Set gtmtypes("shmpool_buff_hdr",345,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",345,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.bufct_buffer_flush_cntr")=345
+	Set gtmtypes("shmpool_buff_hdr",346,"name")="shmpool_buff_hdr.shadow_file_header.bufct_buffer_flush_loop_cntr"
+	Set gtmtypes("shmpool_buff_hdr",346,"off")=3608
 	Set gtmtypes("shmpool_buff_hdr",346,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",346,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.bufct_buffer_flush_loop_cntr")=346
+	Set gtmtypes("shmpool_buff_hdr",347,"name")="shmpool_buff_hdr.shadow_file_header.wrt_calls_cntr"
+	Set gtmtypes("shmpool_buff_hdr",347,"off")=3612
 	Set gtmtypes("shmpool_buff_hdr",347,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",347,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wrt_calls_cntr")=347
+	Set gtmtypes("shmpool_buff_hdr",348,"name")="shmpool_buff_hdr.shadow_file_header.wrt_count_cntr"
+	Set gtmtypes("shmpool_buff_hdr",348,"off")=3616
 	Set gtmtypes("shmpool_buff_hdr",348,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",348,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wrt_count_cntr")=348
+	Set gtmtypes("shmpool_buff_hdr",349,"name")="shmpool_buff_hdr.shadow_file_header.wrt_blocked_cntr"
+	Set gtmtypes("shmpool_buff_hdr",349,"off")=3620
 	Set gtmtypes("shmpool_buff_hdr",349,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",349,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wrt_blocked_cntr")=349
+	Set gtmtypes("shmpool_buff_hdr",350,"name")="shmpool_buff_hdr.shadow_file_header.wrt_busy_cntr"
+	Set gtmtypes("shmpool_buff_hdr",350,"off")=3624
 	Set gtmtypes("shmpool_buff_hdr",350,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",350,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wrt_busy_cntr")=350
+	Set gtmtypes("shmpool_buff_hdr",351,"name")="shmpool_buff_hdr.shadow_file_header.wrt_noblks_wrtn_cntr"
+	Set gtmtypes("shmpool_buff_hdr",351,"off")=3628
 	Set gtmtypes("shmpool_buff_hdr",351,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",351,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wrt_noblks_wrtn_cntr")=351
+	Set gtmtypes("shmpool_buff_hdr",352,"name")="shmpool_buff_hdr.shadow_file_header.wcb_gds_rundown2_cntr"
+	Set gtmtypes("shmpool_buff_hdr",352,"off")=3632
 	Set gtmtypes("shmpool_buff_hdr",352,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",352,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_gds_rundown2_cntr")=352
+	Set gtmtypes("shmpool_buff_hdr",353,"name")="shmpool_buff_hdr.shadow_file_header.reserved_bgtrcrec2_cntr"
+	Set gtmtypes("shmpool_buff_hdr",353,"off")=3636
 	Set gtmtypes("shmpool_buff_hdr",353,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",353,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.reserved_bgtrcrec2_cntr")=353
+	Set gtmtypes("shmpool_buff_hdr",354,"name")="shmpool_buff_hdr.shadow_file_header.reserved_bgtrcrec3_cntr"
+	Set gtmtypes("shmpool_buff_hdr",354,"off")=3640
 	Set gtmtypes("shmpool_buff_hdr",354,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",354,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.reserved_bgtrcrec3_cntr")=354
+	Set gtmtypes("shmpool_buff_hdr",355,"name")="shmpool_buff_hdr.shadow_file_header.lost_block_recovery_cntr"
+	Set gtmtypes("shmpool_buff_hdr",355,"off")=3644
 	Set gtmtypes("shmpool_buff_hdr",355,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",355,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.lost_block_recovery_cntr")=355
+	Set gtmtypes("shmpool_buff_hdr",356,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_onln_rlbk_cntr"
+	Set gtmtypes("shmpool_buff_hdr",356,"off")=3648
 	Set gtmtypes("shmpool_buff_hdr",356,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",356,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_onln_rlbk_cntr")=356
+	Set gtmtypes("shmpool_buff_hdr",357,"name")="shmpool_buff_hdr.shadow_file_header.stale_cntr"
+	Set gtmtypes("shmpool_buff_hdr",357,"off")=3652
 	Set gtmtypes("shmpool_buff_hdr",357,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",357,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.stale_cntr")=357
+	Set gtmtypes("shmpool_buff_hdr",358,"name")="shmpool_buff_hdr.shadow_file_header.starved_cntr"
+	Set gtmtypes("shmpool_buff_hdr",358,"off")=3656
 	Set gtmtypes("shmpool_buff_hdr",358,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",358,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.starved_cntr")=358
+	Set gtmtypes("shmpool_buff_hdr",359,"name")="shmpool_buff_hdr.shadow_file_header.stale_timer_started_cntr"
+	Set gtmtypes("shmpool_buff_hdr",359,"off")=3660
 	Set gtmtypes("shmpool_buff_hdr",359,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",359,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.stale_timer_started_cntr")=359
+	Set gtmtypes("shmpool_buff_hdr",360,"name")="shmpool_buff_hdr.shadow_file_header.stale_timer_pop_cntr"
+	Set gtmtypes("shmpool_buff_hdr",360,"off")=3664
 	Set gtmtypes("shmpool_buff_hdr",360,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",360,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.stale_timer_pop_cntr")=360
+	Set gtmtypes("shmpool_buff_hdr",361,"name")="shmpool_buff_hdr.shadow_file_header.stale_process_defer_cntr"
+	Set gtmtypes("shmpool_buff_hdr",361,"off")=3668
 	Set gtmtypes("shmpool_buff_hdr",361,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",361,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.stale_process_defer_cntr")=361
+	Set gtmtypes("shmpool_buff_hdr",362,"name")="shmpool_buff_hdr.shadow_file_header.stale_defer_processed_cntr"
+	Set gtmtypes("shmpool_buff_hdr",362,"off")=3672
 	Set gtmtypes("shmpool_buff_hdr",362,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",362,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.stale_defer_processed_cntr")=362
+	Set gtmtypes("shmpool_buff_hdr",363,"name")="shmpool_buff_hdr.shadow_file_header.spcfc_buffer_flush_cntr"
+	Set gtmtypes("shmpool_buff_hdr",363,"off")=3676
 	Set gtmtypes("shmpool_buff_hdr",363,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",363,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.spcfc_buffer_flush_cntr")=363
+	Set gtmtypes("shmpool_buff_hdr",364,"name")="shmpool_buff_hdr.shadow_file_header.spcfc_buffer_flush_loop_cntr"
+	Set gtmtypes("shmpool_buff_hdr",364,"off")=3680
 	Set gtmtypes("shmpool_buff_hdr",364,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",364,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.spcfc_buffer_flush_loop_cntr")=364
+	Set gtmtypes("shmpool_buff_hdr",365,"name")="shmpool_buff_hdr.shadow_file_header.spcfc_buffer_flush_retries_cntr"
+	Set gtmtypes("shmpool_buff_hdr",365,"off")=3684
 	Set gtmtypes("shmpool_buff_hdr",365,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",365,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.spcfc_buffer_flush_retries_cntr")=365
+	Set gtmtypes("shmpool_buff_hdr",366,"name")="shmpool_buff_hdr.shadow_file_header.spcfc_buffer_flushed_during_lockwait_cntr"
+	Set gtmtypes("shmpool_buff_hdr",366,"off")=3688
 	Set gtmtypes("shmpool_buff_hdr",366,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",366,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.spcfc_buffer_flushed_during_lockwait_cntr")=366
+	Set gtmtypes("shmpool_buff_hdr",367,"name")="shmpool_buff_hdr.shadow_file_header.tp_crit_retries_cntr"
+	Set gtmtypes("shmpool_buff_hdr",367,"off")=3692
 	Set gtmtypes("shmpool_buff_hdr",367,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",367,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.tp_crit_retries_cntr")=367
+	Set gtmtypes("shmpool_buff_hdr",368,"name")="shmpool_buff_hdr.shadow_file_header.db_csh_getn_flush_dirty_cntr"
+	Set gtmtypes("shmpool_buff_hdr",368,"off")=3696
 	Set gtmtypes("shmpool_buff_hdr",368,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",368,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.db_csh_getn_flush_dirty_cntr")=368
+	Set gtmtypes("shmpool_buff_hdr",369,"name")="shmpool_buff_hdr.shadow_file_header.db_csh_getn_rip_wait_cntr"
+	Set gtmtypes("shmpool_buff_hdr",369,"off")=3700
 	Set gtmtypes("shmpool_buff_hdr",369,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",369,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.db_csh_getn_rip_wait_cntr")=369
+	Set gtmtypes("shmpool_buff_hdr",370,"name")="shmpool_buff_hdr.shadow_file_header.db_csh_getn_buf_owner_stuck_cntr"
+	Set gtmtypes("shmpool_buff_hdr",370,"off")=3704
 	Set gtmtypes("shmpool_buff_hdr",370,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",370,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.db_csh_getn_buf_owner_stuck_cntr")=370
+	Set gtmtypes("shmpool_buff_hdr",371,"name")="shmpool_buff_hdr.shadow_file_header.db_csh_getn_out_of_design_cntr"
+	Set gtmtypes("shmpool_buff_hdr",371,"off")=3708
 	Set gtmtypes("shmpool_buff_hdr",371,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",371,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.db_csh_getn_out_of_design_cntr")=371
+	Set gtmtypes("shmpool_buff_hdr",372,"name")="shmpool_buff_hdr.shadow_file_header.t_qread_buf_owner_stuck_cntr"
+	Set gtmtypes("shmpool_buff_hdr",372,"off")=3712
 	Set gtmtypes("shmpool_buff_hdr",372,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",372,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.t_qread_buf_owner_stuck_cntr")=372
+	Set gtmtypes("shmpool_buff_hdr",373,"name")="shmpool_buff_hdr.shadow_file_header.t_qread_out_of_design_cntr"
+	Set gtmtypes("shmpool_buff_hdr",373,"off")=3716
 	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_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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.t_qread_out_of_design_cntr")=373
+	Set gtmtypes("shmpool_buff_hdr",374,"name")="shmpool_buff_hdr.shadow_file_header.bt_put_flush_dirty_cntr"
+	Set gtmtypes("shmpool_buff_hdr",374,"off")=3720
 	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_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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.bt_put_flush_dirty_cntr")=374
+	Set gtmtypes("shmpool_buff_hdr",375,"name")="shmpool_buff_hdr.shadow_file_header.mlock_wakeups_cntr"
+	Set gtmtypes("shmpool_buff_hdr",375,"off")=3724
 	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_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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.mlock_wakeups_cntr")=375
+	Set gtmtypes("shmpool_buff_hdr",376,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_wcs_recover_invoked_cntr"
+	Set gtmtypes("shmpool_buff_hdr",376,"off")=3728
 	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_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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_wcs_recover_invoked_cntr")=376
+	Set gtmtypes("shmpool_buff_hdr",377,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_wcs_verify_passed_cntr"
+	Set gtmtypes("shmpool_buff_hdr",377,"off")=3732
 	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_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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_wcs_verify_passed_cntr")=377
+	Set gtmtypes("shmpool_buff_hdr",378,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_t_qread_db_csh_getn_invalid_blk_cntr"
+	Set gtmtypes("shmpool_buff_hdr",378,"off")=3736
 	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_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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_t_qread_db_csh_getn_invalid_blk_cntr")=378
+	Set gtmtypes("shmpool_buff_hdr",379,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_t_qread_db_csh_get_invalid_blk_cntr"
+	Set gtmtypes("shmpool_buff_hdr",379,"off")=3740
 	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_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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_t_qread_db_csh_get_invalid_blk_cntr")=379
+	Set gtmtypes("shmpool_buff_hdr",380,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_db_csh_getn_loopexceed_cntr"
+	Set gtmtypes("shmpool_buff_hdr",380,"off")=3744
 	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_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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_db_csh_getn_loopexceed_cntr")=380
+	Set gtmtypes("shmpool_buff_hdr",381,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_db_csh_getn_wcsstarvewrt_cntr"
+	Set gtmtypes("shmpool_buff_hdr",381,"off")=3748
 	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_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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_db_csh_getn_wcsstarvewrt_cntr")=381
+	Set gtmtypes("shmpool_buff_hdr",382,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_db_csh_get_cntr"
+	Set gtmtypes("shmpool_buff_hdr",382,"off")=3752
 	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_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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_db_csh_get_cntr")=382
+	Set gtmtypes("shmpool_buff_hdr",383,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_tp_tend_wcsgetspace_cntr"
+	Set gtmtypes("shmpool_buff_hdr",383,"off")=3756
 	Set gtmtypes("shmpool_buff_hdr",383,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",383,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_tp_tend_wcsgetspace_cntr")=383
+	Set gtmtypes("shmpool_buff_hdr",384,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_tp_tend_t1_cntr"
+	Set gtmtypes("shmpool_buff_hdr",384,"off")=3760
 	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_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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_tp_tend_t1_cntr")=384
+	Set gtmtypes("shmpool_buff_hdr",385,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_tp_tend_bitmap_cntr"
+	Set gtmtypes("shmpool_buff_hdr",385,"off")=3764
 	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_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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_tp_tend_bitmap_cntr")=385
+	Set gtmtypes("shmpool_buff_hdr",386,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_tp_tend_jnl_cwset_cntr"
+	Set gtmtypes("shmpool_buff_hdr",386,"off")=3768
 	Set gtmtypes("shmpool_buff_hdr",386,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",386,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_tp_tend_jnl_cwset_cntr")=386
+	Set gtmtypes("shmpool_buff_hdr",387,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_tp_tend_jnl_wcsflu_cntr"
+	Set gtmtypes("shmpool_buff_hdr",387,"off")=3772
 	Set gtmtypes("shmpool_buff_hdr",387,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",387,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_tp_tend_jnl_wcsflu_cntr")=387
+	Set gtmtypes("shmpool_buff_hdr",388,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_t_end_hist_cntr"
+	Set gtmtypes("shmpool_buff_hdr",388,"off")=3776
 	Set gtmtypes("shmpool_buff_hdr",388,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",388,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_t_end_hist_cntr")=388
+	Set gtmtypes("shmpool_buff_hdr",389,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_t_end_hist1_nullbt_cntr"
+	Set gtmtypes("shmpool_buff_hdr",389,"off")=3780
 	Set gtmtypes("shmpool_buff_hdr",389,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",389,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_t_end_hist1_nullbt_cntr")=389
+	Set gtmtypes("shmpool_buff_hdr",390,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_t_end_hist1_nonnullbt_cntr"
+	Set gtmtypes("shmpool_buff_hdr",390,"off")=3784
 	Set gtmtypes("shmpool_buff_hdr",390,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",390,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_t_end_hist1_nonnullbt_cntr")=390
+	Set gtmtypes("shmpool_buff_hdr",391,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_t_end_bitmap_nullbt_cntr"
+	Set gtmtypes("shmpool_buff_hdr",391,"off")=3788
 	Set gtmtypes("shmpool_buff_hdr",391,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",391,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_t_end_bitmap_nullbt_cntr")=391
+	Set gtmtypes("shmpool_buff_hdr",392,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_t_end_bitmap_nonnullbt_cntr"
+	Set gtmtypes("shmpool_buff_hdr",392,"off")=3792
 	Set gtmtypes("shmpool_buff_hdr",392,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",392,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_t_end_bitmap_nonnullbt_cntr")=392
+	Set gtmtypes("shmpool_buff_hdr",393,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_t_end_jnl_cwset_cntr"
+	Set gtmtypes("shmpool_buff_hdr",393,"off")=3796
 	Set gtmtypes("shmpool_buff_hdr",393,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",393,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_t_end_jnl_cwset_cntr")=393
+	Set gtmtypes("shmpool_buff_hdr",394,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_t_end_jnl_wcsflu_cntr"
+	Set gtmtypes("shmpool_buff_hdr",394,"off")=3800
 	Set gtmtypes("shmpool_buff_hdr",394,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",394,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_t_end_jnl_wcsflu_cntr")=394
+	Set gtmtypes("shmpool_buff_hdr",395,"name")="shmpool_buff_hdr.shadow_file_header.db_csh_get_too_many_loops_cntr"
+	Set gtmtypes("shmpool_buff_hdr",395,"off")=3804
 	Set gtmtypes("shmpool_buff_hdr",395,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",395,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.db_csh_get_too_many_loops_cntr")=395
+	Set gtmtypes("shmpool_buff_hdr",396,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_tpckh_hist1_nullbt_cntr"
+	Set gtmtypes("shmpool_buff_hdr",396,"off")=3808
 	Set gtmtypes("shmpool_buff_hdr",396,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",396,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_tpckh_hist1_nullbt_cntr")=396
+	Set gtmtypes("shmpool_buff_hdr",397,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_tpckh_hist1_nonnullbt_cntr"
+	Set gtmtypes("shmpool_buff_hdr",397,"off")=3812
 	Set gtmtypes("shmpool_buff_hdr",397,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",397,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_tpckh_hist1_nonnullbt_cntr")=397
+	Set gtmtypes("shmpool_buff_hdr",398,"name")="shmpool_buff_hdr.shadow_file_header.jnl_blocked_writer_lost_cntr"
+	Set gtmtypes("shmpool_buff_hdr",398,"off")=3816
 	Set gtmtypes("shmpool_buff_hdr",398,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",398,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.jnl_blocked_writer_lost_cntr")=398
+	Set gtmtypes("shmpool_buff_hdr",399,"name")="shmpool_buff_hdr.shadow_file_header.jnl_blocked_writer_stuck_cntr"
+	Set gtmtypes("shmpool_buff_hdr",399,"off")=3820
 	Set gtmtypes("shmpool_buff_hdr",399,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",399,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.jnl_blocked_writer_stuck_cntr")=399
+	Set gtmtypes("shmpool_buff_hdr",400,"name")="shmpool_buff_hdr.shadow_file_header.jnl_blocked_writer_blocked_cntr"
+	Set gtmtypes("shmpool_buff_hdr",400,"off")=3824
 	Set gtmtypes("shmpool_buff_hdr",400,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",400,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.jnl_blocked_writer_blocked_cntr")=400
+	Set gtmtypes("shmpool_buff_hdr",401,"name")="shmpool_buff_hdr.shadow_file_header.n_jnl_fsyncs_cntr"
+	Set gtmtypes("shmpool_buff_hdr",401,"off")=3828
 	Set gtmtypes("shmpool_buff_hdr",401,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",401,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_jnl_fsyncs_cntr")=401
+	Set gtmtypes("shmpool_buff_hdr",402,"name")="shmpool_buff_hdr.shadow_file_header.n_jnl_fsync_tries_cntr"
+	Set gtmtypes("shmpool_buff_hdr",402,"off")=3832
 	Set gtmtypes("shmpool_buff_hdr",402,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",402,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_jnl_fsync_tries_cntr")=402
+	Set gtmtypes("shmpool_buff_hdr",403,"name")="shmpool_buff_hdr.shadow_file_header.n_jnl_fsync_recovers_cntr"
+	Set gtmtypes("shmpool_buff_hdr",403,"off")=3836
 	Set gtmtypes("shmpool_buff_hdr",403,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",403,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_jnl_fsync_recovers_cntr")=403
+	Set gtmtypes("shmpool_buff_hdr",404,"name")="shmpool_buff_hdr.shadow_file_header.n_db_fsyncs_cntr"
+	Set gtmtypes("shmpool_buff_hdr",404,"off")=3840
 	Set gtmtypes("shmpool_buff_hdr",404,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",404,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_db_fsyncs_cntr")=404
+	Set gtmtypes("shmpool_buff_hdr",405,"name")="shmpool_buff_hdr.shadow_file_header.n_db_fsyncs_in_crit_cntr"
+	Set gtmtypes("shmpool_buff_hdr",405,"off")=3844
 	Set gtmtypes("shmpool_buff_hdr",405,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",405,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_db_fsyncs_in_crit_cntr")=405
+	Set gtmtypes("shmpool_buff_hdr",406,"name")="shmpool_buff_hdr.shadow_file_header.n_dbsync_timers_cntr"
+	Set gtmtypes("shmpool_buff_hdr",406,"off")=3848
 	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_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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_dbsync_timers_cntr")=406
+	Set gtmtypes("shmpool_buff_hdr",407,"name")="shmpool_buff_hdr.shadow_file_header.n_dbsync_writes_cntr"
+	Set gtmtypes("shmpool_buff_hdr",407,"off")=3852
 	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_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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_dbsync_writes_cntr")=407
+	Set gtmtypes("shmpool_buff_hdr",408,"name")="shmpool_buff_hdr.shadow_file_header.mutex_queue_full_cntr"
+	Set gtmtypes("shmpool_buff_hdr",408,"off")=3856
 	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_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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.mutex_queue_full_cntr")=408
+	Set gtmtypes("shmpool_buff_hdr",409,"name")="shmpool_buff_hdr.shadow_file_header.wcb_bt_put_cntr"
+	Set gtmtypes("shmpool_buff_hdr",409,"off")=3860
 	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_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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_bt_put_cntr")=409
+	Set gtmtypes("shmpool_buff_hdr",410,"name")="shmpool_buff_hdr.shadow_file_header.wcb_mutex_salvage_cntr"
+	Set gtmtypes("shmpool_buff_hdr",410,"off")=3864
 	Set gtmtypes("shmpool_buff_hdr",410,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",410,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_mutex_salvage_cntr")=410
+	Set gtmtypes("shmpool_buff_hdr",411,"name")="shmpool_buff_hdr.shadow_file_header.wcb_wcs_flu0_cntr"
+	Set gtmtypes("shmpool_buff_hdr",411,"off")=3868
 	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_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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_wcs_flu0_cntr")=411
+	Set gtmtypes("shmpool_buff_hdr",412,"name")="shmpool_buff_hdr.shadow_file_header.wcb_t_end_sysops_nocr_invcr_cntr"
+	Set gtmtypes("shmpool_buff_hdr",412,"off")=3872
 	Set gtmtypes("shmpool_buff_hdr",412,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",412,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_t_end_sysops_nocr_invcr_cntr")=412
+	Set gtmtypes("shmpool_buff_hdr",413,"name")="shmpool_buff_hdr.shadow_file_header.wcb_t_end_sysops_cr_invcr_cntr"
+	Set gtmtypes("shmpool_buff_hdr",413,"off")=3876
 	Set gtmtypes("shmpool_buff_hdr",413,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",413,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_t_end_sysops_cr_invcr_cntr")=413
+	Set gtmtypes("shmpool_buff_hdr",414,"name")="shmpool_buff_hdr.shadow_file_header.wcb_t_end_sysops_rip_wait_cntr"
+	Set gtmtypes("shmpool_buff_hdr",414,"off")=3880
 	Set gtmtypes("shmpool_buff_hdr",414,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",414,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_t_end_sysops_rip_wait_cntr")=414
+	Set gtmtypes("shmpool_buff_hdr",415,"name")="shmpool_buff_hdr.shadow_file_header.wcb_t_end_sysops_dirtyripwait_cntr"
+	Set gtmtypes("shmpool_buff_hdr",415,"off")=3884
 	Set gtmtypes("shmpool_buff_hdr",415,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",415,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_t_end_sysops_dirtyripwait_cntr")=415
+	Set gtmtypes("shmpool_buff_hdr",416,"name")="shmpool_buff_hdr.shadow_file_header.wcb_gds_rundown1_cntr"
+	Set gtmtypes("shmpool_buff_hdr",416,"off")=3888
 	Set gtmtypes("shmpool_buff_hdr",416,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",416,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_gds_rundown1_cntr")=416
+	Set gtmtypes("shmpool_buff_hdr",417,"name")="shmpool_buff_hdr.shadow_file_header.wcb_wcs_flu1_cntr"
+	Set gtmtypes("shmpool_buff_hdr",417,"off")=3892
 	Set gtmtypes("shmpool_buff_hdr",417,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",417,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_wcs_flu1_cntr")=417
+	Set gtmtypes("shmpool_buff_hdr",418,"name")="shmpool_buff_hdr.shadow_file_header.wcb_mu_back_cntr"
+	Set gtmtypes("shmpool_buff_hdr",418,"off")=3896
 	Set gtmtypes("shmpool_buff_hdr",418,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",418,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_mu_back_cntr")=418
+	Set gtmtypes("shmpool_buff_hdr",419,"name")="shmpool_buff_hdr.shadow_file_header.wcb_t_end_sysops_dirty_invcr_cntr"
+	Set gtmtypes("shmpool_buff_hdr",419,"off")=3900
 	Set gtmtypes("shmpool_buff_hdr",419,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",419,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_t_end_sysops_dirty_invcr_cntr")=419
+	Set gtmtypes("shmpool_buff_hdr",420,"name")="shmpool_buff_hdr.shadow_file_header.wcb_t_end_sysops_wtfini_fail_cntr"
+	Set gtmtypes("shmpool_buff_hdr",420,"off")=3904
 	Set gtmtypes("shmpool_buff_hdr",420,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",420,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_t_end_sysops_wtfini_fail_cntr")=420
+	Set gtmtypes("shmpool_buff_hdr",421,"name")="shmpool_buff_hdr.shadow_file_header.wcb_t_end_sysops_twin_stuck_cntr"
+	Set gtmtypes("shmpool_buff_hdr",421,"off")=3908
 	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_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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_t_end_sysops_twin_stuck_cntr")=421
+	Set gtmtypes("shmpool_buff_hdr",422,"name")="shmpool_buff_hdr.shadow_file_header.db_csh_getn_wrt_latch_stuck_cntr"
+	Set gtmtypes("shmpool_buff_hdr",422,"off")=3912
 	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_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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.db_csh_getn_wrt_latch_stuck_cntr")=422
+	Set gtmtypes("shmpool_buff_hdr",423,"name")="shmpool_buff_hdr.shadow_file_header.wcb_secshr_db_clnup_now_crit_cntr"
+	Set gtmtypes("shmpool_buff_hdr",423,"off")=3916
 	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_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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_secshr_db_clnup_now_crit_cntr")=423
+	Set gtmtypes("shmpool_buff_hdr",424,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_t_qread_bad_bt_index1_cntr"
+	Set gtmtypes("shmpool_buff_hdr",424,"off")=3920
 	Set gtmtypes("shmpool_buff_hdr",424,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",424,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_t_qread_bad_bt_index1_cntr")=424
+	Set gtmtypes("shmpool_buff_hdr",425,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_t_qread_bad_bt_index2_cntr"
+	Set gtmtypes("shmpool_buff_hdr",425,"off")=3924
 	Set gtmtypes("shmpool_buff_hdr",425,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",425,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_t_qread_bad_bt_index2_cntr")=425
+	Set gtmtypes("shmpool_buff_hdr",426,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_t_end_crbtmismatch1_cntr"
+	Set gtmtypes("shmpool_buff_hdr",426,"off")=3928
 	Set gtmtypes("shmpool_buff_hdr",426,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",426,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_t_end_crbtmismatch1_cntr")=426
+	Set gtmtypes("shmpool_buff_hdr",427,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_t_end_crbtmismatch2_cntr"
+	Set gtmtypes("shmpool_buff_hdr",427,"off")=3932
 	Set gtmtypes("shmpool_buff_hdr",427,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",427,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_t_end_crbtmismatch2_cntr")=427
+	Set gtmtypes("shmpool_buff_hdr",428,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_t_end_crbtmismatch3_cntr"
+	Set gtmtypes("shmpool_buff_hdr",428,"off")=3936
 	Set gtmtypes("shmpool_buff_hdr",428,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",428,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_t_end_crbtmismatch3_cntr")=428
+	Set gtmtypes("shmpool_buff_hdr",429,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_tp_tend_crbtmismatch1_cntr"
+	Set gtmtypes("shmpool_buff_hdr",429,"off")=3940
 	Set gtmtypes("shmpool_buff_hdr",429,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",429,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_tp_tend_crbtmismatch1_cntr")=429
+	Set gtmtypes("shmpool_buff_hdr",430,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_tp_tend_crbtmismatch2_cntr"
+	Set gtmtypes("shmpool_buff_hdr",430,"off")=3944
 	Set gtmtypes("shmpool_buff_hdr",430,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",430,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_tp_tend_crbtmismatch2_cntr")=430
+	Set gtmtypes("shmpool_buff_hdr",431,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_tp_tend_crbtmismatch3_cntr"
+	Set gtmtypes("shmpool_buff_hdr",431,"off")=3948
 	Set gtmtypes("shmpool_buff_hdr",431,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",431,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_tp_tend_crbtmismatch3_cntr")=431
+	Set gtmtypes("shmpool_buff_hdr",432,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_wcs_wtstart_bad_cr_cntr"
+	Set gtmtypes("shmpool_buff_hdr",432,"off")=3952
 	Set gtmtypes("shmpool_buff_hdr",432,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",432,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_wcs_wtstart_bad_cr_cntr")=432
+	Set gtmtypes("shmpool_buff_hdr",433,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_wcs_wtfini_bad_cr_cntr"
+	Set gtmtypes("shmpool_buff_hdr",433,"off")=3956
 	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_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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_wcs_wtfini_bad_cr_cntr")=433
+	Set gtmtypes("shmpool_buff_hdr",434,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_bt_get_cntr"
+	Set gtmtypes("shmpool_buff_hdr",434,"off")=3960
 	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_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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_bt_get_cntr")=434
+	Set gtmtypes("shmpool_buff_hdr",435,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_wcs_cdb_sc_final_retry_cntr"
+	Set gtmtypes("shmpool_buff_hdr",435,"off")=3964
 	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_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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_wcs_cdb_sc_final_retry_cntr")=435
+	Set gtmtypes("shmpool_buff_hdr",436,"name")="shmpool_buff_hdr.shadow_file_header.wcb_bg_update_lckfail1_cntr"
+	Set gtmtypes("shmpool_buff_hdr",436,"off")=3968
 	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_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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_bg_update_lckfail1_cntr")=436
+	Set gtmtypes("shmpool_buff_hdr",437,"name")="shmpool_buff_hdr.shadow_file_header.wcb_bg_update_lckfail2_cntr"
+	Set gtmtypes("shmpool_buff_hdr",437,"off")=3972
 	Set gtmtypes("shmpool_buff_hdr",437,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",437,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_bg_update_lckfail2_cntr")=437
+	Set gtmtypes("shmpool_buff_hdr",438,"name")="shmpool_buff_hdr.shadow_file_header.wcb_wtstart_lckfail1_cntr"
+	Set gtmtypes("shmpool_buff_hdr",438,"off")=3976
 	Set gtmtypes("shmpool_buff_hdr",438,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",438,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_wtstart_lckfail1_cntr")=438
+	Set gtmtypes("shmpool_buff_hdr",439,"name")="shmpool_buff_hdr.shadow_file_header.wcb_wtstart_lckfail2_cntr"
+	Set gtmtypes("shmpool_buff_hdr",439,"off")=3980
 	Set gtmtypes("shmpool_buff_hdr",439,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",439,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_wtstart_lckfail2_cntr")=439
+	Set gtmtypes("shmpool_buff_hdr",440,"name")="shmpool_buff_hdr.shadow_file_header.wcb_wtstart_lckfail3_cntr"
+	Set gtmtypes("shmpool_buff_hdr",440,"off")=3984
 	Set gtmtypes("shmpool_buff_hdr",440,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",440,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_wtstart_lckfail3_cntr")=440
+	Set gtmtypes("shmpool_buff_hdr",441,"name")="shmpool_buff_hdr.shadow_file_header.wcb_wtstart_lckfail4_cntr"
+	Set gtmtypes("shmpool_buff_hdr",441,"off")=3988
 	Set gtmtypes("shmpool_buff_hdr",441,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",441,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_wtstart_lckfail4_cntr")=441
+	Set gtmtypes("shmpool_buff_hdr",442,"name")="shmpool_buff_hdr.shadow_file_header.wcb_wtfini_lckfail1_cntr"
+	Set gtmtypes("shmpool_buff_hdr",442,"off")=3992
 	Set gtmtypes("shmpool_buff_hdr",442,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",442,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_wtfini_lckfail1_cntr")=442
+	Set gtmtypes("shmpool_buff_hdr",443,"name")="shmpool_buff_hdr.shadow_file_header.wcb_wtfini_lckfail2_cntr"
+	Set gtmtypes("shmpool_buff_hdr",443,"off")=3996
 	Set gtmtypes("shmpool_buff_hdr",443,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",443,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_wtfini_lckfail2_cntr")=443
+	Set gtmtypes("shmpool_buff_hdr",444,"name")="shmpool_buff_hdr.shadow_file_header.wcb_wtfini_lckfail3_cntr"
+	Set gtmtypes("shmpool_buff_hdr",444,"off")=4000
 	Set gtmtypes("shmpool_buff_hdr",444,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",444,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_wtfini_lckfail3_cntr")=444
+	Set gtmtypes("shmpool_buff_hdr",445,"name")="shmpool_buff_hdr.shadow_file_header.wcb_wtfini_lckfail4_cntr"
+	Set gtmtypes("shmpool_buff_hdr",445,"off")=4004
 	Set gtmtypes("shmpool_buff_hdr",445,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",445,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_wtfini_lckfail4_cntr")=445
+	Set gtmtypes("shmpool_buff_hdr",446,"name")="shmpool_buff_hdr.shadow_file_header.wcb_t_end_sysops_dirtystuck1_cntr"
+	Set gtmtypes("shmpool_buff_hdr",446,"off")=4008
 	Set gtmtypes("shmpool_buff_hdr",446,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",446,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_t_end_sysops_dirtystuck1_cntr")=446
+	Set gtmtypes("shmpool_buff_hdr",447,"name")="shmpool_buff_hdr.shadow_file_header.wcb_t_end_sysops_dirtystuck2_cntr"
+	Set gtmtypes("shmpool_buff_hdr",447,"off")=4012
 	Set gtmtypes("shmpool_buff_hdr",447,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",447,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_t_end_sysops_dirtystuck2_cntr")=447
+	Set gtmtypes("shmpool_buff_hdr",448,"name")="shmpool_buff_hdr.shadow_file_header.wcb_secshr_db_clnup_wbuf_dqd_cntr"
+	Set gtmtypes("shmpool_buff_hdr",448,"off")=4016
 	Set gtmtypes("shmpool_buff_hdr",448,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",448,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_secshr_db_clnup_wbuf_dqd_cntr")=448
+	Set gtmtypes("shmpool_buff_hdr",449,"name")="shmpool_buff_hdr.shadow_file_header.dwngrd_refmts_syncio_cntr"
+	Set gtmtypes("shmpool_buff_hdr",449,"off")=4020
 	Set gtmtypes("shmpool_buff_hdr",449,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",449,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.dwngrd_refmts_syncio_cntr")=449
+	Set gtmtypes("shmpool_buff_hdr",450,"name")="shmpool_buff_hdr.shadow_file_header.dwngrd_refmts_asyncio_cntr"
+	Set gtmtypes("shmpool_buff_hdr",450,"off")=4024
 	Set gtmtypes("shmpool_buff_hdr",450,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",450,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.dwngrd_refmts_asyncio_cntr")=450
+	Set gtmtypes("shmpool_buff_hdr",451,"name")="shmpool_buff_hdr.shadow_file_header.shmpool_refmt_harvests_cntr"
+	Set gtmtypes("shmpool_buff_hdr",451,"off")=4028
 	Set gtmtypes("shmpool_buff_hdr",451,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",451,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.shmpool_refmt_harvests_cntr")=451
+	Set gtmtypes("shmpool_buff_hdr",452,"name")="shmpool_buff_hdr.shadow_file_header.shmpool_recovery_cntr"
+	Set gtmtypes("shmpool_buff_hdr",452,"off")=4032
 	Set gtmtypes("shmpool_buff_hdr",452,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",452,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.shmpool_recovery_cntr")=452
+	Set gtmtypes("shmpool_buff_hdr",453,"name")="shmpool_buff_hdr.shadow_file_header.shmpool_blkd_by_sdc_cntr"
+	Set gtmtypes("shmpool_buff_hdr",453,"off")=4036
 	Set gtmtypes("shmpool_buff_hdr",453,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",453,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.shmpool_blkd_by_sdc_cntr")=453
+	Set gtmtypes("shmpool_buff_hdr",454,"name")="shmpool_buff_hdr.shadow_file_header.shmpool_alloc_bbflush_cntr"
+	Set gtmtypes("shmpool_buff_hdr",454,"off")=4040
 	Set gtmtypes("shmpool_buff_hdr",454,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",454,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.shmpool_alloc_bbflush_cntr")=454
+	Set gtmtypes("shmpool_buff_hdr",455,"name")="shmpool_buff_hdr.shadow_file_header.refmt_hvst_blk_released_replaced_cntr"
+	Set gtmtypes("shmpool_buff_hdr",455,"off")=4044
 	Set gtmtypes("shmpool_buff_hdr",455,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",455,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.refmt_hvst_blk_released_replaced_cntr")=455
+	Set gtmtypes("shmpool_buff_hdr",456,"name")="shmpool_buff_hdr.shadow_file_header.refmt_hvst_blk_released_io_complete_cntr"
+	Set gtmtypes("shmpool_buff_hdr",456,"off")=4048
 	Set gtmtypes("shmpool_buff_hdr",456,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",456,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.refmt_hvst_blk_released_io_complete_cntr")=456
+	Set gtmtypes("shmpool_buff_hdr",457,"name")="shmpool_buff_hdr.shadow_file_header.refmt_hvst_blk_kept_cntr"
+	Set gtmtypes("shmpool_buff_hdr",457,"off")=4052
 	Set gtmtypes("shmpool_buff_hdr",457,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",457,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.refmt_hvst_blk_kept_cntr")=457
+	Set gtmtypes("shmpool_buff_hdr",458,"name")="shmpool_buff_hdr.shadow_file_header.refmt_hvst_blk_ignored_cntr"
+	Set gtmtypes("shmpool_buff_hdr",458,"off")=4056
 	Set gtmtypes("shmpool_buff_hdr",458,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",458,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.refmt_hvst_blk_ignored_cntr")=458
+	Set gtmtypes("shmpool_buff_hdr",459,"name")="shmpool_buff_hdr.shadow_file_header.refmt_blk_chk_blk_freed_cntr"
+	Set gtmtypes("shmpool_buff_hdr",459,"off")=4060
 	Set gtmtypes("shmpool_buff_hdr",459,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",459,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.refmt_blk_chk_blk_freed_cntr")=459
+	Set gtmtypes("shmpool_buff_hdr",460,"name")="shmpool_buff_hdr.shadow_file_header.refmt_blk_chk_blk_kept_cntr"
+	Set gtmtypes("shmpool_buff_hdr",460,"off")=4064
 	Set gtmtypes("shmpool_buff_hdr",460,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",460,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.refmt_blk_chk_blk_kept_cntr")=460
+	Set gtmtypes("shmpool_buff_hdr",461,"name")="shmpool_buff_hdr.shadow_file_header.active_lvl_trigger_cntr"
+	Set gtmtypes("shmpool_buff_hdr",461,"off")=4068
 	Set gtmtypes("shmpool_buff_hdr",461,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",461,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.active_lvl_trigger_cntr")=461
+	Set gtmtypes("shmpool_buff_hdr",462,"name")="shmpool_buff_hdr.shadow_file_header.new_buff_cntr"
+	Set gtmtypes("shmpool_buff_hdr",462,"off")=4072
 	Set gtmtypes("shmpool_buff_hdr",462,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",462,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.new_buff_cntr")=462
+	Set gtmtypes("shmpool_buff_hdr",463,"name")="shmpool_buff_hdr.shadow_file_header.phase2_commit_wait_sleep_in_crit_cntr"
+	Set gtmtypes("shmpool_buff_hdr",463,"off")=4076
 	Set gtmtypes("shmpool_buff_hdr",463,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",463,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.phase2_commit_wait_sleep_in_crit_cntr")=463
+	Set gtmtypes("shmpool_buff_hdr",464,"name")="shmpool_buff_hdr.shadow_file_header.phase2_commit_wait_sleep_no_crit_cntr"
+	Set gtmtypes("shmpool_buff_hdr",464,"off")=4080
 	Set gtmtypes("shmpool_buff_hdr",464,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",464,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.phase2_commit_wait_sleep_no_crit_cntr")=464
+	Set gtmtypes("shmpool_buff_hdr",465,"name")="shmpool_buff_hdr.shadow_file_header.phase2_commit_wait_pidcnt_cntr"
+	Set gtmtypes("shmpool_buff_hdr",465,"off")=4084
 	Set gtmtypes("shmpool_buff_hdr",465,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",465,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.phase2_commit_wait_pidcnt_cntr")=465
+	Set gtmtypes("shmpool_buff_hdr",466,"name")="shmpool_buff_hdr.shadow_file_header.wcb_t_end_sysops_intend_wait_cntr"
+	Set gtmtypes("shmpool_buff_hdr",466,"off")=4088
 	Set gtmtypes("shmpool_buff_hdr",466,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",466,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_t_end_sysops_intend_wait_cntr")=466
+	Set gtmtypes("shmpool_buff_hdr",467,"name")="shmpool_buff_hdr.shadow_file_header.wcb_secshr_db_clnup_phase2_clnup_cntr"
+	Set gtmtypes("shmpool_buff_hdr",467,"off")=4092
 	Set gtmtypes("shmpool_buff_hdr",467,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",467,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_secshr_db_clnup_phase2_clnup_cntr")=467
+	Set gtmtypes("shmpool_buff_hdr",468,"name")="shmpool_buff_hdr.shadow_file_header.wcb_phase2_commit_wait_cntr"
+	Set gtmtypes("shmpool_buff_hdr",468,"off")=4096
 	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_phase2_commit_wait_cntr")=468
+	Set gtmtypes("shmpool_buff_hdr",469,"name")="shmpool_buff_hdr.shadow_file_header.recompute_upd_array_calls_cntr"
+	Set gtmtypes("shmpool_buff_hdr",469,"off")=4100
 	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.recompute_upd_array_calls_cntr")=469
+	Set gtmtypes("shmpool_buff_hdr",470,"name")="shmpool_buff_hdr.shadow_file_header.recompute_upd_array_rip_cntr"
+	Set gtmtypes("shmpool_buff_hdr",470,"off")=4104
 	Set gtmtypes("shmpool_buff_hdr",470,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",470,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.recompute_upd_array_rip_cntr")=470
+	Set gtmtypes("shmpool_buff_hdr",471,"name")="shmpool_buff_hdr.shadow_file_header.recompute_upd_array_in_tend_cntr"
+	Set gtmtypes("shmpool_buff_hdr",471,"off")=4108
 	Set gtmtypes("shmpool_buff_hdr",471,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",471,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.recompute_upd_array_in_tend_cntr")=471
+	Set gtmtypes("shmpool_buff_hdr",472,"name")="shmpool_buff_hdr.shadow_file_header.recompute_upd_array_search_blk_cntr"
+	Set gtmtypes("shmpool_buff_hdr",472,"off")=4112
 	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.recompute_upd_array_search_blk_cntr")=472
+	Set gtmtypes("shmpool_buff_hdr",473,"name")="shmpool_buff_hdr.shadow_file_header.recompute_upd_array_new_rec_cntr"
+	Set gtmtypes("shmpool_buff_hdr",473,"off")=4116
 	Set gtmtypes("shmpool_buff_hdr",473,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",473,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.recompute_upd_array_new_rec_cntr")=473
+	Set gtmtypes("shmpool_buff_hdr",474,"name")="shmpool_buff_hdr.shadow_file_header.recompute_upd_array_rec_size_cntr"
+	Set gtmtypes("shmpool_buff_hdr",474,"off")=4120
 	Set gtmtypes("shmpool_buff_hdr",474,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",474,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.recompute_upd_array_rec_size_cntr")=474
+	Set gtmtypes("shmpool_buff_hdr",475,"name")="shmpool_buff_hdr.shadow_file_header.recompute_upd_array_rec_cmpc_cntr"
+	Set gtmtypes("shmpool_buff_hdr",475,"off")=4124
 	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.recompute_upd_array_rec_cmpc_cntr")=475
+	Set gtmtypes("shmpool_buff_hdr",476,"name")="shmpool_buff_hdr.shadow_file_header.recompute_upd_array_blk_fini_cntr"
+	Set gtmtypes("shmpool_buff_hdr",476,"off")=4128
 	Set gtmtypes("shmpool_buff_hdr",476,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",476,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.recompute_upd_array_blk_fini_cntr")=476
+	Set gtmtypes("shmpool_buff_hdr",477,"name")="shmpool_buff_hdr.shadow_file_header.recompute_upd_array_blk_split_cntr"
+	Set gtmtypes("shmpool_buff_hdr",477,"off")=4132
 	Set gtmtypes("shmpool_buff_hdr",477,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",477,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.recompute_upd_array_blk_split_cntr")=477
+	Set gtmtypes("shmpool_buff_hdr",478,"name")="shmpool_buff_hdr.shadow_file_header.t_qread_ripsleep_cnt_cntr"
+	Set gtmtypes("shmpool_buff_hdr",478,"off")=4136
 	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.t_qread_ripsleep_cnt_cntr")=478
+	Set gtmtypes("shmpool_buff_hdr",479,"name")="shmpool_buff_hdr.shadow_file_header.t_qread_ripsleep_nblks_cntr"
+	Set gtmtypes("shmpool_buff_hdr",479,"off")=4140
 	Set gtmtypes("shmpool_buff_hdr",479,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",479,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.t_qread_ripsleep_nblks_cntr")=479
+	Set gtmtypes("shmpool_buff_hdr",480,"name")="shmpool_buff_hdr.shadow_file_header.wcs_wtfini_invoked_cntr"
+	Set gtmtypes("shmpool_buff_hdr",480,"off")=4144
 	Set gtmtypes("shmpool_buff_hdr",480,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",480,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcs_wtfini_invoked_cntr")=480
+	Set gtmtypes("shmpool_buff_hdr",481,"name")="shmpool_buff_hdr.shadow_file_header.wcs_wterror_invoked_cntr"
+	Set gtmtypes("shmpool_buff_hdr",481,"off")=4148
 	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcs_wterror_invoked_cntr")=481
+	Set gtmtypes("shmpool_buff_hdr",482,"name")="shmpool_buff_hdr.shadow_file_header.wcs_wt_restart_invoked_cntr"
+	Set gtmtypes("shmpool_buff_hdr",482,"off")=4152
 	Set gtmtypes("shmpool_buff_hdr",482,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",482,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcs_wt_restart_invoked_cntr")=482
+	Set gtmtypes("shmpool_buff_hdr",483,"name")="shmpool_buff_hdr.shadow_file_header.wcs_wt_restart_eagain_cntr"
+	Set gtmtypes("shmpool_buff_hdr",483,"off")=4156
 	Set gtmtypes("shmpool_buff_hdr",483,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",483,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcs_wt_restart_eagain_cntr")=483
+	Set gtmtypes("shmpool_buff_hdr",484,"name")="shmpool_buff_hdr.shadow_file_header.wcs_wt_restart_reinsert_cntr"
+	Set gtmtypes("shmpool_buff_hdr",484,"off")=4160
 	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcs_wt_restart_reinsert_cntr")=484
+	Set gtmtypes("shmpool_buff_hdr",485,"name")="shmpool_buff_hdr.shadow_file_header.wcs_wtstart_eagain_cntr"
+	Set gtmtypes("shmpool_buff_hdr",485,"off")=4164
+	Set gtmtypes("shmpool_buff_hdr",485,"len")=4
+	Set gtmtypes("shmpool_buff_hdr",485,"type")="int"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcs_wtstart_eagain_cntr")=485
+	Set gtmtypes("shmpool_buff_hdr",486,"name")="shmpool_buff_hdr.shadow_file_header.wcs_wtstart_eagain_incrit_cntr"
+	Set gtmtypes("shmpool_buff_hdr",486,"off")=4168
+	Set gtmtypes("shmpool_buff_hdr",486,"len")=4
+	Set gtmtypes("shmpool_buff_hdr",486,"type")="int"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcs_wtstart_eagain_incrit_cntr")=486
+	Set gtmtypes("shmpool_buff_hdr",487,"name")="shmpool_buff_hdr.shadow_file_header.async_restart_eagain_cntr"
+	Set gtmtypes("shmpool_buff_hdr",487,"off")=4172
 	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.async_restart_eagain_cntr")=487
+	Set gtmtypes("shmpool_buff_hdr",488,"name")="shmpool_buff_hdr.shadow_file_header.jnlbuff_phs2cmt_array_full_cntr"
+	Set gtmtypes("shmpool_buff_hdr",488,"off")=4176
 	Set gtmtypes("shmpool_buff_hdr",488,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",488,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.jnlbuff_phs2cmt_array_full_cntr")=488
+	Set gtmtypes("shmpool_buff_hdr",489,"name")="shmpool_buff_hdr.shadow_file_header.jnl_phase2_cleanup_if_possible_cntr"
+	Set gtmtypes("shmpool_buff_hdr",489,"off")=4180
+	Set gtmtypes("shmpool_buff_hdr",489,"len")=4
+	Set gtmtypes("shmpool_buff_hdr",489,"type")="int"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.jnl_phase2_cleanup_if_possible_cntr")=489
+	Set gtmtypes("shmpool_buff_hdr",490,"name")="shmpool_buff_hdr.shadow_file_header.jnlbuff_phs2cmt_isprcalv_cntr"
+	Set gtmtypes("shmpool_buff_hdr",490,"off")=4184
 	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_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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.jnlbuff_phs2cmt_isprcalv_cntr")=490
+	Set gtmtypes("shmpool_buff_hdr",491,"name")="shmpool_buff_hdr.shadow_file_header.bg_trc_rec_cntr_filler"
+	Set gtmtypes("shmpool_buff_hdr",491,"off")=4188
+	Set gtmtypes("shmpool_buff_hdr",491,"len")=12
+	Set gtmtypes("shmpool_buff_hdr",491,"type")="char"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.bg_trc_rec_cntr_filler")=491
+	Set gtmtypes("shmpool_buff_hdr",492,"name")="shmpool_buff_hdr.shadow_file_header.n_gvcst_srches"
+	Set gtmtypes("shmpool_buff_hdr",492,"off")=4200
 	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_gvcst_srches")=492
+	Set gtmtypes("shmpool_buff_hdr",493,"name")="shmpool_buff_hdr.shadow_file_header.n_gvcst_srches.curr_count"
+	Set gtmtypes("shmpool_buff_hdr",493,"off")=4200
 	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_gvcst_srches.curr_count")=493
+	Set gtmtypes("shmpool_buff_hdr",494,"name")="shmpool_buff_hdr.shadow_file_header.n_gvcst_srches.cumul_count"
+	Set gtmtypes("shmpool_buff_hdr",494,"off")=4204
 	Set gtmtypes("shmpool_buff_hdr",494,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",494,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_gvcst_srches.cumul_count")=494
+	Set gtmtypes("shmpool_buff_hdr",495,"name")="shmpool_buff_hdr.shadow_file_header.n_gvcst_srch_clues"
+	Set gtmtypes("shmpool_buff_hdr",495,"off")=4208
 	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_gvcst_srch_clues")=495
+	Set gtmtypes("shmpool_buff_hdr",496,"name")="shmpool_buff_hdr.shadow_file_header.n_gvcst_srch_clues.curr_count"
+	Set gtmtypes("shmpool_buff_hdr",496,"off")=4208
 	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_gvcst_srch_clues.curr_count")=496
+	Set gtmtypes("shmpool_buff_hdr",497,"name")="shmpool_buff_hdr.shadow_file_header.n_gvcst_srch_clues.cumul_count"
+	Set gtmtypes("shmpool_buff_hdr",497,"off")=4212
 	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_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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_gvcst_srch_clues.cumul_count")=497
+	Set gtmtypes("shmpool_buff_hdr",498,"name")="shmpool_buff_hdr.shadow_file_header.n_clue_used_head"
+	Set gtmtypes("shmpool_buff_hdr",498,"off")=4216
 	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_clue_used_head")=498
+	Set gtmtypes("shmpool_buff_hdr",499,"name")="shmpool_buff_hdr.shadow_file_header.n_clue_used_head.curr_count"
+	Set gtmtypes("shmpool_buff_hdr",499,"off")=4216
 	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_clue_used_head.curr_count")=499
+	Set gtmtypes("shmpool_buff_hdr",500,"name")="shmpool_buff_hdr.shadow_file_header.n_clue_used_head.cumul_count"
+	Set gtmtypes("shmpool_buff_hdr",500,"off")=4220
 	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_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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_clue_used_head.cumul_count")=500
+	Set gtmtypes("shmpool_buff_hdr",501,"name")="shmpool_buff_hdr.shadow_file_header.n_clue_used_same"
+	Set gtmtypes("shmpool_buff_hdr",501,"off")=4224
 	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_clue_used_same")=501
+	Set gtmtypes("shmpool_buff_hdr",502,"name")="shmpool_buff_hdr.shadow_file_header.n_clue_used_same.curr_count"
+	Set gtmtypes("shmpool_buff_hdr",502,"off")=4224
 	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_clue_used_same.curr_count")=502
+	Set gtmtypes("shmpool_buff_hdr",503,"name")="shmpool_buff_hdr.shadow_file_header.n_clue_used_same.cumul_count"
+	Set gtmtypes("shmpool_buff_hdr",503,"off")=4228
 	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_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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_clue_used_same.cumul_count")=503
+	Set gtmtypes("shmpool_buff_hdr",504,"name")="shmpool_buff_hdr.shadow_file_header.n_clue_used_tail"
+	Set gtmtypes("shmpool_buff_hdr",504,"off")=4232
 	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_clue_used_tail")=504
+	Set gtmtypes("shmpool_buff_hdr",505,"name")="shmpool_buff_hdr.shadow_file_header.n_clue_used_tail.curr_count"
+	Set gtmtypes("shmpool_buff_hdr",505,"off")=4232
 	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_clue_used_tail.curr_count")=505
+	Set gtmtypes("shmpool_buff_hdr",506,"name")="shmpool_buff_hdr.shadow_file_header.n_clue_used_tail.cumul_count"
+	Set gtmtypes("shmpool_buff_hdr",506,"off")=4236
 	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_clue_used_tail.cumul_count")=506
+	Set gtmtypes("shmpool_buff_hdr",507,"name")="shmpool_buff_hdr.shadow_file_header.n_t_qreads"
+	Set gtmtypes("shmpool_buff_hdr",507,"off")=4240
 	Set gtmtypes("shmpool_buff_hdr",507,"len")=8
 	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_t_qreads")=507
+	Set gtmtypes("shmpool_buff_hdr",508,"name")="shmpool_buff_hdr.shadow_file_header.n_t_qreads.curr_count"
+	Set gtmtypes("shmpool_buff_hdr",508,"off")=4240
 	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_t_qreads.curr_count")=508
+	Set gtmtypes("shmpool_buff_hdr",509,"name")="shmpool_buff_hdr.shadow_file_header.n_t_qreads.cumul_count"
+	Set gtmtypes("shmpool_buff_hdr",509,"off")=4244
 	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_t_qreads.cumul_count")=509
+	Set gtmtypes("shmpool_buff_hdr",510,"name")="shmpool_buff_hdr.shadow_file_header.unused_dsk_reads"
+	Set gtmtypes("shmpool_buff_hdr",510,"off")=4248
 	Set gtmtypes("shmpool_buff_hdr",510,"len")=8
 	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.unused_dsk_reads")=510
+	Set gtmtypes("shmpool_buff_hdr",511,"name")="shmpool_buff_hdr.shadow_file_header.unused_dsk_reads.curr_count"
+	Set gtmtypes("shmpool_buff_hdr",511,"off")=4248
 	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.unused_dsk_reads.curr_count")=511
+	Set gtmtypes("shmpool_buff_hdr",512,"name")="shmpool_buff_hdr.shadow_file_header.unused_dsk_reads.cumul_count"
+	Set gtmtypes("shmpool_buff_hdr",512,"off")=4252
 	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.unused_dsk_reads.cumul_count")=512
+	Set gtmtypes("shmpool_buff_hdr",513,"name")="shmpool_buff_hdr.shadow_file_header.n_bgmm_updates"
+	Set gtmtypes("shmpool_buff_hdr",513,"off")=4256
 	Set gtmtypes("shmpool_buff_hdr",513,"len")=8
 	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_bgmm_updates")=513
+	Set gtmtypes("shmpool_buff_hdr",514,"name")="shmpool_buff_hdr.shadow_file_header.n_bgmm_updates.curr_count"
+	Set gtmtypes("shmpool_buff_hdr",514,"off")=4256
 	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_bgmm_updates.curr_count")=514
+	Set gtmtypes("shmpool_buff_hdr",515,"name")="shmpool_buff_hdr.shadow_file_header.n_bgmm_updates.cumul_count"
+	Set gtmtypes("shmpool_buff_hdr",515,"off")=4260
 	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_bgmm_updates.cumul_count")=515
+	Set gtmtypes("shmpool_buff_hdr",516,"name")="shmpool_buff_hdr.shadow_file_header.unused_dsk_writes"
+	Set gtmtypes("shmpool_buff_hdr",516,"off")=4264
 	Set gtmtypes("shmpool_buff_hdr",516,"len")=8
 	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.unused_dsk_writes")=516
+	Set gtmtypes("shmpool_buff_hdr",517,"name")="shmpool_buff_hdr.shadow_file_header.unused_dsk_writes.curr_count"
+	Set gtmtypes("shmpool_buff_hdr",517,"off")=4264
 	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.unused_dsk_writes.curr_count")=517
+	Set gtmtypes("shmpool_buff_hdr",518,"name")="shmpool_buff_hdr.shadow_file_header.unused_dsk_writes.cumul_count"
+	Set gtmtypes("shmpool_buff_hdr",518,"off")=4268
 	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.unused_dsk_writes.cumul_count")=518
+	Set gtmtypes("shmpool_buff_hdr",519,"name")="shmpool_buff_hdr.shadow_file_header.n_bg_update_creates"
+	Set gtmtypes("shmpool_buff_hdr",519,"off")=4272
 	Set gtmtypes("shmpool_buff_hdr",519,"len")=8
 	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_bg_update_creates")=519
+	Set gtmtypes("shmpool_buff_hdr",520,"name")="shmpool_buff_hdr.shadow_file_header.n_bg_update_creates.curr_count"
+	Set gtmtypes("shmpool_buff_hdr",520,"off")=4272
 	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_bg_update_creates.curr_count")=520
+	Set gtmtypes("shmpool_buff_hdr",521,"name")="shmpool_buff_hdr.shadow_file_header.n_bg_update_creates.cumul_count"
+	Set gtmtypes("shmpool_buff_hdr",521,"off")=4276
 	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_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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_bg_update_creates.cumul_count")=521
+	Set gtmtypes("shmpool_buff_hdr",522,"name")="shmpool_buff_hdr.shadow_file_header.n_db_csh_getns"
+	Set gtmtypes("shmpool_buff_hdr",522,"off")=4280
+	Set gtmtypes("shmpool_buff_hdr",522,"len")=8
+	Set gtmtypes("shmpool_buff_hdr",522,"type")="db_csh_acct_rec"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_db_csh_getns")=522
+	Set gtmtypes("shmpool_buff_hdr",523,"name")="shmpool_buff_hdr.shadow_file_header.n_db_csh_getns.curr_count"
+	Set gtmtypes("shmpool_buff_hdr",523,"off")=4280
+	Set gtmtypes("shmpool_buff_hdr",523,"len")=4
+	Set gtmtypes("shmpool_buff_hdr",523,"type")="int"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_db_csh_getns.curr_count")=523
+	Set gtmtypes("shmpool_buff_hdr",524,"name")="shmpool_buff_hdr.shadow_file_header.n_db_csh_getns.cumul_count"
+	Set gtmtypes("shmpool_buff_hdr",524,"off")=4284
+	Set gtmtypes("shmpool_buff_hdr",524,"len")=4
+	Set gtmtypes("shmpool_buff_hdr",524,"type")="int"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_db_csh_getns.cumul_count")=524
+	Set gtmtypes("shmpool_buff_hdr",525,"name")="shmpool_buff_hdr.shadow_file_header.n_db_csh_getn_lcnt"
+	Set gtmtypes("shmpool_buff_hdr",525,"off")=4288
 	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_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_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_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_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_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",525,"type")="db_csh_acct_rec"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_db_csh_getn_lcnt")=525
+	Set gtmtypes("shmpool_buff_hdr",526,"name")="shmpool_buff_hdr.shadow_file_header.n_db_csh_getn_lcnt.curr_count"
+	Set gtmtypes("shmpool_buff_hdr",526,"off")=4288
+	Set gtmtypes("shmpool_buff_hdr",526,"len")=4
+	Set gtmtypes("shmpool_buff_hdr",526,"type")="int"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_db_csh_getn_lcnt.curr_count")=526
+	Set gtmtypes("shmpool_buff_hdr",527,"name")="shmpool_buff_hdr.shadow_file_header.n_db_csh_getn_lcnt.cumul_count"
+	Set gtmtypes("shmpool_buff_hdr",527,"off")=4292
+	Set gtmtypes("shmpool_buff_hdr",527,"len")=4
+	Set gtmtypes("shmpool_buff_hdr",527,"type")="int"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_db_csh_getn_lcnt.cumul_count")=527
+	Set gtmtypes("shmpool_buff_hdr",528,"name")="shmpool_buff_hdr.shadow_file_header.db_csh_acct_rec_filler_4k"
+	Set gtmtypes("shmpool_buff_hdr",528,"off")=4296
+	Set gtmtypes("shmpool_buff_hdr",528,"len")=152
+	Set gtmtypes("shmpool_buff_hdr",528,"type")="char"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.db_csh_acct_rec_filler_4k")=528
+	Set gtmtypes("shmpool_buff_hdr",529,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec"
+	Set gtmtypes("shmpool_buff_hdr",529,"off")=4448
+	Set gtmtypes("shmpool_buff_hdr",529,"len")=472
+	Set gtmtypes("shmpool_buff_hdr",529,"type")="gvstats_rec_t"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec")=529
+	Set gtmtypes("shmpool_buff_hdr",530,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_set"
+	Set gtmtypes("shmpool_buff_hdr",530,"off")=4448
 	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_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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_set")=530
+	Set gtmtypes("shmpool_buff_hdr",531,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_kill"
+	Set gtmtypes("shmpool_buff_hdr",531,"off")=4456
 	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_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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_kill")=531
+	Set gtmtypes("shmpool_buff_hdr",532,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_get"
+	Set gtmtypes("shmpool_buff_hdr",532,"off")=4464
 	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_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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_get")=532
+	Set gtmtypes("shmpool_buff_hdr",533,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_data"
+	Set gtmtypes("shmpool_buff_hdr",533,"off")=4472
 	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.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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_data")=533
+	Set gtmtypes("shmpool_buff_hdr",534,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_order"
+	Set gtmtypes("shmpool_buff_hdr",534,"off")=4480
 	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_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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_order")=534
+	Set gtmtypes("shmpool_buff_hdr",535,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_zprev"
+	Set gtmtypes("shmpool_buff_hdr",535,"off")=4488
 	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_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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_zprev")=535
+	Set gtmtypes("shmpool_buff_hdr",536,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_query"
+	Set gtmtypes("shmpool_buff_hdr",536,"off")=4496
 	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_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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_query")=536
+	Set gtmtypes("shmpool_buff_hdr",537,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_lock_success"
+	Set gtmtypes("shmpool_buff_hdr",537,"off")=4504
 	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_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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_lock_success")=537
+	Set gtmtypes("shmpool_buff_hdr",538,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_lock_fail"
+	Set gtmtypes("shmpool_buff_hdr",538,"off")=4512
 	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_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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_lock_fail")=538
+	Set gtmtypes("shmpool_buff_hdr",539,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.db_curr_tn"
+	Set gtmtypes("shmpool_buff_hdr",539,"off")=4520
 	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_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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.db_curr_tn")=539
+	Set gtmtypes("shmpool_buff_hdr",540,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_dsk_read"
+	Set gtmtypes("shmpool_buff_hdr",540,"off")=4528
 	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_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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_dsk_read")=540
+	Set gtmtypes("shmpool_buff_hdr",541,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_dsk_write"
+	Set gtmtypes("shmpool_buff_hdr",541,"off")=4536
 	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_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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_dsk_write")=541
+	Set gtmtypes("shmpool_buff_hdr",542,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_nontp_readwrite"
+	Set gtmtypes("shmpool_buff_hdr",542,"off")=4544
 	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_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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_nontp_readwrite")=542
+	Set gtmtypes("shmpool_buff_hdr",543,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_nontp_readonly"
+	Set gtmtypes("shmpool_buff_hdr",543,"off")=4552
 	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_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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_nontp_readonly")=543
+	Set gtmtypes("shmpool_buff_hdr",544,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_nontp_blkwrite"
+	Set gtmtypes("shmpool_buff_hdr",544,"off")=4560
 	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_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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_nontp_blkwrite")=544
+	Set gtmtypes("shmpool_buff_hdr",545,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_nontp_blkread"
+	Set gtmtypes("shmpool_buff_hdr",545,"off")=4568
 	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_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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_nontp_blkread")=545
+	Set gtmtypes("shmpool_buff_hdr",546,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_nontp_retries_0"
+	Set gtmtypes("shmpool_buff_hdr",546,"off")=4576
 	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_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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_nontp_retries_0")=546
+	Set gtmtypes("shmpool_buff_hdr",547,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_nontp_retries_1"
+	Set gtmtypes("shmpool_buff_hdr",547,"off")=4584
 	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_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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_nontp_retries_1")=547
+	Set gtmtypes("shmpool_buff_hdr",548,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_nontp_retries_2"
+	Set gtmtypes("shmpool_buff_hdr",548,"off")=4592
 	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_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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_nontp_retries_2")=548
+	Set gtmtypes("shmpool_buff_hdr",549,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_nontp_retries_3"
+	Set gtmtypes("shmpool_buff_hdr",549,"off")=4600
 	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_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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_nontp_retries_3")=549
+	Set gtmtypes("shmpool_buff_hdr",550,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_tp_readwrite"
+	Set gtmtypes("shmpool_buff_hdr",550,"off")=4608
 	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_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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_tp_readwrite")=550
+	Set gtmtypes("shmpool_buff_hdr",551,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_tp_readonly"
+	Set gtmtypes("shmpool_buff_hdr",551,"off")=4616
 	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_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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_tp_readonly")=551
+	Set gtmtypes("shmpool_buff_hdr",552,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_tp_rolledback"
+	Set gtmtypes("shmpool_buff_hdr",552,"off")=4624
 	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_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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_tp_rolledback")=552
+	Set gtmtypes("shmpool_buff_hdr",553,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_tp_blkwrite"
+	Set gtmtypes("shmpool_buff_hdr",553,"off")=4632
 	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_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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_tp_blkwrite")=553
+	Set gtmtypes("shmpool_buff_hdr",554,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_tp_blkread"
+	Set gtmtypes("shmpool_buff_hdr",554,"off")=4640
 	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_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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_tp_blkread")=554
+	Set gtmtypes("shmpool_buff_hdr",555,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_tp_tot_retries_0"
+	Set gtmtypes("shmpool_buff_hdr",555,"off")=4648
 	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_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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_tp_tot_retries_0")=555
+	Set gtmtypes("shmpool_buff_hdr",556,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_tp_tot_retries_1"
+	Set gtmtypes("shmpool_buff_hdr",556,"off")=4656
 	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_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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_tp_tot_retries_1")=556
+	Set gtmtypes("shmpool_buff_hdr",557,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_tp_tot_retries_2"
+	Set gtmtypes("shmpool_buff_hdr",557,"off")=4664
 	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_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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_tp_tot_retries_2")=557
+	Set gtmtypes("shmpool_buff_hdr",558,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_tp_tot_retries_3"
+	Set gtmtypes("shmpool_buff_hdr",558,"off")=4672
 	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_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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_tp_tot_retries_3")=558
+	Set gtmtypes("shmpool_buff_hdr",559,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_tp_tot_retries_4"
+	Set gtmtypes("shmpool_buff_hdr",559,"off")=4680
 	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.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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_tp_tot_retries_4")=559
+	Set gtmtypes("shmpool_buff_hdr",560,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_tp_cnflct_retries_0"
+	Set gtmtypes("shmpool_buff_hdr",560,"off")=4688
 	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_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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_tp_cnflct_retries_0")=560
+	Set gtmtypes("shmpool_buff_hdr",561,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_tp_cnflct_retries_1"
+	Set gtmtypes("shmpool_buff_hdr",561,"off")=4696
 	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.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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_tp_cnflct_retries_1")=561
+	Set gtmtypes("shmpool_buff_hdr",562,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_tp_cnflct_retries_2"
+	Set gtmtypes("shmpool_buff_hdr",562,"off")=4704
 	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_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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_tp_cnflct_retries_2")=562
+	Set gtmtypes("shmpool_buff_hdr",563,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_tp_cnflct_retries_3"
+	Set gtmtypes("shmpool_buff_hdr",563,"off")=4712
 	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.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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_tp_cnflct_retries_3")=563
+	Set gtmtypes("shmpool_buff_hdr",564,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_tp_cnflct_retries_4"
+	Set gtmtypes("shmpool_buff_hdr",564,"off")=4720
 	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_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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_tp_cnflct_retries_4")=564
+	Set gtmtypes("shmpool_buff_hdr",565,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_ztrigger"
+	Set gtmtypes("shmpool_buff_hdr",565,"off")=4728
 	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_ztrigger")=565
+	Set gtmtypes("shmpool_buff_hdr",566,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_db_flush"
+	Set gtmtypes("shmpool_buff_hdr",566,"off")=4736
 	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_db_flush")=566
+	Set gtmtypes("shmpool_buff_hdr",567,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_db_fsync"
+	Set gtmtypes("shmpool_buff_hdr",567,"off")=4744
 	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.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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_db_fsync")=567
+	Set gtmtypes("shmpool_buff_hdr",568,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_jnl_flush"
+	Set gtmtypes("shmpool_buff_hdr",568,"off")=4752
 	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_jnl_flush")=568
+	Set gtmtypes("shmpool_buff_hdr",569,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_jnl_fsync"
+	Set gtmtypes("shmpool_buff_hdr",569,"off")=4760
 	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_jnl_fsync")=569
+	Set gtmtypes("shmpool_buff_hdr",570,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_jbuff_bytes"
+	Set gtmtypes("shmpool_buff_hdr",570,"off")=4768
 	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_jbuff_bytes")=570
+	Set gtmtypes("shmpool_buff_hdr",571,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_jfile_bytes"
+	Set gtmtypes("shmpool_buff_hdr",571,"off")=4776
 	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_jfile_bytes")=571
+	Set gtmtypes("shmpool_buff_hdr",572,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_jfile_writes"
+	Set gtmtypes("shmpool_buff_hdr",572,"off")=4784
 	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_jfile_writes")=572
+	Set gtmtypes("shmpool_buff_hdr",573,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_jrec_logical"
+	Set gtmtypes("shmpool_buff_hdr",573,"off")=4792
 	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_jrec_logical")=573
+	Set gtmtypes("shmpool_buff_hdr",574,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_jrec_pblk"
+	Set gtmtypes("shmpool_buff_hdr",574,"off")=4800
 	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_jrec_pblk")=574
+	Set gtmtypes("shmpool_buff_hdr",575,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_jrec_epoch_regular"
+	Set gtmtypes("shmpool_buff_hdr",575,"off")=4808
 	Set gtmtypes("shmpool_buff_hdr",575,"len")=8
 	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_jrec_epoch_regular")=575
+	Set gtmtypes("shmpool_buff_hdr",576,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_jrec_epoch_idle"
+	Set gtmtypes("shmpool_buff_hdr",576,"off")=4816
 	Set gtmtypes("shmpool_buff_hdr",576,"len")=8
 	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_jrec_epoch_idle")=576
+	Set gtmtypes("shmpool_buff_hdr",577,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_jrec_other"
+	Set gtmtypes("shmpool_buff_hdr",577,"off")=4824
 	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.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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_jrec_other")=577
+	Set gtmtypes("shmpool_buff_hdr",578,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_jnl_extends"
+	Set gtmtypes("shmpool_buff_hdr",578,"off")=4832
 	Set gtmtypes("shmpool_buff_hdr",578,"len")=8
 	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_jnl_extends")=578
+	Set gtmtypes("shmpool_buff_hdr",579,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_db_extends"
+	Set gtmtypes("shmpool_buff_hdr",579,"off")=4840
 	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_db_extends")=579
+	Set gtmtypes("shmpool_buff_hdr",580,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_crit_success"
+	Set gtmtypes("shmpool_buff_hdr",580,"off")=4848
 	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_crit_success")=580
+	Set gtmtypes("shmpool_buff_hdr",581,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_crits_in_epch"
+	Set gtmtypes("shmpool_buff_hdr",581,"off")=4856
 	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_crits_in_epch")=581
+	Set gtmtypes("shmpool_buff_hdr",582,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.sq_crit_failed"
+	Set gtmtypes("shmpool_buff_hdr",582,"off")=4864
 	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.sq_crit_failed")=582
+	Set gtmtypes("shmpool_buff_hdr",583,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_crit_failed"
+	Set gtmtypes("shmpool_buff_hdr",583,"off")=4872
+	Set gtmtypes("shmpool_buff_hdr",583,"len")=8
+	Set gtmtypes("shmpool_buff_hdr",583,"type")="uint64_t"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_crit_failed")=583
+	Set gtmtypes("shmpool_buff_hdr",584,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.sq_crit_que_slps"
+	Set gtmtypes("shmpool_buff_hdr",584,"off")=4880
+	Set gtmtypes("shmpool_buff_hdr",584,"len")=8
+	Set gtmtypes("shmpool_buff_hdr",584,"type")="uint64_t"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.sq_crit_que_slps")=584
+	Set gtmtypes("shmpool_buff_hdr",585,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_crit_que_slps"
+	Set gtmtypes("shmpool_buff_hdr",585,"off")=4888
+	Set gtmtypes("shmpool_buff_hdr",585,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",585,"type")="uint64_t"
-	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.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")="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")="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")="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")="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")="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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_crit_que_slps")=585
+	Set gtmtypes("shmpool_buff_hdr",586,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.sq_crit_yields"
+	Set gtmtypes("shmpool_buff_hdr",586,"off")=4896
+	Set gtmtypes("shmpool_buff_hdr",586,"len")=8
+	Set gtmtypes("shmpool_buff_hdr",586,"type")="uint64_t"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.sq_crit_yields")=586
+	Set gtmtypes("shmpool_buff_hdr",587,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_crit_yields"
+	Set gtmtypes("shmpool_buff_hdr",587,"off")=4904
+	Set gtmtypes("shmpool_buff_hdr",587,"len")=8
+	Set gtmtypes("shmpool_buff_hdr",587,"type")="uint64_t"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_crit_yields")=587
+	Set gtmtypes("shmpool_buff_hdr",588,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_clean2dirty"
+	Set gtmtypes("shmpool_buff_hdr",588,"off")=4912
+	Set gtmtypes("shmpool_buff_hdr",588,"len")=8
+	Set gtmtypes("shmpool_buff_hdr",588,"type")="uint64_t"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_clean2dirty")=588
+	Set gtmtypes("shmpool_buff_hdr",589,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec_filler_4k_plus_512"
+	Set gtmtypes("shmpool_buff_hdr",589,"off")=4920
+	Set gtmtypes("shmpool_buff_hdr",589,"len")=40
+	Set gtmtypes("shmpool_buff_hdr",589,"type")="char"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec_filler_4k_plus_512")=589
+	Set gtmtypes("shmpool_buff_hdr",590,"name")="shmpool_buff_hdr.shadow_file_header.filler_4k_plus_512"
+	Set gtmtypes("shmpool_buff_hdr",590,"off")=4960
+	Set gtmtypes("shmpool_buff_hdr",590,"len")=368
+	Set gtmtypes("shmpool_buff_hdr",590,"type")="char"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.filler_4k_plus_512")=590
+	Set gtmtypes("shmpool_buff_hdr",591,"name")="shmpool_buff_hdr.shadow_file_header.intrpt_recov_resync_strm_seqno"
+	Set gtmtypes("shmpool_buff_hdr",591,"off")=5328
+	Set gtmtypes("shmpool_buff_hdr",591,"len")=128
+	Set gtmtypes("shmpool_buff_hdr",591,"type")="uint64_t"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.intrpt_recov_resync_strm_seqno")=591
+	Set gtmtypes("shmpool_buff_hdr",591,"dim")=16
+	Set gtmtypes("shmpool_buff_hdr",592,"name")="shmpool_buff_hdr.shadow_file_header.creation_db_ver"
+	Set gtmtypes("shmpool_buff_hdr",592,"off")=5456
+	Set gtmtypes("shmpool_buff_hdr",592,"len")=4
+	Set gtmtypes("shmpool_buff_hdr",592,"type")="int"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.creation_db_ver")=592
+	Set gtmtypes("shmpool_buff_hdr",593,"name")="shmpool_buff_hdr.shadow_file_header.creation_mdb_ver"
+	Set gtmtypes("shmpool_buff_hdr",593,"off")=5460
+	Set gtmtypes("shmpool_buff_hdr",593,"len")=4
+	Set gtmtypes("shmpool_buff_hdr",593,"type")="int"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.creation_mdb_ver")=593
+	Set gtmtypes("shmpool_buff_hdr",594,"name")="shmpool_buff_hdr.shadow_file_header.certified_for_upgrade_to"
+	Set gtmtypes("shmpool_buff_hdr",594,"off")=5464
+	Set gtmtypes("shmpool_buff_hdr",594,"len")=4
+	Set gtmtypes("shmpool_buff_hdr",594,"type")="int"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.certified_for_upgrade_to")=594
+	Set gtmtypes("shmpool_buff_hdr",595,"name")="shmpool_buff_hdr.shadow_file_header.filler_5k"
+	Set gtmtypes("shmpool_buff_hdr",595,"off")=5468
+	Set gtmtypes("shmpool_buff_hdr",595,"len")=4
+	Set gtmtypes("shmpool_buff_hdr",595,"type")="int"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.filler_5k")=595
+	Set gtmtypes("shmpool_buff_hdr",596,"name")="shmpool_buff_hdr.shadow_file_header.secshr_ops_index_filler"
+	Set gtmtypes("shmpool_buff_hdr",596,"off")=5472
+	Set gtmtypes("shmpool_buff_hdr",596,"len")=4
+	Set gtmtypes("shmpool_buff_hdr",596,"type")="int"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.secshr_ops_index_filler")=596
+	Set gtmtypes("shmpool_buff_hdr",597,"name")="shmpool_buff_hdr.shadow_file_header.secshr_ops_array_filler"
+	Set gtmtypes("shmpool_buff_hdr",597,"off")=5476
+	Set gtmtypes("shmpool_buff_hdr",597,"len")=1020
 	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.secshr_ops_array_filler")=597
+	Set gtmtypes("shmpool_buff_hdr",597,"dim")=255
+	Set gtmtypes("shmpool_buff_hdr",598,"name")="shmpool_buff_hdr.shadow_file_header.next_upgrd_warn"
+	Set gtmtypes("shmpool_buff_hdr",598,"off")=6496
+	Set gtmtypes("shmpool_buff_hdr",598,"len")=24
+	Set gtmtypes("shmpool_buff_hdr",598,"type")="compswap_time_field"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.next_upgrd_warn")=598
+	Set gtmtypes("shmpool_buff_hdr",599,"name")="shmpool_buff_hdr.shadow_file_header.next_upgrd_warn.time_latch"
+	Set gtmtypes("shmpool_buff_hdr",599,"off")=6496
+	Set gtmtypes("shmpool_buff_hdr",599,"len")=8
+	Set gtmtypes("shmpool_buff_hdr",599,"type")="global_latch_t"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.next_upgrd_warn.time_latch")=599
+	Set gtmtypes("shmpool_buff_hdr",600,"name")="shmpool_buff_hdr.shadow_file_header.next_upgrd_warn.time_latch.u"
+	Set gtmtypes("shmpool_buff_hdr",600,"off")=6496
+	Set gtmtypes("shmpool_buff_hdr",600,"len")=8
+	Set gtmtypes("shmpool_buff_hdr",600,"type")="union"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.next_upgrd_warn.time_latch.u")=600
+	Set gtmtypes("shmpool_buff_hdr",601,"name")="shmpool_buff_hdr.shadow_file_header.next_upgrd_warn.time_latch.u.pid_imgcnt"
+	Set gtmtypes("shmpool_buff_hdr",601,"off")=6496
+	Set gtmtypes("shmpool_buff_hdr",601,"len")=8
+	Set gtmtypes("shmpool_buff_hdr",601,"type")="uint64_t"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.next_upgrd_warn.time_latch.u.pid_imgcnt")=601
+	Set gtmtypes("shmpool_buff_hdr",602,"name")="shmpool_buff_hdr.shadow_file_header.next_upgrd_warn.time_latch.u.parts"
+	Set gtmtypes("shmpool_buff_hdr",602,"off")=6496
+	Set gtmtypes("shmpool_buff_hdr",602,"len")=8
+	Set gtmtypes("shmpool_buff_hdr",602,"type")="struct"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.next_upgrd_warn.time_latch.u.parts")=602
+	Set gtmtypes("shmpool_buff_hdr",603,"name")="shmpool_buff_hdr.shadow_file_header.next_upgrd_warn.time_latch.u.parts.latch_pid"
+	Set gtmtypes("shmpool_buff_hdr",603,"off")=6496
+	Set gtmtypes("shmpool_buff_hdr",603,"len")=4
+	Set gtmtypes("shmpool_buff_hdr",603,"type")="int"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.next_upgrd_warn.time_latch.u.parts.latch_pid")=603
+	Set gtmtypes("shmpool_buff_hdr",604,"name")="shmpool_buff_hdr.shadow_file_header.next_upgrd_warn.time_latch.u.parts.latch_word"
+	Set gtmtypes("shmpool_buff_hdr",604,"off")=6500
 	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",604,"type")="int"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.next_upgrd_warn.time_latch.u.parts.latch_word")=604
+	Set gtmtypes("shmpool_buff_hdr",605,"name")="shmpool_buff_hdr.shadow_file_header.next_upgrd_warn.hp_latch_space"
+	Set gtmtypes("shmpool_buff_hdr",605,"off")=6504
+	Set gtmtypes("shmpool_buff_hdr",605,"len")=16
+	Set gtmtypes("shmpool_buff_hdr",605,"type")="int"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.next_upgrd_warn.hp_latch_space")=605
+	Set gtmtypes("shmpool_buff_hdr",605,"dim")=4
+	Set gtmtypes("shmpool_buff_hdr",606,"name")="shmpool_buff_hdr.shadow_file_header.is_encrypted"
+	Set gtmtypes("shmpool_buff_hdr",606,"off")=6520
 	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",606,"type")="unsigned-int"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.is_encrypted")=606
+	Set gtmtypes("shmpool_buff_hdr",607,"name")="shmpool_buff_hdr.shadow_file_header.db_trigger_cycle"
+	Set gtmtypes("shmpool_buff_hdr",607,"off")=6524
 	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",607,"type")="unsigned-int"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.db_trigger_cycle")=607
+	Set gtmtypes("shmpool_buff_hdr",608,"name")="shmpool_buff_hdr.shadow_file_header.strm_reg_seqno"
+	Set gtmtypes("shmpool_buff_hdr",608,"off")=6528
+	Set gtmtypes("shmpool_buff_hdr",608,"len")=128
+	Set gtmtypes("shmpool_buff_hdr",608,"type")="uint64_t"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.strm_reg_seqno")=608
+	Set gtmtypes("shmpool_buff_hdr",608,"dim")=16
+	Set gtmtypes("shmpool_buff_hdr",609,"name")="shmpool_buff_hdr.shadow_file_header.save_strm_reg_seqno"
+	Set gtmtypes("shmpool_buff_hdr",609,"off")=6656
+	Set gtmtypes("shmpool_buff_hdr",609,"len")=128
+	Set gtmtypes("shmpool_buff_hdr",609,"type")="uint64_t"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.save_strm_reg_seqno")=609
+	Set gtmtypes("shmpool_buff_hdr",609,"dim")=16
+	Set gtmtypes("shmpool_buff_hdr",610,"name")="shmpool_buff_hdr.shadow_file_header.freeze_on_fail"
+	Set gtmtypes("shmpool_buff_hdr",610,"off")=6784
 	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.freeze_on_fail")=610
+	Set gtmtypes("shmpool_buff_hdr",611,"name")="shmpool_buff_hdr.shadow_file_header.span_node_absent"
+	Set gtmtypes("shmpool_buff_hdr",611,"off")=6788
 	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.span_node_absent")=611
+	Set gtmtypes("shmpool_buff_hdr",612,"name")="shmpool_buff_hdr.shadow_file_header.maxkeysz_assured"
+	Set gtmtypes("shmpool_buff_hdr",612,"off")=6792
 	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("shmpool_buff_hdr",612,"type")="boolean_t"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.maxkeysz_assured")=612
+	Set gtmtypes("shmpool_buff_hdr",613,"name")="shmpool_buff_hdr.shadow_file_header.hasht_upgrade_needed"
+	Set gtmtypes("shmpool_buff_hdr",613,"off")=6796
+	Set gtmtypes("shmpool_buff_hdr",613,"len")=4
+	Set gtmtypes("shmpool_buff_hdr",613,"type")="boolean_t"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.hasht_upgrade_needed")=613
+	Set gtmtypes("shmpool_buff_hdr",614,"name")="shmpool_buff_hdr.shadow_file_header.defer_allocate"
+	Set gtmtypes("shmpool_buff_hdr",614,"off")=6800
+	Set gtmtypes("shmpool_buff_hdr",614,"len")=4
+	Set gtmtypes("shmpool_buff_hdr",614,"type")="boolean_t"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.defer_allocate")=614
+	Set gtmtypes("shmpool_buff_hdr",615,"name")="shmpool_buff_hdr.shadow_file_header.filler_ftok_counter_halted"
+	Set gtmtypes("shmpool_buff_hdr",615,"off")=6804
+	Set gtmtypes("shmpool_buff_hdr",615,"len")=4
+	Set gtmtypes("shmpool_buff_hdr",615,"type")="boolean_t"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.filler_ftok_counter_halted")=615
+	Set gtmtypes("shmpool_buff_hdr",616,"name")="shmpool_buff_hdr.shadow_file_header.filler_access_counter_halted"
+	Set gtmtypes("shmpool_buff_hdr",616,"off")=6808
+	Set gtmtypes("shmpool_buff_hdr",616,"len")=4
+	Set gtmtypes("shmpool_buff_hdr",616,"type")="boolean_t"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.filler_access_counter_halted")=616
+	Set gtmtypes("shmpool_buff_hdr",617,"name")="shmpool_buff_hdr.shadow_file_header.lock_crit_with_db"
+	Set gtmtypes("shmpool_buff_hdr",617,"off")=6812
+	Set gtmtypes("shmpool_buff_hdr",617,"len")=4
+	Set gtmtypes("shmpool_buff_hdr",617,"type")="boolean_t"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.lock_crit_with_db")=617
+	Set gtmtypes("shmpool_buff_hdr",618,"name")="shmpool_buff_hdr.shadow_file_header.basedb_fname_len"
+	Set gtmtypes("shmpool_buff_hdr",618,"off")=6816
+	Set gtmtypes("shmpool_buff_hdr",618,"len")=4
+	Set gtmtypes("shmpool_buff_hdr",618,"type")="unsigned-int"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.basedb_fname_len")=618
+	Set gtmtypes("shmpool_buff_hdr",619,"name")="shmpool_buff_hdr.shadow_file_header.basedb_fname"
+	Set gtmtypes("shmpool_buff_hdr",619,"off")=6820
+	Set gtmtypes("shmpool_buff_hdr",619,"len")=256
+	Set gtmtypes("shmpool_buff_hdr",619,"type")="unsigned-char"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.basedb_fname")=619
+	Set gtmtypes("shmpool_buff_hdr",620,"name")="shmpool_buff_hdr.shadow_file_header.filler_7k"
+	Set gtmtypes("shmpool_buff_hdr",620,"off")=7076
+	Set gtmtypes("shmpool_buff_hdr",620,"len")=444
+	Set gtmtypes("shmpool_buff_hdr",620,"type")="char"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.filler_7k")=620
+	Set gtmtypes("shmpool_buff_hdr",621,"name")="shmpool_buff_hdr.shadow_file_header.filler_8k"
+	Set gtmtypes("shmpool_buff_hdr",621,"off")=7520
+	Set gtmtypes("shmpool_buff_hdr",621,"len")=1024
+	Set gtmtypes("shmpool_buff_hdr",621,"type")="char"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.filler_8k")=621
 	;
 	Set gtmtypes("show_reply")="struct"
 	Set gtmtypes("show_reply",0)=2
@@ -37637,43 +38681,18 @@ Init
 	Set gtmtypfldindx("stringkey","hash_code")=5
 	;
 	Set gtmtypes("struct_jrec_align")="struct"
-	Set gtmtypes("struct_jrec_align",0)=7
-	Set gtmtypes("struct_jrec_align","len")=32
-	Set gtmtypes("struct_jrec_align",1,"name")="struct_jrec_align.prefix"
-	Set gtmtypes("struct_jrec_align",1,"off")=0
-	Set gtmtypes("struct_jrec_align",1,"len")=24
-	Set gtmtypes("struct_jrec_align",1,"type")="jrec_prefix"
-	Set gtmtypfldindx("struct_jrec_align","prefix")=1
-	Set gtmtypes("struct_jrec_align",2,"name")="struct_jrec_align.prefix.pini_addr"
-	Set gtmtypes("struct_jrec_align",2,"off")=4
+	Set gtmtypes("struct_jrec_align",0)=2
+	Set gtmtypes("struct_jrec_align","len")=12
+	Set gtmtypes("struct_jrec_align",1,"name")="struct_jrec_align.checksum"
+	Set gtmtypes("struct_jrec_align",1,"off")=4
+	Set gtmtypes("struct_jrec_align",1,"len")=4
+	Set gtmtypes("struct_jrec_align",1,"type")="unsigned-int"
+	Set gtmtypfldindx("struct_jrec_align","checksum")=1
+	Set gtmtypes("struct_jrec_align",2,"name")="struct_jrec_align.time"
+	Set gtmtypes("struct_jrec_align",2,"off")=8
 	Set gtmtypes("struct_jrec_align",2,"len")=4
 	Set gtmtypes("struct_jrec_align",2,"type")="unsigned-int"
-	Set gtmtypfldindx("struct_jrec_align","prefix.pini_addr")=2
-	Set gtmtypes("struct_jrec_align",3,"name")="struct_jrec_align.prefix.time"
-	Set gtmtypes("struct_jrec_align",3,"off")=8
-	Set gtmtypes("struct_jrec_align",3,"len")=4
-	Set gtmtypes("struct_jrec_align",3,"type")="unsigned-int"
-	Set gtmtypfldindx("struct_jrec_align","prefix.time")=3
-	Set gtmtypes("struct_jrec_align",4,"name")="struct_jrec_align.prefix.checksum"
-	Set gtmtypes("struct_jrec_align",4,"off")=12
-	Set gtmtypes("struct_jrec_align",4,"len")=4
-	Set gtmtypes("struct_jrec_align",4,"type")="unsigned-int"
-	Set gtmtypfldindx("struct_jrec_align","prefix.checksum")=4
-	Set gtmtypes("struct_jrec_align",5,"name")="struct_jrec_align.prefix.tn"
-	Set gtmtypes("struct_jrec_align",5,"off")=16
-	Set gtmtypes("struct_jrec_align",5,"len")=8
-	Set gtmtypes("struct_jrec_align",5,"type")="uint64_t"
-	Set gtmtypfldindx("struct_jrec_align","prefix.tn")=5
-	Set gtmtypes("struct_jrec_align",6,"name")="struct_jrec_align.align_str"
-	Set gtmtypes("struct_jrec_align",6,"off")=24
-	Set gtmtypes("struct_jrec_align",6,"len")=8
-	Set gtmtypes("struct_jrec_align",6,"type")="jnl_string"
-	Set gtmtypfldindx("struct_jrec_align","align_str")=6
-	Set gtmtypes("struct_jrec_align",7,"name")="struct_jrec_align.align_str.text"
-	Set gtmtypes("struct_jrec_align",7,"off")=28
-	Set gtmtypes("struct_jrec_align",7,"len")=1
-	Set gtmtypes("struct_jrec_align",7,"type")="char"
-	Set gtmtypfldindx("struct_jrec_align","align_str.text")=7
+	Set gtmtypfldindx("struct_jrec_align","time")=2
 	;
 	Set gtmtypes("struct_jrec_blk")="struct"
 	Set gtmtypes("struct_jrec_blk",0)=10
@@ -40648,7 +41667,7 @@ Init
 	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 gtmtypes("unix_db_info",122,"type")="int"
 	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
diff --git a/sr_i386/merrors_ansi.h b/sr_i386/merrors_ansi.h
index ddf134a..9b6ba07 100644
--- a/sr_i386/merrors_ansi.h
+++ b/sr_i386/merrors_ansi.h
@@ -402,7 +402,7 @@ const static readonly int error_ansi[] = {
 	   0,	/* CCECLSTPRCS */
 	   0,	/* ZSHOWBADFUNC */
 	   0,	/* NOTALLJNLEN */
-	   0,	/* UNUSEDMSG570 */
+	   0,	/* BADLOCKNEST */
 	   0,	/* NOLBRSRC */
 	   0,	/* INVZSTEP */
 	   0,	/* ZSTEPARG */
@@ -502,7 +502,7 @@ const static readonly int error_ansi[] = {
 	   0,	/* CETOOLONG */
 	   0,	/* CENOINDIR */
 	   0,	/* COLLATIONUNDEF */
-	   0,	/* UNUSEDMSG670 */
+	   0,	/* UNUSEDMSG673 */
 	   0,	/* GTMSECSHRSRVF */
 	   0,	/* FREEZECTRL */
 	   0,	/* JNLFLUSH */
@@ -608,7 +608,7 @@ const static readonly int error_ansi[] = {
 	   0,	/* MEMORYRECURSIVE */
 	   0,	/* FREEZEID */
 	   0,	/* BLKWRITERR */
-	   0,	/* UNUSEDMSG776 */
+	   0,	/* UNUSEDMSG779 */
 	   0,	/* PINENTRYERR */
 	   0,	/* BCKUPBUFLUSH */
 	   0,	/* NOFORKCORE */
@@ -1148,7 +1148,7 @@ const static readonly int error_ansi[] = {
 	   0,	/* CRYPTDLNOOPEN */
 	   0,	/* CRYPTNOV4 */
 	   0,	/* CRYPTNOMM */
-	   0,	/* UNUSEDMSG1316 */
+	   0,	/* UNUSEDMSG1319 */
 	   0,	/* CRYPTKEYFETCHFAILED */
 	   0,	/* CRYPTKEYFETCHFAILEDNF */
 	   0,	/* CRYPTHASHGENFAILED */
@@ -1206,7 +1206,7 @@ const static readonly int error_ansi[] = {
 	   0,	/* MUUSERLBK */
 	   0,	/* SETINSETTRIGONLY */
 	   0,	/* DZTRIGINTRIG */
-	   0,	/* UNUSEDMSG1374 */
+	   0,	/* UNUSEDMSG1377 */
 	   0,	/* BOOLSIDEFFECT */
 	   0,	/* DBBADUPGRDSTATE */
 	   0,	/* WRITEWAITPID */
@@ -1218,7 +1218,7 @@ const static readonly int error_ansi[] = {
 	   0,	/* JNLORDBFLU */
 	   0,	/* ZCCLNUPRTNMISNG */
 	   0,	/* ZCINVALIDKEYWORD */
-	   0,	/* UNUSEDMSG1386 */
+	   0,	/* UNUSEDMSG1389 */
 	   0,	/* DBSHMNAMEDIFF */
 	   0,	/* SHMREMOVED */
 	   0,	/* DEVICEWRITEONLY */
@@ -1359,7 +1359,7 @@ const static readonly int error_ansi[] = {
 	   0,	/* GETNAMEINFO */
 	   0,	/* SOCKBIND */
 	   0,	/* INSTFRZDEFER */
-	   0,	/* UNUSEDMSG1529 */
+	   0,	/* UNUSEDMSG1532 */
 	   0,	/* REGOPENFAIL */
 	   0,	/* REPLINSTNOSHM */
 	   0,	/* DEVPARMTOOSMALL */
@@ -1369,7 +1369,7 @@ const static readonly int error_ansi[] = {
 	   0,	/* GBLNOMAPTOREG */
 	   0,	/* ISSPANGBL */
 	   0,	/* TPNOSUPPORT */
-	   0,	/* UNUSEDMSG1539 */
+	   0,	/* UNUSEDMSG1542 */
 	   0,	/* ZATRANSERR */
 	   0,	/* FILTERTIMEDOUT */
 	   0,	/* TLSDLLNOOPEN */
@@ -1491,4 +1491,11 @@ const static readonly int error_ansi[] = {
 	   0,	/* JNLSWITCHRETRY */
 	   0,	/* JNLSWITCHFAIL */
 	   0,	/* CLISTRTOOLONG */
+	   0,	/* LVMONBADVAL */
+	   0,	/* RESTRICTEDOP */
+	   0,	/* RESTRICTSYNTAX */
+	   0,	/* MUCREFILERR */
+	   0,	/* JNLBUFFPHS2SALVAGE */
+	   0,	/* JNLPOOLPHS2SALVAGE */
+	   0,	/* MURNDWNARGLESS */
 	};
diff --git a/sr_i386/merrors_ctl.c b/sr_i386/merrors_ctl.c
index 47f0528..e9fb7da 100644
--- a/sr_i386/merrors_ctl.c
+++ b/sr_i386/merrors_ctl.c
@@ -258,7 +258,7 @@ LITDEF	err_msg merrors[] = {
 	{ "ZCCONVERT", "External call: error converting output argument", 0 },
 	{ "ZCRTENOTF", "External call routine !AD not found", 2 },
 	{ "GVRUNDOWN", "Error during global database rundown", 0 },
-	{ "LKRUNDOWN", "Error during lock database rundown", 0 },
+	{ "LKRUNDOWN", "Error during LOCK database rundown", 0 },
 	{ "IORUNDOWN", "Error during image rundown", 0 },
 	{ "FILENOTFND", "File !AD not found", 2 },
 	{ "MUFILRNDWNFL", "File !AD rundown failed", 2 },
@@ -349,7 +349,7 @@ LITDEF	err_msg merrors[] = {
 	{ "FNOTONSYS", "Function or special variable is not supported by this operating system", 0 },
 	{ "AMBISYIPARAM", "Parameter !AD is ambiguous to $ZGETSYI()", 2 },
 	{ "PREVJNLNOEOF", "A previous generation journal file !AD does not have valid EOF", 2 },
-	{ "LKSECINIT", "Error creating lock section for database !AD", 2 },
+	{ "LKSECINIT", "Error creating LOCK section for database !AD", 2 },
 	{ "MTDOSLAB", "Tape label is not in valid DOS-11 format", 0 },
 	{ "MTDOSFOR", "Use of DOS-11 labels requires stream format", 0 },
 	{ "MTINVLAB", "Invalid label type specified in magtape OPEN", 0 },
@@ -366,7 +366,7 @@ LITDEF	err_msg merrors[] = {
 	{ "EXTRACTCTRLY", "User interrupt encountered during extract -- halting", 0 },
 	{ "CCENOWORLD", "CCE does not have WORLD privilege.  Information may be incomplete.", 0 },
 	{ "GVQUERYFAIL", "Global variable $QUERY function failed.  Failure code: !AD.", 2 },
-	{ "LCKSCANCELLED", "Error on remote node holding locks or zallocates.  All locks and zallocates cancelled.", 0 },
+	{ "LCKSCANCELLED", "Error on remote node holding LOCKs or ZALLOCATEs.  All LOCKs and ZALLOCATEs cancelled.", 0 },
 	{ "INVNETFILNM", "Invalid file name following node designation in global directory", 0 },
 	{ "NETDBOPNERR", "Error while attempting to open database across net", 0 },
 	{ "BADSRVRNETMSG", "Invalid message received from GT.CM server", 0 },
@@ -404,7 +404,7 @@ LITDEF	err_msg merrors[] = {
 	{ "CCECLSTPRCS", "!UL processes are accessing clustered database files", 1 },
 	{ "ZSHOWBADFUNC", "An illegal function was specified for ZSHOW", 0 },
 	{ "NOTALLJNLEN", "Journaling disabled/off for !AD regions", 2 },
-	{ "UNUSEDMSG570", "ZSHOWGLOSMALL last used in V6.2-002A", 0 },
+	{ "BADLOCKNEST", "Unsupported nesting of LOCK commands", 0 },
 	{ "NOLBRSRC", "Object libraries cannot have SRC paths associated", 0 },
 	{ "INVZSTEP", "Invalid ZSTEP qualifier", 0 },
 	{ "ZSTEPARG", "ZSTEP argument expected", 0 },
@@ -453,7 +453,7 @@ LITDEF	err_msg merrors[] = {
 	{ "ZCWRONGDESC", "A string longer than 65535 is passed via 32-bit descriptor", 0 },
 	{ "MUTNWARN", "Database file !AD has 0x!16 at XQ more transactions to go before reaching the transaction number limit (0x!16 at XQ). Renew database with MUPIP INTEG TN_RESET", 4 },
 	{ "GTMSECSHRUPDDBHDR", "[client pid !UL] database fileheader (!AD) updated !AD", 5 },
-	{ "LCKSTIMOUT", "DAL timed lock request expired", 0 },
+	{ "LCKSTIMOUT", "DAL timed LOCK request expired", 0 },
 	{ "CTLMNEMAXLEN", "The maximum length of a control mnemonic has been exceeded", 0 },
 	{ "CTLMNEXPECTED", "Control mnemonic is expected in this context", 0 },
 	{ "USRIOINIT", "User-defined device driver not successfully initialized", 0 },
@@ -477,7 +477,7 @@ LITDEF	err_msg merrors[] = {
 	{ "TRIGZBREAKREM", "ZBREAK in trigger !AD removed due to trigger being reloaded", 2 },
 	{ "TLVLZERO", "Transaction is not in progress", 0 },
 	{ "TRESTNOT", "Cannot TRESTART, transaction is not restartable", 0 },
-	{ "TPLOCK", "Cannot release lock(s) held prior to current TSTART", 0 },
+	{ "TPLOCK", "Cannot release LOCK(s) held prior to current TSTART", 0 },
 	{ "TPQUIT", "Cannot QUIT out of a routine with an active transaction", 0 },
 	{ "TPFAIL", "Transaction COMMIT failed.  Failure code: !AD.", 2 },
 	{ "TPRETRY", "Restart transaction from non-concurrency DB failure", 0 },
@@ -504,7 +504,7 @@ LITDEF	err_msg merrors[] = {
 	{ "CETOOLONG", "Compiler escape substitution exceeds maximum line size", 0 },
 	{ "CENOINDIR", "Indirection type information not available for compiler escape feature", 0 },
 	{ "COLLATIONUNDEF", "Collation type !UL is not defined", 1 },
-	{ "UNUSEDMSG670", "RBWRNNOTCHG last used in V6.2-002A", 0 },
+	{ "UNUSEDMSG673", "RBWRNNOTCHG last used in V6.2-002A", 0 },
 	{ "GTMSECSHRSRVF", "!AD - !UL : Attempt to service request failed (retry = !UL)", 4 },
 	{ "FREEZECTRL", "Control Y or control C encountered during attempt to freeze the database. Aborting freeze.", 0 },
 	{ "JNLFLUSH", "Error flushing journal buffers to journal file !AD", 2 },
@@ -610,7 +610,7 @@ 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 },
-	{ "UNUSEDMSG776", "STOPTIMEOUT last used in V6.3-000A", 0 },
+	{ "UNUSEDMSG779", "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 },
@@ -817,16 +817,16 @@ LITDEF	err_msg merrors[] = {
 	{ "LOWSPACECRE", "Disk space for database file !AD is not enough for !UL future extensions.  !@ZQ !UL-byte blocks are needed, only !@ZQ available.", 6 },
 	{ "WAITDSKSPACE", "Process 0x!XL will wait !UL seconds for necessary disk space to become available for !AD ", 4 },
 	{ "OUTOFSPACE", "Database file !AD ran out of disk space.  Detected by process !UL.  !/Exit without clearing shared memory due to the disk space constraints.  !/Make space and then perform mupip rundown to ensure database integrity.", 3 },
-	{ "JNLPVTINFO", "Pid 0x!XL!/     cycle 0x!XL fd_mismatch 0x!XL     channel 0x!XL sync_io 0x!XL!/ pini_addr 0x!XL  qio_active 0x!XL old_channel 0x!XL", 8 },
+	{ "JNLPVTINFO", "Pid 0x!XL cycle 0x!XL fd_mismatch 0x!XL channel 0x!XL sync_io 0x!XL pini_addr 0x!XL qio_active 0x!XL old_channel 0x!XL", 8 },
 	{ "NOSPACEEXT", "Not enough disk space for file !AD to extend.  !UL blocks needed.  !UL blocks available.", 4 },
 	{ "WCBLOCKED", "Field !AD is set by process !UL at transaction number 0x!16 at XQ for database file !AD", 6 },
 	{ "REPLJNLCLOSED", "Replication in jeopardy as journaling got closed for database file !AD. Current region seqno is !@ZQ [0x!16 at XQ] and system seqno is !@ZQ [0x!16 at XQ]", 6 },
 	{ "RENAMEFAIL", "Rename of file !AD to !AD failed", 4 },
 	{ "FILERENAME", "File !AD is renamed to !AD", 4 },
-	{ "JNLBUFINFO", "Pid 0x!XL!/     dsk 0x!XL     free 0x!XL  bytcnt 0x!XL io_in_prog 0x!XL fsync_in_prog 0x!XL!/ dskaddr 0x!XL freeaddr 0x!XL  qiocnt 0x!XL now_writer 0x!XL     fsync_pid 0x!XL!/filesize 0x!XL    cycle 0x!XL  errcnt 0x!XL    wrtsize 0x!XL fsync_dskaddr 0x!XL", 16 },
+	{ "JNLBUFINFO", "Pid 0x!XL dsk 0x!XL free 0x!XL bytcnt 0x!XL io_in_prog 0x!XL fsync_in_prog 0x!XL dskaddr 0x!XL freeaddr 0x!XL qiocnt 0x!XL now_writer 0x!XL fsync_pid 0x!XL filesize 0x!XL cycle 0x!XL errcnt 0x!XL wrtsize 0x!XL fsync_dskaddr 0x!XL rsrv_free 0x!XL rsrv_freeaddr 0x!XL phase2_commit_index1 0x!XL phase2_commit_index2 0x!XL next_align_addr 0x!XL", 21 },
 	{ "SDSEEKERR", "Sequential device seek error - !AD", 2 },
 	{ "LOCALSOCKREQ", "LOCAL socket required", 0 },
-	{ "TPNOTACID", "!AD at !AD in a final TP retry violates ACID properties of a TRANSACTION; indefinite RESTARTs may occur !AD !AD", 8 },
+	{ "TPNOTACID", "!AD at !AD violates ACID properties of a TRANSACTION and could exceed !AD seconds; $TRESTART = !UL and indefinite RESTARTs may occur", 7 },
 	{ "JNLSETDATA2LONG", "SET journal record has data of length !UL.  Target system cannot handle data more than !UL bytes.", 2 },
 	{ "JNLNEWREC", "Target system cannot recognize journal record of type !UL, last recognized type is !UL", 2 },
 	{ "REPLFTOKSEM", "Error with replication semaphores for instance file !AD", 2 },
@@ -1150,7 +1150,7 @@ LITDEF	err_msg merrors[] = {
 	{ "CRYPTDLNOOPEN", "Could not load encryption library while opening encrypted file !AD. !AD", 4 },
 	{ "CRYPTNOV4", "!AD is an encrypted database. Cannot downgrade(to V4) with Encryption option enabled.", 2 },
 	{ "CRYPTNOMM", "!AD is an encrypted database. Cannot support MM access method.", 2 },
-	{ "UNUSEDMSG1316", "Last used in V6.2-002A", 0 },
+	{ "UNUSEDMSG1319", "Last used in V6.2-002A", 0 },
 	{ "CRYPTKEYFETCHFAILED", "Could not retrieve encryption key corresponding to file !AD. !AD", 4 },
 	{ "CRYPTKEYFETCHFAILEDNF", "Could not retrieve encryption key during !AD operation key. !AD", 4 },
 	{ "CRYPTHASHGENFAILED", "Could not generate cryptographic hash for symmetric key corresponding to file !AD. !AD", 4 },
@@ -1208,7 +1208,7 @@ LITDEF	err_msg merrors[] = {
 	{ "MUUSERLBK", "Abnormal shutdown of replication-enabled database !AD detected", 2 },
 	{ "SETINSETTRIGONLY", "ISV !AD can only be modified in a 'SET' type trigger", 2 },
 	{ "DZTRIGINTRIG", "$ZTRIGGER() is not allowed inside trigger context. Trigger name: !AD", 2 },
-	{ "UNUSEDMSG1374", "SECNODZTRIGINTP : Last used in V6.2-000", 0 },
+	{ "UNUSEDMSG1377", "SECNODZTRIGINTP : Last used in V6.2-000", 0 },
 	{ "BOOLSIDEFFECT", "Extrinsic ($$), External call ($&) or $INCREMENT() with potential side effects in Boolean expression", 0 },
 	{ "DBBADUPGRDSTATE", "Correcting conflicting values for fields describing database version upgrade state in the file header for region !AD (!AD) - make fresh backups with new journal files immediately.", 4 },
 	{ "WRITEWAITPID", "PID !UL waited !UL minute(s) for PID !UL to finish writing block 0x!XL in database file !AD", 6 },
@@ -1220,7 +1220,7 @@ LITDEF	err_msg merrors[] = {
 	{ "JNLORDBFLU", "Error flushing database blocks to !AD. See related messages in the operator log", 2 },
 	{ "ZCCLNUPRTNMISNG", "External call: Cleanup routine name missing. Cannot continue", 0 },
 	{ "ZCINVALIDKEYWORD", "External call: Invalid keyword found. Cannot continue", 0 },
-	{ "UNUSEDMSG1386", "REPLNOMULTILINETRG : Last used in V6.2-000", 0 },
+	{ "UNUSEDMSG1389", "REPLNOMULTILINETRG : Last used in V6.2-000", 0 },
 	{ "DBSHMNAMEDIFF", "Database file !AD points to shared memory (id = !UL) which points to a different database file !AZ", 4 },
 	{ "SHMREMOVED", "Removed Shared Memory id !UL corresponding to file !AD", 3 },
 	{ "DEVICEWRITEONLY", "Cannot read from a write-only device", 0 },
@@ -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 },
-	{ "UNUSEDMSG1529", "REGOPENRETRY last used in V6.3-000A", 0 },
+	{ "UNUSEDMSG1532", "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,7 +1371,7 @@ 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 },
-	{ "UNUSEDMSG1539", "GVSUBSERR last used in V6.3-000A", 0 },
+	{ "UNUSEDMSG1542", "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 },
@@ -1415,7 +1415,7 @@ LITDEF	err_msg merrors[] = {
 	{ "REPLNOHASHTREC", "Sequence number 0x!16 at XQ contains trigger definition updates. !AD side must be at least V6.2-000 for replication to continue", 3 },
 	{ "REMOTEDBNOTRIG", "Trigger operations on global !AD not supported as it maps to database region !AD that points to a remote file", 4 },
 	{ "NEEDTRIGUPGRD", "Cannot do trigger operation on database file !AD until it is upgraded; Run MUPIP TRIGGER -UPGRADE first", 2 },
-	{ "REQRLNKCTLRNDWN", "Error accessing relinkctl file for $ZROUTINES directory !AD. Must be rundown", 2 },
+	{ "REQRLNKCTLRNDWN", "Error accessing relinkctl file !AZ for $ZROUTINES directory !AD. Must be rundown", 3 },
 	{ "RLNKCTLRNDWNSUC", "Relinkctl file for $ZROUTINES directory !AD successfully rundown", 2 },
 	{ "RLNKCTLRNDWNFL", "Relinkctl file for $ZROUTINES directory !AD failed to rundown as it is open by !UL process(es)", 3 },
 	{ "MPROFRUNDOWN", "Error during M-profiling rundown", 0 },
@@ -1451,7 +1451,7 @@ LITDEF	err_msg merrors[] = {
 	{ "MUREENCRYPTSTART", "Database !AD : MUPIP REORG ENCRYPT started by pid !UL at transaction number [0x!16 at XQ]", 4 },
 	{ "MUREENCRYPTV4NOALLOW", "Database (re)encryption supported only on fully upgraded V5 databases. !AD has V4 format blocks", 2 },
 	{ "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 },
+	{ "JNLPOOLRECOVERY", "The size of the data written to the journal pool (!UL) does not match the size of the data in the journal files (!UL) at journal sequence number [0x!16 at XQ] for the replication instance file !AZ. The journal pool has been recovered.", 4 },
 	{ "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 },
@@ -1493,6 +1493,13 @@ LITDEF	err_msg merrors[] = {
 	{ "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 },
+	{ "LVMONBADVAL", "Value for local variable !AD changed inappropriately between two points for indexes !UL and !UL - expected value: !AD  actual value: !AD - Generating core", 8 },
+	{ "RESTRICTEDOP", "Attempt to perform a restricted operation: !AZ", 1 },
+	{ "RESTRICTSYNTAX", "Syntax error in file !AD at line number !UL. All facilities restricted for process.", 3 },
+	{ "MUCREFILERR", "Error in/at !AD creating database !AD (region !AD)", 6 },
+	{ "JNLBUFFPHS2SALVAGE", "Salvaged journal records from process !UL for database file !AD at transaction number [0x!16 at XQ] and journal-sequence-number/unique-token [0x!16 at XQ] with journal file starting offset [0x!XL] and length [0x!XL]", 7 },
+	{ "JNLPOOLPHS2SALVAGE", "Salvaged journal records from process !UL for replication instance file !AD at journal sequence number [0x!16 at XQ] with journal pool starting offset [0x!16 at XQ] and length [0x!XL]", 6 },
+	{ "MURNDWNARGLESS", "Argumentless MUPIP RUNDOWN started with process id !UL by userid !UL from directory !AD", 4 },
 };
 
 LITDEF	int ERR_ACK = 150372361;
@@ -1886,7 +1893,7 @@ LITDEF	int ERR_CCECCPPID = 150375459;
 LITDEF	int ERR_CCECLSTPRCS = 150375467;
 LITDEF	int ERR_ZSHOWBADFUNC = 150375474;
 LITDEF	int ERR_NOTALLJNLEN = 150375480;
-LITDEF	int ERR_UNUSEDMSG570 = 150375490;
+LITDEF	int ERR_BADLOCKNEST = 150375490;
 LITDEF	int ERR_NOLBRSRC = 150375498;
 LITDEF	int ERR_INVZSTEP = 150375506;
 LITDEF	int ERR_ZSTEPARG = 150375514;
@@ -1898,7 +1905,7 @@ LITDEF	int ERR_FILEDEL = 150375555;
 LITDEF	int ERR_JNLBADLABEL = 150375562;
 LITDEF	int ERR_JNLREADEOF = 150375570;
 LITDEF	int ERR_JNLRECFMT = 150375578;
-LITDEF	int ERR_BLKTOODEEP = 150375586;
+LITDEF	int ERR_BLKTOODEEP = 150375584;
 LITDEF	int ERR_NESTFORMP = 150375594;
 LITDEF	int ERR_BINHDR = 150375603;
 LITDEF	int ERR_GOQPREC = 150375611;
@@ -1986,7 +1993,7 @@ LITDEF	int ERR_CEBIGSKIP = 150376258;
 LITDEF	int ERR_CETOOLONG = 150376266;
 LITDEF	int ERR_CENOINDIR = 150376274;
 LITDEF	int ERR_COLLATIONUNDEF = 150376282;
-LITDEF	int ERR_UNUSEDMSG670 = 150376290;
+LITDEF	int ERR_UNUSEDMSG673 = 150376290;
 LITDEF	int ERR_GTMSECSHRSRVF = 150376298;
 LITDEF	int ERR_FREEZECTRL = 150376307;
 LITDEF	int ERR_JNLFLUSH = 150376315;
@@ -2092,7 +2099,7 @@ LITDEF	int ERR_KRNLKILL = 150377108;
 LITDEF	int ERR_MEMORYRECURSIVE = 150377116;
 LITDEF	int ERR_FREEZEID = 150377123;
 LITDEF	int ERR_BLKWRITERR = 150377131;
-LITDEF	int ERR_UNUSEDMSG776 = 150377138;
+LITDEF	int ERR_UNUSEDMSG779 = 150377138;
 LITDEF	int ERR_PINENTRYERR = 150377146;
 LITDEF	int ERR_BCKUPBUFLUSH = 150377154;
 LITDEF	int ERR_NOFORKCORE = 150377160;
@@ -2632,7 +2639,7 @@ LITDEF	int ERR_CRYPTOPFAILED = 150381426;
 LITDEF	int ERR_CRYPTDLNOOPEN = 150381434;
 LITDEF	int ERR_CRYPTNOV4 = 150381442;
 LITDEF	int ERR_CRYPTNOMM = 150381450;
-LITDEF	int ERR_UNUSEDMSG1316 = 150381458;
+LITDEF	int ERR_UNUSEDMSG1319 = 150381458;
 LITDEF	int ERR_CRYPTKEYFETCHFAILED = 150381466;
 LITDEF	int ERR_CRYPTKEYFETCHFAILEDNF = 150381474;
 LITDEF	int ERR_CRYPTHASHGENFAILED = 150381482;
@@ -2690,7 +2697,7 @@ LITDEF	int ERR_GVZTRIGFAIL = 150381890;
 LITDEF	int ERR_MUUSERLBK = 150381898;
 LITDEF	int ERR_SETINSETTRIGONLY = 150381906;
 LITDEF	int ERR_DZTRIGINTRIG = 150381914;
-LITDEF	int ERR_UNUSEDMSG1374 = 150381922;
+LITDEF	int ERR_UNUSEDMSG1377 = 150381922;
 LITDEF	int ERR_BOOLSIDEFFECT = 150381928;
 LITDEF	int ERR_DBBADUPGRDSTATE = 150381936;
 LITDEF	int ERR_WRITEWAITPID = 150381946;
@@ -2702,7 +2709,7 @@ LITDEF	int ERR_GTMSECSHRCHDIRF = 150381986;
 LITDEF	int ERR_JNLORDBFLU = 150381994;
 LITDEF	int ERR_ZCCLNUPRTNMISNG = 150382002;
 LITDEF	int ERR_ZCINVALIDKEYWORD = 150382010;
-LITDEF	int ERR_UNUSEDMSG1386 = 150382018;
+LITDEF	int ERR_UNUSEDMSG1389 = 150382018;
 LITDEF	int ERR_DBSHMNAMEDIFF = 150382026;
 LITDEF	int ERR_SHMREMOVED = 150382035;
 LITDEF	int ERR_DEVICEWRITEONLY = 150382042;
@@ -2843,7 +2850,7 @@ LITDEF	int ERR_GETADDRINFO = 150383114;
 LITDEF	int ERR_GETNAMEINFO = 150383122;
 LITDEF	int ERR_SOCKBIND = 150383130;
 LITDEF	int ERR_INSTFRZDEFER = 150383139;
-LITDEF	int ERR_UNUSEDMSG1529 = 150383146;
+LITDEF	int ERR_UNUSEDMSG1532 = 150383146;
 LITDEF	int ERR_REGOPENFAIL = 150383154;
 LITDEF	int ERR_REPLINSTNOSHM = 150383162;
 LITDEF	int ERR_DEVPARMTOOSMALL = 150383170;
@@ -2853,7 +2860,7 @@ LITDEF	int ERR_ACTCOLLMISMTCH = 150383194;
 LITDEF	int ERR_GBLNOMAPTOREG = 150383202;
 LITDEF	int ERR_ISSPANGBL = 150383210;
 LITDEF	int ERR_TPNOSUPPORT = 150383218;
-LITDEF	int ERR_UNUSEDMSG1539 = 150383226;
+LITDEF	int ERR_UNUSEDMSG1542 = 150383226;
 LITDEF	int ERR_ZATRANSERR = 150383234;
 LITDEF	int ERR_FILTERTIMEDOUT = 150383242;
 LITDEF	int ERR_TLSDLLNOOPEN = 150383250;
@@ -2975,9 +2982,16 @@ LITDEF	int ERR_STATSDBFNERR = 150384170;
 LITDEF	int ERR_JNLSWITCHRETRY = 150384179;
 LITDEF	int ERR_JNLSWITCHFAIL = 150384186;
 LITDEF	int ERR_CLISTRTOOLONG = 150384194;
+LITDEF	int ERR_LVMONBADVAL = 150384202;
+LITDEF	int ERR_RESTRICTEDOP = 150384210;
+LITDEF	int ERR_RESTRICTSYNTAX = 150384218;
+LITDEF	int ERR_MUCREFILERR = 150384226;
+LITDEF	int ERR_JNLBUFFPHS2SALVAGE = 150384235;
+LITDEF	int ERR_JNLPOOLPHS2SALVAGE = 150384243;
+LITDEF	int ERR_MURNDWNARGLESS = 150384251;
 
 GBLDEF	err_ctl merrors_ctl = {
 	246,
 	"GTM",
 	&merrors[0],
-	1480};
+	1487};
diff --git a/sr_i386/ttt.c b/sr_i386/ttt.c
index 3ec10e6..9f171a6 100644
--- a/sr_i386/ttt.c
+++ b/sr_i386/ttt.c
@@ -434,7 +434,7 @@ LITDEF short ttt[4318] = {
 /* 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,
+/* 2649 */	VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_restartpc,VXT_IREPAB,VXT_VAL,7,VXI_PUSHAB,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,
@@ -447,9 +447,9 @@ LITDEF short ttt[4318] = {
 /* 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,
+/* 2726 */	VXI_PUSHAB,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,
+/* 2735 */	VXI_PUSHAB,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,
@@ -462,7 +462,7 @@ LITDEF short ttt[4318] = {
 /* 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,
+/* 2812 */	VXI_PUSHAB,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,
@@ -482,7 +482,7 @@ LITDEF short ttt[4318] = {
 /* 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,
+/* 2940 */	VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_restartpc,VXI_PUSHAB,VXT_VAL,4,VXI_PUSHAB,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,
@@ -493,11 +493,11 @@ LITDEF short ttt[4318] = {
 /* 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,
+/* 3019 */	VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_restartpc,VXI_PUSHAB,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,
+/* 3034 */	VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_restartpc,VXI_PUSHAB,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,
+/* 3049 */	VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_restartpc,VXI_PUSHAB,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,
@@ -589,14 +589,14 @@ LITDEF short ttt[4318] = {
 /* 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,
+/* 3614 */	VXI_PUSHAB,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,
+/* 3651 */	VXI_PUSHAB,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,
diff --git a/sr_linux/release_name.h b/sr_linux/release_name.h
index cc00975..0764a5a 100644
--- a/sr_linux/release_name.h
+++ b/sr_linux/release_name.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,16 +10,18 @@
  *								*
  ****************************************************************/
 
+#ifndef GTM_RELEASE_NAME
 #ifdef __CYGWIN__
-#define GTM_RELEASE_NAME 	"GT.M V6.3-001A CYGWIN x86"
+#define GTM_RELEASE_NAME 	"GT.M V6.3-002 CYGWIN x86"
 #elif defined(__ia64)
-#define GTM_RELEASE_NAME 	"GT.M V6.3-001A Linux IA64"
+#define GTM_RELEASE_NAME 	"GT.M V6.3-002 Linux IA64"
 #elif defined(__x86_64__)
-#define GTM_RELEASE_NAME 	"GT.M V6.3-001A Linux x86_64"
+#define GTM_RELEASE_NAME 	"GT.M V6.3-002 Linux x86_64"
 #elif defined(__s390__)
-#define GTM_RELEASE_NAME 	"GT.M V6.3-001A Linux S390X"
+#define GTM_RELEASE_NAME 	"GT.M V6.3-002 Linux S390X"
 #else
-#define GTM_RELEASE_NAME 	"GT.M V6.3-001A Linux x86"
+#define GTM_RELEASE_NAME 	"GT.M V6.3-002 Linux x86"
+#endif
 #endif
 #define GTM_PRODUCT 		"GT.M"
 #define GTM_VERSION		"V6.3"
diff --git a/sr_port/aio_shim.h b/sr_port/aio_shim.h
index 6628b61..b8318f7 100644
--- a/sr_port/aio_shim.h
+++ b/sr_port/aio_shim.h
@@ -1,6 +1,6 @@
 /****************************************************************
  *								*
- * Copyright (c) 2016 Fidelity National Information		*
+ * Copyright (c) 2016-2017 Fidelity National Information	*
  * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
@@ -14,7 +14,13 @@
 
 #include "gtm_libaio.h"
 
-#ifndef USE_LIBAIO
+#ifdef USE_NOAIO
+#define AIO_SHIM_WRITE(UNUSED, AIOCBP, RET)   /* no-op, N/A */
+#define AIO_SHIM_RETURN(AIOCBP, RET)          /* no-op, N/A */
+#define AIO_SHIM_ERROR(AIOCBP, RET)           /* no-op, N/A */
+#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 */
+#elif !defined(USE_LIBAIO)    /* USE_NOAIO */
 #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
diff --git a/sr_port/alloc_reg.c b/sr_port/alloc_reg.c
index 232376d..43ddbbe 100755
--- a/sr_port/alloc_reg.c
+++ b/sr_port/alloc_reg.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	*
@@ -139,7 +139,8 @@ void alloc_reg(void)
 				{
 					x->operand[1].oprclass = NO_REF;
 					opc = x->opcode = OC_EQUNUL;
-				}
+				}	/* WARNING fallthrough */
+			default:
 				break;
 		}
 		if (OC_PASSTHRU == x->opcode)
diff --git a/sr_port/anticipatory_freeze.h b/sr_port/anticipatory_freeze.h
index 7983538..365a043 100644
--- a/sr_port/anticipatory_freeze.h
+++ b/sr_port/anticipatory_freeze.h
@@ -55,7 +55,7 @@ error_def(ERR_TEXT);
 
 #define ENABLE_FREEZE_ON_ERROR											\
 {														\
-	if (INST_FREEZE_ON_ERROR_POLICY)									\
+	if (!IS_GTMSECSHR_IMAGE)					\
 	{	/* Set anticipatory freeze function pointers to be used later (in send_msg and rts_error) */	\
 		is_anticipatory_freeze_needed_fnptr = &is_anticipatory_freeze_needed;				\
 		set_anticipatory_freeze_fnptr = &set_anticipatory_freeze;					\
diff --git a/sr_port/bool_expr.c b/sr_port/bool_expr.c
index 4f3ecd1..d6a6b6f 100755
--- a/sr_port/bool_expr.c
+++ b/sr_port/bool_expr.c
@@ -1,17 +1,17 @@
 /****************************************************************
- *								*
+ *                                                              *
  * 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.	*
- *								*
+ *                                                              *
+ *      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"		/* needed by INCREMENT_EXPR_DEPTH */
+#include "gtm_string.h"         /* needed by INCREMENT_EXPR_DEPTH */
 #include "compiler.h"
 #include "mdq.h"
 #include "mmemory.h"
@@ -28,11 +28,9 @@ int bool_expr(boolean_t sense, oprtype *addr)
  * *addr winds up as an pointer to a jump operand, which the caller fills in
  */
 {
-	boolean_t	is_com, tv;
-	uint4		bexprs;
-	opctype		c;
+	mval		*v;
 	oprtype		x;
-	triple		*bitrip, *t, *t0, *t1, *t2;
+	triple		*t1, *t2;
 	DCL_THREADGBL_ACCESS;
 
 	SETUP_THREADGBL_ACCESS;
@@ -42,67 +40,33 @@ int bool_expr(boolean_t sense, oprtype *addr)
 		DECREMENT_EXPR_DEPTH;
 		return FALSE;
 	}
-	UNARY_TAIL(&x);
+	assert(TRIP_REF == x.oprclass);
 	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);
-	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;
+	UNARY_TAIL(&x);
+	for(t2 = t1 = x.oprval.tref; OCT_UNARY & oc_tab[t1->opcode].octype; t2 = t1, t1 = t1->operand[0].oprval.tref)
+		;
+	if (OCT_ARITH & oc_tab[t1->opcode].octype)
+		ex_tail(&t2->operand[0]);
+	else if (OCT_BOOL & oc_tab[t1->opcode].octype)
+		bx_boollit(t1);
+	for (t1 = x.oprval.tref; OC_NOOP == t1->opcode; t1 = t1->exorder.bl)
+		;
+	if ((OC_COBOOL == t1->opcode) && (OC_LIT == (t2 = t1->operand[0].oprval.tref)->opcode)
+		&& (TREF(curtchain) != t2->exorder.bl) && !(OCT_JUMP & oc_tab[t2->exorder.bl->opcode].octype))
+	{	/* returning literals directly simplifies things for all callers, so swap the sense */
+		v = &t2->operand[0].oprval.mlit->v;
+		unuse_literal(v);
+		PUT_LITERAL_TRUTH(0 != v->m[1], t2);
+		dqdel(t1, exorder);
+		DECREMENT_EXPR_DEPTH;
+		return TRUE;
 	}
-	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);
+	bx_tail(x.oprval.tref, sense, addr);
 	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/bx_boollit.c b/sr_port/bx_boollit.c
index db25227..c7116bf 100644
--- a/sr_port/bx_boollit.c
+++ b/sr_port/bx_boollit.c
@@ -27,21 +27,7 @@
 
 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)
+void bx_boollit(triple *t)
 /* 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
@@ -51,136 +37,111 @@ void bx_boollit_tail(triple *t, boolean_t jmp_type_one, boolean_t jmp_to_next, b
  * *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;
+	boolean_t	tv[ARRAYSIZE(t->operand)];
+	int		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)];
+	oprtype		*opr, *p;
+	triple		*ref0, *optrip[ARRAYSIZE(t->operand)];
+	DCL_THREADGBL_ACCESS;
 
+	SETUP_THREADGBL_ACCESS;
 	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++)
+	for (opr = t->operand, j = 0; opr < ARRAYTOP(t->operand); opr++, 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)
+		p = opr;
+		for (optrip[j] = opr->oprval.tref; OCT_UNARY & oc_tab[(c = optrip[j]->opcode)].octype; optrip[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];
+			assert((TRIP_REF == optrip[j]->operand[0].oprclass) && (NO_REF == optrip[j]->operand[1].oprclass));
+			p = &optrip[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(optrip[j]);
+		assert(OC_COMVAL != optrip[j]->opcode);
+		neg = num = 0;
+		UNARY_TAIL(opr);
+		for (ref0 = t->operand[j].oprval.tref; OCT_UNARY & oc_tab[ref0->opcode].octype; ref0 = ref0->operand[0].oprval.tref)
+			;
+		optrip[j] = ref0;
+		if (OC_LIT == ref0->opcode)
+		{
+			v[j] = &ref0->operand[0].oprval.mlit->v;
+			if (OC_COM == t->operand[j].oprval.tref->opcode)
+			{       /* any complement reduces the literal value to [unsigned] 1 or 0 */
+				unuse_literal(v[j]);
+				tv[j] = (0 == v[j]->m[1]);
+				assert(ref0 == optrip[j]);
+				PUT_LITERAL_TRUTH(tv[j], ref0);
+				v[j] = &ref0->operand[0].oprval.mlit->v;
+				num = 0;							/* any complement trumps num */
 			}
-			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 */
+			neg = OC_NEG == t->operand[j].oprval.tref->opcode;
+			num = OC_FORCENUM == t->operand[j].oprval.tref->opcode;
+			if (neg || num)
+			{	/* get literal into uniform state */
+				unuse_literal(v[j]);
+				mv = (mval *)mcalloc(SIZEOF(mval));
+				*mv = *v[j];
+				if (neg)
 				{
-					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;
+					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 == optrip[j]);
+				put_lit_s(v[j], ref0);
 			}
-			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)
+			/* In the case of this one optimized but not other, remove all unary's except the first
+			 * If the first is a COMVAL, remove it.
+			 */
+			if (OC_COMVAL == t->operand[j].oprval.tref->opcode)
 			{
-				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);
+				dqdel(t->operand[j].oprval.tref, exorder);
+				t->operand[j].oprval.tref = t->operand[j].oprval.tref->operand[0].oprval.tref;
+			}
 		}
 	}
-	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 */
+	assert(optrip[0] != optrip[1]);
+	j = -1;
+	if (OC_LIT == optrip[0]->opcode)						/* make j identify what literal if any */
+	{       /* operand[0] (left) has been evaluated to a literal */
+		j = 0;
+		if (OC_LIT == optrip[1]->opcode)
+			j = 2;
+	} else if (OC_LIT == optrip[1]->opcode)
+		j = 1;
+	if (2 == j)
+	{	/* Both sides are literals; remove them */
+		for (j = 0;  j < ARRAYSIZE(v); j++)
+		{	/* both arguments are literals, so do the operation at compile time */
+			/* We don't need any COBOOLs, and all the negatives/coms should be out */
+			for (ref0 = t->operand[j].oprval.tref; ref0 != optrip[j]; ref0 = ref0->operand[0].oprval.tref)
+			{
+				assert((OC_NEG != ref0->opcode) && (OC_FORCENUM != ref0->opcode) && (OC_COM != ref0->opcode));
+				dqdel(ref0, exorder);
+				t->operand[j].oprval.tref = ref0->operand[0].oprval.tref;
+			}
+			v[j] = &optrip[j]->operand[0].oprval.mlit->v;
+			tv[j] = (0 != v[j]->m[1]);
+			unuse_literal(v[j]);
+			optrip[j]->opcode = OC_NOOP;	/* shouldn't dqdel be safe? */
+			optrip[j]->operand[0].oprclass = NO_REF;
+		}
+		t->operand[1].oprclass = NO_REF;
+		switch (t->opcode)
+		{	/* optimize the Boolean operations here */
 		case OC_NAND:
 		case OC_AND:
 			tvr = (tv[0] && tv[1]);
@@ -222,9 +183,14 @@ void bx_boollit_tail(triple *t, boolean_t jmp_type_one, boolean_t jmp_to_next, b
 			break;
 		default:
 			assertpro(FALSE);
+		}
+		if (OCT_NEGATED & oc_tab[t->opcode].octype)
+			tvr = !tvr;
+		ref0 = maketriple(OC_LIT);
+		t->opcode = OC_COBOOL;
+		t->operand[0] = put_tref(ref0);
+		PUT_LITERAL_TRUTH(tvr, ref0);
+		dqrins(t, exorder, ref0);
 	}
-	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 50b1b6d..7661fa7 100644
--- a/sr_port/bx_boolop.c
+++ b/sr_port/bx_boolop.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	*
@@ -88,8 +88,6 @@ void bx_boolop(triple *t, boolean_t jmp_type_one, boolean_t jmp_to_next, boolean
 	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)
@@ -102,7 +100,9 @@ void bx_boolop(triple *t, boolean_t jmp_type_one, boolean_t jmp_to_next, boolean
 	{	/* nice simple short circuit */
 		assert(NULL == TREF(boolchain_ptr));
 		bx_tail(t->operand[0].oprval.tref, jmp_type_one, p);
+		RETURN_IF_RTS_ERROR;
 		bx_tail(t->operand[1].oprval.tref, sense, addr);
+		RETURN_IF_RTS_ERROR;
 		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;
@@ -134,10 +134,13 @@ void bx_boolop(triple *t, boolean_t jmp_type_one, boolean_t jmp_to_next, boolean
 		assert(NULL != TREF(boolchain_ptr));
 		tb = i->oprval.tref;
 		if (&(t->operand[0]) == i)
+		{
 			bx_tail(tb, jmp_type_one, p);				/* do normal transform */
-		else
+			RETURN_IF_RTS_ERROR;
+		} else
 		{	/* operand[1] */
 			bx_tail(tb, sense, addr);				/* do normal transform */
+			RETURN_IF_RTS_ERROR;
 			if (!expr_fini)						/* leaving ref0 same as for operand 0 */
 				break;						/* only need to relocate last operand[1] */
 		}
@@ -155,8 +158,6 @@ void bx_boolop(triple *t, boolean_t jmp_type_one, boolean_t jmp_to_next, boolean
 				case OC_JMP:
 				case OC_JMPTCLR:
 				case OC_JMPTSET:
-				case OC_JMPFALSE:
-				case OC_JMPTRUE:
 					break;
 				default:
 					tb = tb->exorder.bl;
@@ -171,6 +172,7 @@ void bx_boolop(triple *t, boolean_t jmp_type_one, boolean_t jmp_to_next, boolean
 		}
 		assert(OC_NOOP != tb->opcode);
 		ref0 = maketriple(tb->opcode);					/* copy operation for place in new ladder */
+		DEBUG_ONLY(ref0->src = tb->src);
 		ref1 = (TREF(boolchain_ptr))->exorder.bl;			/* common setup for coming copy of this op */
 		switch (tb->opcode)
 		{								/* time to subvert original jump ladder entry */
@@ -189,6 +191,7 @@ void bx_boolop(triple *t, boolean_t jmp_type_one, boolean_t jmp_to_next, boolean
 				t1 = tb->exorder.fl;
 				assert(OCT_JUMP & oc_tab[t1->opcode].octype);
 				tj = maketriple(t1->opcode);			/* create new jmp on result of coerce */
+				DEBUG_ONLY(tj->src = t1->src);
 				tj->operand[0] = t1->operand[0];
 				t1->opcode = OC_NOOP;				/* wipe out original jmp */
 				t1->operand[0].oprclass = NO_REF;
@@ -207,20 +210,20 @@ void bx_boolop(triple *t, boolean_t jmp_type_one, boolean_t jmp_to_next, boolean
 				t1 = tb->exorder.fl;
 				assert(OCT_JUMP & oc_tab[t1->opcode].octype);
 				tj = maketriple(t1->opcode);			/* copy jmp */
+				DEBUG_ONLY(tj->src = t1->src);
 				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_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 jmp gets old target */
 				assert(INDR_REF == tj->operand[0].oprclass);
 				ref2 = maketriple(OC_NOOP);			/* insert NOOP rather than COBOOL in new chain */
+				DEBUG_ONLY(ref2->src = tj->src);
 				dqins(ref1, exorder, ref2);
 				t1->opcode = OC_NOOP;				/* wipe out original jmp */
 				t1->operand[0].oprclass = NO_REF;
@@ -260,14 +263,6 @@ void bx_boolop(triple *t, boolean_t jmp_type_one, boolean_t jmp_to_next, boolean
 		adj_addr = &t0->operand[0];
 		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 */
@@ -313,7 +308,7 @@ void bx_boolop(triple *t, boolean_t jmp_type_one, boolean_t jmp_to_next, boolean
 							|| (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))
+								|| (OC_JMPTSET == c))
 								&& (INDR_REF == ref1->exorder.fl->operand[0].oprclass))));
 					}
 				}
@@ -324,7 +319,7 @@ void bx_boolop(triple *t, boolean_t jmp_type_one, boolean_t jmp_to_next, boolean
 		if ((OC_BOOLFINI == t0->opcode) || (TREF(curtchain) == t0->exorder.fl))
 			break;
 		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 */
+			|| (OC_JMPTCLR == c));					/* WARNING assignment */
 	}
 	dqloop(TREF(bool_targ_ptr), que, tripbp)				/* clean up borrowed jmplist entries */
 	{
@@ -337,6 +332,7 @@ void bx_boolop(triple *t, boolean_t jmp_type_one, boolean_t jmp_to_next, boolean
 	if (TREF(expr_start) != TREF(expr_start_orig))
 	{									/* inocculate against an unwanted GVRECTARG */
 		ref0 = maketriple(OC_NOOP);
+		DEBUG_ONLY(ref0->src = t->src);
 		dqins(TREF(expr_start), exorder, ref0);
 		TREF(expr_start) = ref0;
 	}
diff --git a/sr_port/bx_relop.c b/sr_port/bx_relop.c
index 2e83d8d..1933f94 100755
--- a/sr_port/bx_relop.c
+++ b/sr_port/bx_relop.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,11 +23,22 @@ void bx_relop(triple *t, opctype cmp, opctype tst, oprtype *addr)
  * *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;
+	oprtype	*p;
+	triple	*ref;
+	DCL_THREADGBL_ACCESS;
 
+	SETUP_THREADGBL_ACCESS;
 	ref = maketriple(tst);
 	ref->operand[0] = put_indr(addr);
 	dqins(t, exorder, ref);
 	t->opcode = cmp;
+	for (p = t->operand ; p < ARRAYTOP(t->operand); p++)
+	{	/* Some day investigate whether this is still needed */
+		if (TRIP_REF == p->oprclass)
+		{
+			ex_tail(p);
+			RETURN_IF_RTS_ERROR;
+		}
+	}
 	return;
 }
diff --git a/sr_port/bx_tail.c b/sr_port/bx_tail.c
index 7b42162..73abd4f 100755
--- a/sr_port/bx_tail.c
+++ b/sr_port/bx_tail.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	*
@@ -15,11 +15,8 @@
 #include "opcode.h"
 #include "mdq.h"
 #include "mmemory.h"
-#include "fullbool.h"
-#include "stringpool.h"
 
-LITREF mval		literal_zero, literal_one;
-LITREF octabstruct	oc_tab[];
+LITREF octabstruct oc_tab[];
 
 /*	structure of jmps is as follows:
  *
@@ -39,111 +36,84 @@ LITREF octabstruct	oc_tab[];
 void bx_tail(triple *t, boolean_t sense, oprtype *addr)
 /*
  * 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		*t;     triple to be processed
+ * boolean_t	sense;  code to be generated is jmpt or jmpf
+ * oprtype		*addr;  address to jmp
  */
 {
-	boolean_t	tv;
-	opctype		c;
-	oprtype		*p;
-	triple		*ref, *ref1, *ref2;
+	opctype	c;
+	triple	*ref;
 	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(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));
-	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 */
+	if (OCT_NEGATED & oc_tab[c = t->opcode].octype)
+		sense = !sense;
+	switch (c)
 	{
-		if (OCT_NEGATED & oc_tab[t->opcode].octype)
-			sense ^= 1;
-		switch (c)
+	case OC_COBOOL:
+		ex_tail(&t->operand[0]);
+		RETURN_IF_RTS_ERROR;
+		if (OC_GETTRUTH == t->operand[0].oprval.tref->opcode)
 		{
-		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);
+			dqdel(t->operand[0].oprval.tref, exorder);
+			t->opcode = sense ? OC_JMPTSET : OC_JMPTCLR;
+			t->operand[0] = put_indr(addr);
 			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);
 		}
-	}
-	if (OCT_REL & oc_tab[c].octype)
-	{
-		for (p = t->operand ; p < ARRAYTOP(t->operand); p++)
-			if (TRIP_REF == p->oprclass)
-				ex_tail(p);
+		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);
+		RETURN_IF_RTS_ERROR;
+		t->opcode = OC_NOOP;				/* maybe operand or target, so noop, rather than dqdel the com */
+		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);
+		RETURN_IF_RTS_ERROR;
+		break;
+	case OC_NOR:
+	case OC_OR:
+		bx_boolop(t, TRUE, !sense, sense, addr);
+		RETURN_IF_RTS_ERROR;
+		break;
+	default:
+		assertpro(FALSE && t);
 	}
 	return;
 }
diff --git a/sr_port/cdb_sc_table.h b/sr_port/cdb_sc_table.h
index 4013589..133d5c9 100755
--- a/sr_port/cdb_sc_table.h
+++ b/sr_port/cdb_sc_table.h
@@ -33,6 +33,7 @@
  *      cdb_sc_lostbmlhist,
  *      cdb_sc_lostbmlcr,
  *      cdb_sc_crbtmismatch,
+ *      cdb_sc_phase2waitfail,
  * cdb_sc_bmlmod and cdb_sc_blkmod need to be added here, but they present an interesting problem. This is because
  * if the database has an integrity error, we will get a cdb_sc_blkmod/bmlmod error for every transaction that reads
  * the block with the BLKTNTOOLG integrity error in which case we do not want to set wc_blocked and cause indefinite
@@ -52,6 +53,7 @@
  *	cdb_sc_gvtrootnonzero
  *	cdb_sc_reorg_encrypt
  *	cdb_sc_optrestart
+ *	cdb_sc_phase2waitfail
  */
 
 CDB_SC_NUM_ENTRY(  cdb_sc_normal,           FALSE,          0) /*  0   success */
@@ -104,7 +106,7 @@ CDB_SC_LCHAR_ENTRY(cdb_sc_jnlstatemod,      TRUE,  FALSE, 'h') /* 'h'  csd->jnl_
 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_phase2waitfail,   TRUE,  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 */
diff --git a/sr_port/ceprep_file.c b/sr_port/ceprep_file.c
index 2fc7792..da3214a 100755
--- a/sr_port/ceprep_file.c
+++ b/sr_port/ceprep_file.c
@@ -26,12 +26,12 @@ static struct RAB	ceprep_rab;	/* record access block for compiler escape preproc
 #include "op.h"
 #include "comp_esc.h"
 
-#define CEPREP_OPEN_TIMEOUT 30
-
 GBLREF mident			module_name;
 GBLREF io_pair			io_curr_device;
 GBLREF command_qualifier	cmd_qlf;
 
+LITREF	mval		literal_zero;
+
 static io_pair	dev_in_use;
 
 void open_ceprep_file(void)
@@ -92,7 +92,7 @@ void open_ceprep_file(void)
 	file.str.addr = fname;
 	params.str.len = SIZEOF(open_params_list);
 	params.str.addr = &open_params_list;
-	op_open(&file, &params, CEPREP_OPEN_TIMEOUT, 0);
+	op_open(&file, &params, (mval *)&literal_zero, 0);
 	params.str.len = 1;
 	charspace = (char)iop_eol;
 	params.str.addr = &charspace;
diff --git a/sr_port/cmd.c b/sr_port/cmd.c
index 0d9b744..dee3187 100644
--- a/sr_port/cmd.c
+++ b/sr_port/cmd.c
@@ -279,7 +279,7 @@ LITDEF struct
 			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 */
+		{	/* NOTE - assignment above */
 			temp_expr_start = TREF(expr_start);
 			triptr = newtriple(OC_GVRECTARG);
 			triptr->operand[0] = put_tref(temp_expr_start);
diff --git a/sr_port/coerce.c b/sr_port/coerce.c
index 0aaccc1..1df546e 100755
--- a/sr_port/coerce.c
+++ b/sr_port/coerce.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	*
@@ -22,7 +22,7 @@ GBLREF hash_table_str	*complits_hashtab;
 
 LITREF octabstruct	oc_tab[];
 
-void coerce(oprtype *a,unsigned short new_type)
+void coerce(oprtype *a, unsigned short new_type)
 /* ensure operand (*a) is of the desired type new_type */
 {
 
@@ -33,8 +33,8 @@ void coerce(oprtype *a,unsigned short new_type)
 	stringkey	litkey;
 	triple		*coerc, *ref;
 
-	assert (new_type == OCT_MVAL || new_type == OCT_MINT || new_type == OCT_BOOL);
-	assert (a->oprclass == TRIP_REF);
+	assert ((OCT_MVAL == new_type) || (OCT_MINT == new_type) || (OCT_BOOL == new_type));
+	assert (TRIP_REF == a->oprclass);
 	ref = a->oprval.tref;
 	old_op = ref->opcode;
 	if (new_type & oc_tab[old_op].octype)
@@ -52,7 +52,7 @@ void coerce(oprtype *a,unsigned short new_type)
 			if (new_type & oc_tab[old_op].octype)
 				return;
 		}
-	} else if (OC_LIT == old_op && OCT_MINT == new_type)
+	} else if ((OC_LIT == old_op) && (OCT_MINT == new_type))
 	{
 		lit = ref->operand[0].oprval.mlit;
 		if (!(++lit->rt_addr))
@@ -74,9 +74,9 @@ void coerce(oprtype *a,unsigned short new_type)
 		ref->operand[0].oprval.ilit = MV_FORCE_INTD(&(lit->v));
 		return;
 	}
-	if (new_type == OCT_BOOL)
+	if (OCT_BOOL == new_type)
 		conv = OC_COBOOL;
-	else if (new_type == OCT_MINT)
+	else if (OCT_MINT == new_type)
 		conv = OC_COMINT;
 	else
 		conv = OC_COMVAL;
diff --git a/sr_port/comp_init.c b/sr_port/comp_init.c
index e265f71..e5b08f1 100644
--- a/sr_port/comp_init.c
+++ b/sr_port/comp_init.c
@@ -40,7 +40,7 @@ void comp_init(mstr *src, oprtype *dst)
 	DCL_THREADGBL_ACCESS;
 
 	SETUP_THREADGBL_ACCESS;
-	if ((MAX_SRCLINE <= (unsigned)src->len) && ((TREF(source_buffer)).addr == (char *)&aligned_source_buffer))
+	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;
diff --git a/sr_port/compiler.h b/sr_port/compiler.h
index 4ccbb2f..3bbe4da 100755
--- a/sr_port/compiler.h
+++ b/sr_port/compiler.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	*
@@ -29,15 +29,15 @@ typedef enum
 	INDR_REF,	/* 11 */
 	MLAB_REF,	/* 12 */
 	ILIT_REF,	/* 13 */
-	CDLT_REF,	/* 14 */
-	TEMP_REF,	/* 15 */
+	CDLT_REF,	/* 14 - apparently no longer used */
+	TEMP_REF,	/* 15 - apparently no longer maintained */
 	MFUN_REF,	/* 16 */
 	MNXL_REF,	/* 17 refer to internalentry of child line */
 	TSIZ_REF,	/* 18 ilit refering to size of given triple codegen */
 	OCNT_REF,	/* 19 Offset from Call to Next Triple */
 	CDIDX_REF	/* 20 Denotes index into a table containing a code address */
 } operclass;
-#define VALUED_REF_TYPES 6	/* Types 0-6 are specific types used by alloc_reg() in array references
+#define VALUED_REF_TYPES 6	/* Types 0-5 are specific types used by alloc_reg() in array references
 				 * **** WARNING **** Do NOT reorder
 				 */
 
@@ -68,6 +68,7 @@ typedef struct	mlinestruct
 	struct	tripletype	*externalentry;
 	uint4			line_number;	/* ...operation on this line */
 	boolean_t		table;		/* put in table or not */
+	boolean_t		block_ok;	/* saw argumentless DO or not */
 } mline;
 
 typedef struct	mlabstruct
@@ -476,7 +477,7 @@ typedef struct
 }
 
 #define GOOD_FOR  FALSE	/* single level */
-#define BLOWN_FOR TRUE	/* all levels */
+#define BLOWN_FOR (!TREF(xecute_literal_parse))	/* all levels, except only one for our funky friend xecute_literal_parse */
 
 /* Marco to decrement or clear the for_stack, clear the for_temp array
  * and generate code to release run-time malloc'd mvals anchored in the for_saved_indx array
@@ -559,6 +560,68 @@ MBSTART {												\
 		unary_tail(OPR);									\
 } MBEND
 
+/* the following structure and macros save and restore parsing state and as of this writing are only used by m_xecute */
+typedef struct
+{
+	boolean_t	source_error_found;
+	int		source_column;
+	int		director_ident_len;
+	int4		block_level;
+	mstr_len_t	source_len;
+	mval		director_mval;
+	unsigned char	ident_buffer[(MAX_MIDENT_LEN * 2) + 1];
+	char		director_token;
+	char		*lexical_ptr;
+	char		window_token;
+} parse_save_block;
+
+#define SAVE_PARSE_STATE(SAVE_PARSE_PTR)									\
+MBSTART {													\
+	SAVE_PARSE_PTR->block_level = TREF(block_level);							\
+	SAVE_PARSE_PTR->director_ident_len = (TREF(director_ident)).len;					\
+	memcpy(SAVE_PARSE_PTR->ident_buffer, (TREF(director_ident)).addr, SAVE_PARSE_PTR->director_ident_len);	\
+	SAVE_PARSE_PTR->director_mval = TREF(director_mval);							\
+	SAVE_PARSE_PTR->director_token = TREF(director_token);							\
+	SAVE_PARSE_PTR->lexical_ptr = TREF(lexical_ptr);							\
+	SAVE_PARSE_PTR->source_column = source_column;								\
+	SAVE_PARSE_PTR->source_error_found = TREF(source_error_found);						\
+	SAVE_PARSE_PTR->source_len = (TREF(source_buffer)).len;							\
+	SAVE_PARSE_PTR->window_token = TREF(window_token);							\
+} MBEND
+
+#define RESTORE_PARSE_STATE(SAVE_PARSE_PTR)								\
+MBSTART {													\
+	TREF(block_level) = SAVE_PARSE_PTR->block_level;							\
+	(TREF(director_ident)).len = SAVE_PARSE_PTR->director_ident_len;					\
+	memcpy((TREF(director_ident)).addr, SAVE_PARSE_PTR->ident_buffer, SAVE_PARSE_PTR->director_ident_len);	\
+	TREF(director_mval) = SAVE_PARSE_PTR->director_mval;							\
+	TREF(director_token) = SAVE_PARSE_PTR->director_token;							\
+	TREF(lexical_ptr) = SAVE_PARSE_PTR->lexical_ptr;							\
+	(TREF(source_buffer)).addr = (char *)&aligned_source_buffer;						\
+	(TREF(source_buffer)).len = SAVE_PARSE_PTR->source_len;							\
+	source_column = SAVE_PARSE_PTR->source_column;								\
+	TREF(source_error_found) = SAVE_PARSE_PTR->source_error_found;						\
+	TREF(window_token) = SAVE_PARSE_PTR->window_token;							\
+} MBEND
+
+#define RETURN_IF_RTS_ERROR							\
+MBSTART {									\
+	if (TREF(rts_error_in_parse))						\
+		return;								\
+} MBEND
+
+#define RETURN_EXPR_IF_RTS_ERROR						\
+MBSTART {									\
+	if (TREF(rts_error_in_parse))						\
+	{									\
+		TREF(rts_error_in_parse) = FALSE;				\
+		DECREMENT_EXPR_DEPTH;						\
+		return EXPR_FAIL;						\
+	}									\
+} MBEND
+
+#define ALREADY_RTERROR (OC_RTERROR == (TREF(curtchain))->exorder.bl->exorder.bl->exorder.bl->opcode)
+
 /* 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.
@@ -575,7 +638,7 @@ MBSTART {												\
 
 int		actuallist(oprtype *opr);
 int		bool_expr(boolean_t sense, oprtype *addr);
-void		bx_boollit(triple *t, boolean_t sense, oprtype *addr);
+void		bx_boollit(triple *t);
 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);
diff --git a/sr_port/cre_jnl_file.c b/sr_port/cre_jnl_file.c
index 1fdb66e..b6c009c 100755
--- a/sr_port/cre_jnl_file.c
+++ b/sr_port/cre_jnl_file.c
@@ -47,28 +47,24 @@
 #include "anticipatory_freeze.h"
 
 /* Note : Now all system error messages are issued here. So callers do not need to issue them again */
-#define STATUS_MSG(info)										\
+#define STATUS_MSG(INFO, FROMLEN, FROM, TOLEN, TO)							\
 {													\
-	if (SS_NORMAL != info->status2)									\
+	if (SS_NORMAL != INFO->status2)									\
 	{												\
-		if (IS_GTM_IMAGE)									\
-			send_msg_csa(CSA_ARG(info->csa) VARLSTCNT(12) ERR_JNLCRESTATUS, 7, CALLFROM,	\
-					info->jnl_len, info->jnl, info->fn_len, info->fn, info->status,	\
-					0, info->status2);						\
-		else											\
-			gtm_putmsg_csa(CSA_ARG(info->csa) VARLSTCNT1(11) ERR_JNLCRESTATUS, 7, CALLFROM,	\
-					info->jnl_len, info->jnl, info->fn_len, info->fn, info->status,	\
-					PUT_SYS_ERRNO(info->status2));					\
-	} else if (SS_NORMAL != info->status)								\
+		send_msg_csa(CSA_ARG(INFO->csa) VARLSTCNT(12) ERR_JNLCRESTATUS, 7, CALLFROM,		\
+				FROMLEN, FROM, TOLEN, TO, INFO->status,					\
+				PUT_SYS_ERRNO(INFO->status2));						\
+		if (!IS_GTM_IMAGE)									\
+			gtm_putmsg_csa(CSA_ARG(INFO->csa) VARLSTCNT1(11) ERR_JNLCRESTATUS, 7, CALLFROM,	\
+					FROMLEN, FROM, TOLEN, TO, INFO->status,				\
+					PUT_SYS_ERRNO(INFO->status2));					\
+	} else if (SS_NORMAL != INFO->status)								\
 	{												\
-		if (IS_GTM_IMAGE)									\
-			send_msg_csa(CSA_ARG(info->csa) VARLSTCNT(10) ERR_JNLCRESTATUS, 7, CALLFROM,	\
-					info->jnl_len, info->jnl, info->fn_len, info->fn,		\
-					info->status);							\
-		else											\
-			gtm_putmsg_csa(CSA_ARG(info->csa) VARLSTCNT(10) ERR_JNLCRESTATUS, 7, CALLFROM,	\
-					info->jnl_len, info->jnl, info->fn_len, info->fn,		\
-					info->status);							\
+		send_msg_csa(CSA_ARG(INFO->csa) VARLSTCNT(10) ERR_JNLCRESTATUS, 7, CALLFROM,		\
+				FROMLEN, FROM, TOLEN, TO, INFO->status);				\
+		if (!IS_GTM_IMAGE)									\
+			gtm_putmsg_csa(CSA_ARG(INFO->csa) VARLSTCNT(10) ERR_JNLCRESTATUS, 7, CALLFROM,	\
+					FROMLEN, FROM, TOLEN, TO, INFO->status);			\
 	}												\
 }
 #define RETURN_ON_ERROR(info)						\
@@ -125,12 +121,11 @@ uint4	cre_jnl_file(jnl_create_info *info)
 			{
 				if (FILE_NOT_FOUND != fstat)
 				{
-					STATUS_MSG(info);
+					STATUS_MSG(info, info->jnl_len, info->jnl, info->fn_len, info->fn);
 					return EXIT_ERR;
 				}
-				if (IS_GTM_IMAGE)
-					send_msg_csa(CSA_ARG(info->csa) VARLSTCNT(4) ERR_JNLFNF, 2, filestr.len, filestr.addr);
-				else
+				send_msg_csa(CSA_ARG(info->csa) VARLSTCNT(4) ERR_JNLFNF, 2, filestr.len, filestr.addr);
+				if (!(IS_GTM_IMAGE))
 					gtm_putmsg_csa(CSA_ARG(info->csa) VARLSTCNT(4) ERR_JNLFNF, 2, filestr.len, filestr.addr);
 				no_rename = TRUE;
 			}
@@ -144,7 +139,7 @@ uint4	cre_jnl_file(jnl_create_info *info)
 		}
 		if (no_rename)
 		{
-			STATUS_MSG(info);
+			STATUS_MSG(info, info->jnl_len, info->jnl, info->fn_len, info->fn);
 			if (ERR_FILENAMETOOLONG == info->status)
 				return EXIT_ERR;
 			/* Else it is an error from "gtm_file_stat" (invoked from "prepare_unique_name" above).
@@ -210,7 +205,7 @@ uint4 cre_jnl_file_common(jnl_create_info *info, char *rename_fn, int rename_fn_
 		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)))
 		{
-			STATUS_MSG(info);
+			STATUS_MSG(info, info->jnl_len, info->jnl, info->fn_len, info->fn);
 			return EXIT_ERR;
 		}
 	}
@@ -218,7 +213,7 @@ uint4 cre_jnl_file_common(jnl_create_info *info, char *rename_fn, int rename_fn_
 	if (-1 == channel)
 	{
 		info->status = errno;
-		STATUS_MSG(info);
+		STATUS_MSG(info, info->jnl_len, info->jnl, info->fn_len, info->fn);
 		return EXIT_ERR;
 	}
 #	ifdef __MVS__
@@ -229,7 +224,7 @@ uint4 cre_jnl_file_common(jnl_create_info *info, char *rename_fn, int rename_fn_
 	if (-1 == fstat_res)
 	{
 		info->status = errno;
-		STATUS_MSG(info);
+		STATUS_MSG(info, info->jnl_len, info->jnl, info->fn_len, info->fn);
 		F_CLOSE(channel, status);
 		return EXIT_ERR;
 	}
@@ -238,7 +233,7 @@ uint4 cre_jnl_file_common(jnl_create_info *info, char *rename_fn, int rename_fn_
 	if (-1 == stat_res)
 	{
 		info->status = errno;
-		STATUS_MSG(info);
+		STATUS_MSG(info, info->jnl_len, info->jnl, info->fn_len, info->fn);
 		F_CLOSE(channel, status);
 		return EXIT_ERR;
 	}
@@ -265,14 +260,14 @@ uint4 cre_jnl_file_common(jnl_create_info *info, char *rename_fn, int rename_fn_
 		&& (-1 == fchown(channel, user_id, group_id)))
 	{
 		info->status = errno;
-		STATUS_MSG(info);
+		STATUS_MSG(info, info->jnl_len, info->jnl, info->fn_len, info->fn);
 		F_CLOSE(channel, status);
 		return EXIT_ERR;
 	}
 	if (-1 == FCHMOD(channel, perm))
 	{
 		info->status = errno;
-		STATUS_MSG(info);
+		STATUS_MSG(info, info->jnl_len, info->jnl, info->fn_len, info->fn);
 		F_CLOSE(channel, status);	/* resets "channel" to FD_INVALID */
 		return EXIT_ERR;
 	}
@@ -305,7 +300,7 @@ uint4 cre_jnl_file_common(jnl_create_info *info, char *rename_fn, int rename_fn_
 	 * file header write only the real file header and not the 0-padding.
 	 */
 	JNL_DO_FILE_WRITE(csa, create_fn, channel, 0, header, JNL_HDR_LEN, info->status, info->status2);
-	STATUS_MSG(info);
+	STATUS_MSG(info, info->jnl_len, info->jnl, info->fn_len, info->fn);
 	RETURN_ON_ERROR(info);
 	assert(DISK_BLOCK_SIZE >= EPOCH_RECLEN + EOF_RECLEN + PFIN_RECLEN + PINI_RECLEN);
 	pini_record = (struct_jrec_pini *)&jrecbuf[0];
@@ -395,7 +390,7 @@ uint4 cre_jnl_file_common(jnl_create_info *info, char *rename_fn, int rename_fn_
 	assert(ROUND_UP2(header->virtual_size, jnl_fs_block_size/DISK_BLOCK_SIZE)
 			> DIVIDE_ROUND_UP(JNL_HDR_LEN + write_size, DISK_BLOCK_SIZE));
 	JNL_DO_FILE_WRITE(csa, create_fn, channel, JNL_HDR_LEN, jrecbuf, write_size, info->status, info->status2);
-	STATUS_MSG(info);
+	STATUS_MSG(info, info->jnl_len, info->jnl, info->fn_len, info->fn);
 	RETURN_ON_ERROR(info);
 	GTM_JNL_FSYNC(csa, channel, status);
 	F_CLOSE(channel, status);	/* resets "channel" to FD_INVALID */
@@ -425,13 +420,11 @@ uint4 cre_jnl_file_common(jnl_create_info *info, char *rename_fn, int rename_fn_
 	if (SS_NORMAL != (info->status = gtm_rename((char *)info->jnl, (int)info->jnl_len,
 						    (char *)rename_fn, rename_fn_len, &info->status2)))
 	{
-		if (IS_GTM_IMAGE)
-			send_msg_csa(CSA_ARG(csa) VARLSTCNT(6) ERR_RENAMEFAIL, 4, info->jnl_len, info->jnl, rename_fn_len,
-					rename_fn);
-		else
-			gtm_putmsg_csa(CSA_ARG(csa) VARLSTCNT(6) ERR_RENAMEFAIL, 4, info->jnl_len, info->jnl, rename_fn_len,
-					rename_fn);
-		STATUS_MSG(info);
+		send_msg_csa(CSA_ARG(csa) VARLSTCNT(6) ERR_RENAMEFAIL, 4, info->jnl_len, info->jnl, rename_fn_len, rename_fn);
+		if (!(IS_GTM_IMAGE))
+			gtm_putmsg_csa(CSA_ARG(csa) VARLSTCNT(6) ERR_RENAMEFAIL, 4, info->jnl_len, info->jnl,
+					rename_fn_len, rename_fn);
+		STATUS_MSG(info, info->jnl_len, info->jnl, rename_fn, rename_fn_len);
 		return EXIT_ERR;
 	}
 	/* Following does rename of a.mjl_new to a.mjl.
@@ -441,21 +434,16 @@ uint4 cre_jnl_file_common(jnl_create_info *info, char *rename_fn, int rename_fn_
 	if (SS_NORMAL !=  (info->status = gtm_rename((char *)create_fn, create_fn_len,
 						     (char *)info->jnl, (int)info->jnl_len, &info->status2)))
 	{
-		if (IS_GTM_IMAGE)
-			send_msg_csa(CSA_ARG(csa) VARLSTCNT(6) ERR_RENAMEFAIL, 4, info->jnl_len, info->jnl, rename_fn_len,
-					rename_fn);
-		else
-			gtm_putmsg_csa(CSA_ARG(csa) VARLSTCNT(6) ERR_RENAMEFAIL, 4, info->jnl_len, info->jnl, rename_fn_len,
-					rename_fn);
-		STATUS_MSG(info);
+		send_msg_csa(CSA_ARG(csa) VARLSTCNT(6) ERR_RENAMEFAIL, 4, create_fn_len, create_fn, info->jnl_len, info->jnl);
+		if (!(IS_GTM_IMAGE))
+			gtm_putmsg_csa(CSA_ARG(csa) VARLSTCNT(6) ERR_RENAMEFAIL, 4, info->jnl_len, info->jnl,
+					rename_fn_len, rename_fn);
+		STATUS_MSG(info, create_fn_len, create_fn, info->jnl_len, info->jnl);
 		return EXIT_ERR;
 	}
-	if (IS_GTM_IMAGE)
-		send_msg_csa(CSA_ARG(csa) VARLSTCNT (6) ERR_FILERENAME, 4, info->jnl_len, info->jnl, rename_fn_len,
-				rename_fn);
-	else
-		gtm_putmsg_csa(CSA_ARG(csa) VARLSTCNT (6) ERR_FILERENAME, 4, info->jnl_len, info->jnl, rename_fn_len,
-				rename_fn);
+	send_msg_csa(CSA_ARG(csa) VARLSTCNT (6) ERR_FILERENAME, 4, info->jnl_len, info->jnl, rename_fn_len, rename_fn);
+	if (!(IS_GTM_IMAGE))
+		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))
 	{
diff --git a/sr_port/cre_jnl_file_intrpt_rename.c b/sr_port/cre_jnl_file_intrpt_rename.c
index 836f48b..0ed0f29 100755
--- a/sr_port/cre_jnl_file_intrpt_rename.c
+++ b/sr_port/cre_jnl_file_intrpt_rename.c
@@ -63,9 +63,8 @@ void cre_jnl_file_intrpt_rename(sgmnt_addrs *csa)
 	status1 = gtm_file_stat(&filestr, NULL, NULL, FALSE, &ustatus);
 	if (FILE_STAT_ERROR == status1)
 	{
-		if (IS_GTM_IMAGE)
-			send_msg_csa(CSA_ARG(csa) VARLSTCNT(5) ERR_FILEPARSE, 2, filestr.len, filestr.addr, ustatus);
-		else
+		send_msg_csa(CSA_ARG(csa) VARLSTCNT(5) ERR_FILEPARSE, 2, filestr.len, filestr.addr, ustatus);
+		if (!(IS_GTM_IMAGE))
 			gtm_putmsg_csa(CSA_ARG(csa) VARLSTCNT(5) ERR_FILEPARSE, 2, filestr.len, filestr.addr, ustatus);
 		return;
 	}
@@ -74,9 +73,8 @@ void cre_jnl_file_intrpt_rename(sgmnt_addrs *csa)
 	status2 = gtm_file_stat(&filestr, NULL, NULL, FALSE, &ustatus);
 	if (FILE_STAT_ERROR == status2)
 	{
-		if (IS_GTM_IMAGE)
-			send_msg_csa(CSA_ARG(csa) VARLSTCNT(5) ERR_FILEPARSE, 2, filestr.len, filestr.addr, ustatus);
-		else
+		send_msg_csa(CSA_ARG(csa) VARLSTCNT(5) ERR_FILEPARSE, 2, filestr.len, filestr.addr, ustatus);
+		if (!(IS_GTM_IMAGE))
 			gtm_putmsg_csa(CSA_ARG(csa) VARLSTCNT(5) ERR_FILEPARSE, 2, filestr.len, filestr.addr, ustatus);
 		return;
 	}
@@ -87,18 +85,16 @@ void cre_jnl_file_intrpt_rename(sgmnt_addrs *csa)
 			status = gtm_rename(filestr.addr, (int)filestr.len, (char *)fn, fn_len, &ustatus);
 			if (SYSCALL_ERROR(status))
 			{
-				if (IS_GTM_IMAGE)
-					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);
+				send_msg_csa(CSA_ARG(csa) VARLSTCNT(7) ERR_RENAMEFAIL, 4, filestr.len, filestr.addr,
+						fn_len, fn, status);
+				if (!(IS_GTM_IMAGE))
+					gtm_putmsg_csa(CSA_ARG(csa) VARLSTCNT(7) ERR_RENAMEFAIL, 4, filestr.len, filestr.addr,
+							fn_len, fn, status);
 			} else
 			{
-				if (IS_GTM_IMAGE)
-					send_msg_csa(CSA_ARG(csa) VARLSTCNT(6) ERR_FILERENAME, 4, (int)filestr.len, filestr.addr,
-							fn_len, fn);
-				else
+				send_msg_csa(CSA_ARG(csa) VARLSTCNT(6) ERR_FILERENAME, 4, (int)filestr.len, filestr.addr,
+						fn_len, fn);
+				if (!(IS_GTM_IMAGE))
 					gtm_putmsg_csa(CSA_ARG(csa) VARLSTCNT(6) ERR_FILERENAME, 4, filestr.len, filestr.addr,
 							fn_len, fn);
 			}
@@ -110,17 +106,14 @@ void cre_jnl_file_intrpt_rename(sgmnt_addrs *csa)
 			status = gtm_file_remove(filestr.addr, (int)filestr.len, &ustatus);
 			if (SYSCALL_ERROR(status))
 			{
-				if (IS_GTM_IMAGE)
-					send_msg_csa(CSA_ARG(csa) VARLSTCNT(5) ERR_FILEDELFAIL, 2, filestr.len,
-							filestr.addr, status);
-				else
+				send_msg_csa(CSA_ARG(csa) VARLSTCNT(5) ERR_FILEDELFAIL, 2, filestr.len, filestr.addr, status);
+				if (!(IS_GTM_IMAGE))
 					gtm_putmsg_csa(CSA_ARG(csa) VARLSTCNT(5) ERR_FILEDELFAIL, 2, filestr.len,
 								filestr.addr, status);
 			} else
 			{
-				if (IS_GTM_IMAGE)
-					send_msg_csa(CSA_ARG(csa) VARLSTCNT(4) ERR_FILEDEL, 2, filestr.len, filestr.addr);
-				else
+				send_msg_csa(CSA_ARG(csa) VARLSTCNT(4) ERR_FILEDEL, 2, filestr.len, filestr.addr);
+				if (!(IS_GTM_IMAGE))
 					gtm_putmsg_csa(CSA_ARG(csa) VARLSTCNT(4) ERR_FILEDEL, 2, filestr.len, filestr.addr);
 			}
 		}
diff --git a/sr_port/desired_db_format_set.c b/sr_port/desired_db_format_set.c
index 0452e2e..c9e935d 100644
--- a/sr_port/desired_db_format_set.c
+++ b/sr_port/desired_db_format_set.c
@@ -144,7 +144,7 @@ int4	desired_db_format_set(gd_region *reg, enum db_ver new_db_format, char *comm
 	}
 	if (JNL_ENABLED(csd))
 	{
-		SET_GBL_JREC_TIME;	/* needed for jnl_ensure_open, jnl_put_jrt_pini and jnl_write_aimg_rec */
+		SET_GBL_JREC_TIME;	/* needed for jnl_ensure_open, jnl_write_pini and jnl_write_aimg_rec */
 		jpc = csa->jnl;
 		jbp = jpc->jnl_buff;
 		/* Before writing to jnlfile, adjust jgbl.gbl_jrec_time if needed to maintain time order of jnl records.
@@ -159,7 +159,7 @@ int4	desired_db_format_set(gd_region *reg, enum db_ver new_db_format, char *comm
 			inctn_opcode = inctn_db_format_change;
 			inctn_detail.blks2upgrd_struct.blks_to_upgrd_delta = csd->blks_to_upgrd;
 			if (0 == jpc->pini_addr)
-				jnl_put_jrt_pini(csa);
+				jnl_write_pini(csa);
 			jnl_write_inctn_rec(csa);
 			inctn_opcode = save_inctn_opcode;
 		} else
diff --git a/sr_port/dpgbldir.c b/sr_port/dpgbldir.c
index bcbe296..b0ede9e 100644
--- a/sr_port/dpgbldir.c
+++ b/sr_port/dpgbldir.c
@@ -26,7 +26,6 @@
 #include "gbldirnam.h"
 #include "hashtab_mname.h"
 #include "iosize.h"
-#include "probe.h"
 #include "dpgbldir.h"
 #include "filestruct.h"
 #include "aio_shim.h"
@@ -396,15 +395,9 @@ gd_addr *get_next_gdr(gd_addr *prev)
 {
 	gd_addr	*ptr;
 
-	if (!prev)
+	if (NULL == prev)
 		return gd_addr_head;
-
-	for (ptr = gd_addr_head;  ptr && ptr != prev;  ptr = ptr->link)
-		if (!GTM_PROBE(SIZEOF(*ptr), ptr, READ)) /* Called from secshr, have to check access to memory */
-			return NULL;
-	if (ptr && GTM_PROBE(SIZEOF(*ptr), ptr, READ))
-		return ptr->link;
-	return NULL;
+	return prev->link;
 }
 
 /* Maintain list of regions for GTCM_SERVER */
diff --git a/sr_port/dse_dmp_fhead.c b/sr_port/dse_dmp_fhead.c
index 611effd..475b4f9 100755
--- a/sr_port/dse_dmp_fhead.c
+++ b/sr_port/dse_dmp_fhead.c
@@ -88,12 +88,12 @@ void dse_dmp_fhead (void)
 {
 	boolean_t		is_mm, jnl_buff_open;
 	unsigned char		util_buff[MAX_UTIL_LEN], buffer[MAXNUMLEN];
-	int			util_len, rectype, time_len, index, activeque_cnt, freeque_cnt, wipque_cnt;
+	int			util_len, rectype, time_len, index, activeque_cnt, freeque_cnt, wipque_cnt, i, j;
 	uint4			jnl_status;
 	enum jnl_state_codes	jnl_state;
 	gds_file_id		zero_fid;
 	mval			dollarh_mval, zdate_mval;
-	char			dollarh_buffer[MAXNUMLEN], zdate_buffer[SIZEOF(DSE_DMP_TIME_FMT)];
+	char			dollarh_buffer[MAXNUMLEN], zdate_buffer[SIZEOF(DSE_DMP_TIME_FMT)], fullblockwrite_buffer[255], *k;
 	sgmnt_addrs		*csa;
 	sgmnt_data_ptr_t	csd;
 	node_local_ptr_t	cnl;
@@ -332,9 +332,7 @@ void dse_dmp_fhead (void)
 	}
 	if (NEED_TO_DUMP("ENVIRONMENT"))
 	{
-                util_out_print(0, TRUE);
-		util_out_print("  Full Block Writes                  !AD", FALSE, 6,
-			(csa->do_fullblockwrites) ? "    ON" : "   OFF");
+		util_out_print("  Full Block Writes                       !UL", FALSE, csa->do_fullblockwrites);
 		util_out_print("  Full Block Write Len  !12UL", TRUE, csa->fullblockwrite_len);
 	}
 	if (NEED_TO_DUMP("DB_CSH"))
@@ -390,6 +388,18 @@ void dse_dmp_fhead (void)
 		util_out_print("  bytcnt                  0x!XL", FALSE, jb->bytcnt);
 		util_out_print("      ", FALSE);
 		util_out_print("  Max_write_size          0x!XL", TRUE, jb->max_write_size);
+		util_out_print("  Reserved Free           0x!XL", FALSE, jb->rsrv_free);
+		util_out_print("      ", FALSE);
+		util_out_print("  Reserved Freeaddr       0x!XL", TRUE, jb->rsrv_freeaddr);
+		util_out_print("  Alignsize               0x!XL", FALSE, jb->alignsize);
+		util_out_print("      ", FALSE);
+		util_out_print("  Next Align Rec Addr     0x!XL", TRUE, jb->next_align_addr);
+		util_out_print("  Phase2 Commit Index1    0x!XL", FALSE, jb->phase2_commit_index1);
+		util_out_print("      ", FALSE);
+		util_out_print("  Phase2 Commit Index2    0x!XL", TRUE, jb->phase2_commit_index2);
+		util_out_print("  Phase2 Commit MaxIndex  0x!XL", FALSE, JNL_PHASE2_COMMIT_ARRAY_SIZE);
+		util_out_print("      ", FALSE);
+		util_out_print("  Phase2Commit LatchPid !12UL", TRUE, jb->phase2_commit_latch.u.parts.latch_pid);
 		util_out_print("  Before image                 !AD", FALSE, 5, (jb->before_images ? " TRUE" : "FALSE"));
 		util_out_print("      ", FALSE);
 		util_out_print("  Filesize              !12UL", TRUE, jb->filesize);
diff --git a/sr_port/emit_code.c b/sr_port/emit_code.c
index b9038c0..0167ed9 100644
--- a/sr_port/emit_code.c
+++ b/sr_port/emit_code.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	*
@@ -196,7 +196,6 @@ void trip_gen(triple *ct)
 			assert(CGP_APPROX_ADDR == cg_phase);
 		} else
 			jmp_offset = ct->operand[0].oprval.tref->rtaddr - ct->rtaddr;
-
 		switch(ct->opcode)
 		{
 			case OC_CALL:
@@ -430,7 +429,6 @@ short *emit_vax_inst (short *inst, oprtype **fst_opr, oprtype **lst_opr)
 					 * which will be in EAX.
 					 */
 					X86_64_ONLY(GEN_CMP_EAX_IMM32(0));
-
 					if (VXI_BLBC == sav_in)
 					{
 						X86_64_ONLY(emit_jmp(GENERIC_OPCODE_BEQ, &inst, 0));
@@ -684,7 +682,6 @@ short *emit_vax_inst (short *inst, oprtype **fst_opr, oprtype **lst_opr)
 						} else
 						{
 							boolean_t addr;
-
 							assert(0x50 == *inst);  /* register mode: (from) r0 */
 							inst++;
 							if ((VXT_VAL == *inst) || (VXT_ADDR == *inst))
@@ -696,7 +693,6 @@ short *emit_vax_inst (short *inst, oprtype **fst_opr, oprtype **lst_opr)
 							} else if (VXT_REG == *inst)
 							{
 								inst++;
-
 #								ifdef TRUTH_IN_REG
 								if (0x5a == *inst)	/* to VAX r10 or $TEST */
 								{
@@ -858,7 +854,6 @@ void emit_jmp(uint4 branchop, short **instp, int reg)
 	/* assert(jmp_offset != 0); */
 	/* assert commented since jmp_offset could be zero in CGP_ADDR_OPT phase after a jump to the immediately following
 	 * instruction is nullified (as described below) */
-
 	/* size of this particular instruction */
 	jmp_offset -= (int)((char *)&code_buf[code_idx] - (char *)&code_buf[0]);
 #	if !(defined(__MVS__) || defined(Linux390))
@@ -987,7 +982,6 @@ void emit_jmp(uint4 branchop, short **instp, int reg)
 					 */
 					branch_offset = BRANCH_OFFSET_FROM_IDX(skip_idx, code_idx);
 					RISC_ONLY(code_buf[skip_idx] |= IGEN_COND_BRANCH_OFFSET(branch_offset));
-
 					NON_RISC_ONLY(
 						tmp_code_idx = code_idx;
 						code_idx = skip_idx;
@@ -1093,7 +1087,6 @@ void emit_trip(oprtype *opr, boolean_t val_output, uint4 generic_inst, int trg_r
 								emit_base_offset(reg, LONG_JUMP_OFFSET);
 								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++);
@@ -1164,7 +1157,6 @@ void emit_trip(oprtype *opr, boolean_t val_output, uint4 generic_inst, int trg_r
 					NON_GTM64_ONLY(assertpro((0 <= offset) &&  (MAX_OFFSET >= offset)));
 					emit_base_offset(GTM_REG_FRAME_TMP_PTR, offset);
 					break;
-
 				case TCAD_REF:
 				case TVAD_REF:
 				case TVAR_REF:
@@ -1402,7 +1394,6 @@ void emit_trip(oprtype *opr, boolean_t val_output, uint4 generic_inst, int trg_r
 					emit_base_offset(reg, offset);
 					if (val_output)	/* indirection */
 					{
-
 						if (GENERIC_OPCODE_LDA == generic_inst)
 						{
 							RISC_ONLY(code_buf[code_idx++] |= IGEN_LOAD_NATIVE_REG(trg_reg));
@@ -1432,7 +1423,6 @@ void emit_trip(oprtype *opr, boolean_t val_output, uint4 generic_inst, int trg_r
 					ocnt_ref_seen = TRUE;
 					ocnt_ref_opr = opr;
 					break;
-
 				default:
 					assertpro(FALSE && opr->oprclass);
 					break;
@@ -1477,7 +1467,7 @@ void emit_trip(oprtype *opr, boolean_t val_output, uint4 generic_inst, int trg_r
 								inst_emitted = TRUE;
 							} else
 							{
-	 							RISC_ONLY(code_buf[code_idx++]
+								RISC_ONLY(code_buf[code_idx++]
 										|= 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);
@@ -1849,12 +1839,10 @@ void emit_call_xfer(int xfer)
         } else
         {
                 GEN_XFER_TBL_CALL_DIRECT(xfer);
-
         }
 #	else
 	GEN_XFER_TBL_CALL(xfer);
 #	endif /* __ia64 */
-
 	/* In the normal case we will return */
 	if (!ocnt_ref_seen)
 		return;		/* fast test for return .. we hope */
diff --git a/sr_port/eval_expr.c b/sr_port/eval_expr.c
index 80163b1..4392ee9 100755
--- a/sr_port/eval_expr.c
+++ b/sr_port/eval_expr.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	*
@@ -62,7 +62,7 @@ int eval_expr(oprtype *a)
 	SETUP_THREADGBL_ACCESS;
 	if (!expratom(&optyp_1))
 	{	/* If didn't already add an error of our own, do so now with catch all expression error */
-		if (OC_RTERROR != (TREF(curtchain))->exorder.bl->exorder.bl->exorder.bl->opcode)
+		if (!ALREADY_RTERROR)
 			stx_error(ERR_EXPR);
 		return EXPR_FAIL;
 	}
diff --git a/sr_port/ex_tail.c b/sr_port/ex_tail.c
index 7a46c56..a286044 100755
--- a/sr_port/ex_tail.c
+++ b/sr_port/ex_tail.c
@@ -35,43 +35,49 @@ void ex_tail(oprtype *opr)
 	mval		*v, *v0, *v1;
 	opctype		c;
 	oprtype		*i;
-	triple		pos_in_chain, *bftrip, *bitrip, *t, *t0, *t1, *t2;
+	triple		*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;
+	RETURN_IF_RTS_ERROR;
+	t = opr->oprval.tref; /* Refind t since UNARY_TAIL may have shifted it */
 	c = t->opcode;
 	oct = oc_tab[c].octype;
-	if (OCT_EXPRLEAF & oct)
+	if ((OCT_EXPRLEAF & oct) || (OC_NOOP == c))
 		return;
 	assert(TRIP_REF == t->operand[0].oprclass);
 	assert((TRIP_REF == t->operand[1].oprclass) || (NO_REF == t->operand[1].oprclass));
 	if (!(OCT_BOOL & oct))
 	{
-		for (i = t->operand; ARRAYTOP(t->operand) > i; i++)
+		for (i = t->operand, j = 0; ARRAYTOP(t->operand) > i; i++, j++)
+		{
 			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 (t0 = i->oprval.tref; OCT_UNARY & oc_tab[t0->opcode].octype; t0 = t0->operand[0].oprval.tref)
+					;
+				if (OCT_BOOL & oc_tab[t0->opcode].octype)
+					bx_boollit(t0);
+				ex_tail(i);			/* chained Boolean or arithmetic */
+				RETURN_IF_RTS_ERROR;
+			}
+		}
+		while (OCT_ARITH & oct)					/* really a sneaky if that allows us to use breaks */
+		{	/* Consider moving this to a separate module (say, ex_arithlit) for clarity and modularity */
+			/* 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 (t0 = t->operand[0].oprval.tref; TRIP_REF == t0->operand[0].oprclass; t0 = t0->operand[0].oprval.tref)
+				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);
+				dqdel(t1, exorder);
 			v0 = &t0->operand[0].oprval.mlit->v;
 			assert(MV_NM & v0->mvtype);
 			v1 = &t1->operand[0].oprval.mlit->v;
@@ -109,135 +115,50 @@ void ex_tail(oprtype *opr)
 				assertpro(FALSE && t1->opcode);
 				break;
 			}
+			RETURN_IF_RTS_ERROR;
 			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);
+			assert(v->mvtype);
 			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 == (t0 = t->operand[0].oprval.tref)->opcode))	/* WARNING assignment */
+		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 */
+	/* the following code deals with Booleans where the expression is not directly managing flow - those go through bool_expr */
 	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))
+		if (!(OCT_BOOL & oc_tab[t2->opcode].octype))
 			break;
 	}
 	bitrip = maketriple(OC_BOOLINIT);
+	DEBUG_ONLY(bitrip->src = t->src);
 	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));
+	assert(&t2->operand[0] == opr);				/* check next operation ensures an expression */
 	if (OC_COMINT == t2->opcode)
 		dqdel(t2, exorder);
 	bftrip = maketriple(OC_BOOLFINI);
+	DEBUG_ONLY(bftrip->src = t->src);
 	bftrip->operand[0] = put_tref(bitrip);
+	opr->oprval.tref = bitrip;
 	dqins(t, exorder, bftrip);
 	i = (oprtype *)mcalloc(SIZEOF(oprtype));
 	bx_tail(t, FALSE, i);
+	RETURN_IF_RTS_ERROR;
 	*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)
-		{
-			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;
-		}
-		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/expr.c b/sr_port/expr.c
index 7ef2b1e..3b423e5 100755
--- a/sr_port/expr.c
+++ b/sr_port/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	*
@@ -28,7 +29,9 @@ int expr(oprtype *a, int m_type)
 		return FALSE;
 	}
 	coerce(a, (MUMPS_INT == m_type) ? OCT_MINT : OCT_MVAL);
-	ex_tail(a);
+	ex_tail(a);	/* There is a chance this will return a OCT_MVAL when we want OCT_MINT; force it again */
+	RETURN_EXPR_IF_RTS_ERROR;
+	coerce(a, (MUMPS_INT == m_type) ? OCT_MINT : OCT_MVAL);	/* Investigate whether ex_tail can do a better job */
 	if (TREF(expr_start) != TREF(expr_start_orig) && (OC_NOOP != (TREF(expr_start))->opcode))
 	{
 		assert((OC_GVSAVTARG == (TREF(expr_start))->opcode));
diff --git a/sr_port/f_select.c b/sr_port/f_select.c
old mode 100755
new mode 100644
index 00a24ec..79b9085
--- a/sr_port/f_select.c
+++ b/sr_port/f_select.c
@@ -21,6 +21,8 @@
 #include "fullbool.h"
 #include "stringpool.h"
 
+GBLREF	triple		t_orig;
+
 error_def(ERR_COLON);
 error_def(ERR_SELECTFALSE);
 
@@ -44,7 +46,8 @@ int f_select(oprtype *a, opctype op)
 	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		dmpchain, *oldchain, *r, *ref, *savechain, *save_start, *save_start_orig, tmpchain, *triptr;
+	triple		dmpchain, *loop_save_start, *loop_save_start_orig, *oldchain, *r, *ref, *savechain, *save_start,
+			*save_start_orig, tmpchain, *triptr;
 	uint4		save_expr_depth, save_se_depth;
 	DCL_THREADGBL_ACCESS;
 
@@ -78,9 +81,17 @@ int f_select(oprtype *a, opctype op)
 	first_time = TRUE;
 	got_true = throwing = FALSE;
 	endtrip = put_tjmp(r);
+	cnd = NULL;
+	savechain = NULL;
 	for (;;)
 	{
-		cnd = (oprtype *)mcalloc(SIZEOF(oprtype));
+		if (NULL == cnd)
+			cnd = (oprtype *)mcalloc(SIZEOF(oprtype));
+		if (shifting && !got_true)
+		{
+			loop_save_start = TREF(expr_start);
+			loop_save_start_orig = TREF(expr_start_orig);
+		}
 		if (!bool_expr(FALSE, cnd))
 		{
 			SELECT_CLEANUP;
@@ -98,7 +109,7 @@ int f_select(oprtype *a, opctype op)
 		}
 		advancewindow();
 		for (triptr = (TREF(curtchain))->exorder.bl; OC_NOOP == triptr->opcode; triptr = triptr->exorder.bl)
-			;
+			;	/* get back, get back to where we once belonged - to find an indicator of the actual result */
 		if (!got_true && OC_LIT == triptr->opcode)
 		{	/* it is a literal not following an already optimizing TRUE, so optimize it */
 			dqdel(triptr, exorder);
@@ -110,8 +121,8 @@ int f_select(oprtype *a, opctype op)
 				savechain = setcurtchain(&dmpchain);
 			} else
 			{	/* it's TRUE: take this argument and disregard any following */
+				assert(!throwing && (NULL == savechain));
 				got_true = TRUE;
-				savechain = NULL;
 			}
 		}
 		if (EXPR_FAIL == expr(&tmparg, MUMPS_EXPR))
@@ -119,6 +130,10 @@ int f_select(oprtype *a, opctype op)
 			SELECT_CLEANUP;
 			if (shifting)
 				setcurtchain(oldchain);
+			else if ((NULL != savechain)
+				/* the below guards against returning to a chain that should be abandoned because of an error */
+				&& (((TREF(curtchain)) != &t_orig) || (!ALREADY_RTERROR)))
+				setcurtchain(savechain);
 			return FALSE;
 		}
 		assert(TRIP_REF == tmparg.oprclass);
@@ -126,6 +141,12 @@ int f_select(oprtype *a, opctype op)
 		{	/* finished with the false argument so put things back to normal */
 			assert(savechain);
 			setcurtchain(savechain);
+			if (shifting)
+			{
+				TREF(expr_start) = loop_save_start;
+				TREF(expr_start_orig) = loop_save_start_orig;
+			}
+			savechain = NULL;
 			throwing = FALSE;
 			if (TK_COMMA != TREF(window_token))
 				break;
@@ -135,15 +156,22 @@ int f_select(oprtype *a, opctype op)
 		old_op = tmparg.oprval.tref->opcode;
 		if (first_time)
 		{
-			if ((OC_LIT == old_op) || (oc_tab[old_op].octype & OCT_MVADDR))
+			first_time = FALSE;
+			if (got_true && (OC_LIT == old_op))
+			{	/* if this is the only possible result, NOOP the OC_PASSTHRU so tmparg becomes the return value */
+				assert((OC_PASSTHRU == r->opcode) && (NO_REF == r->operand[0].oprclass));
+				r = tmparg.oprval.tref;
+			} else
 			{
-				ref = newtriple(OC_STOTEMP);
-				ref->operand[0] = tmparg;
-				tmparg = put_tref(ref);
+				if ((OC_LIT == old_op) || (oc_tab[old_op].octype & OCT_MVADDR))
+				{
+					ref = newtriple(OC_STOTEMP);
+					ref->operand[0] = tmparg;
+					tmparg = put_tref(ref);
+				}
+				r->operand[0] = target = tmparg;
 			}
-			r->operand[0] = target = tmparg;
-			first_time = FALSE;
-		} else
+		} else if (OC_PASSTHRU == r->opcode)
 		{
 			ref = newtriple(OC_STO);
 			ref->operand[0] = target;
@@ -156,7 +184,7 @@ int f_select(oprtype *a, opctype op)
 				ref->operand[1] = put_tref(tmparg.oprval.tref->operand[0].oprval.tref);
 			}
 		}
-		if (!got_true && !throwing)
+		if (!got_true)
 		{	/* 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;
@@ -166,12 +194,25 @@ int f_select(oprtype *a, opctype op)
 			break;
 		advancewindow();
 		if (got_true && (NULL == savechain))
+		{
+			if (shifting)
+			{
+				loop_save_start = TREF(expr_start);
+				loop_save_start_orig = TREF(expr_start_orig);
+			}
 			savechain = setcurtchain(&dmpchain);	/* discard arguments after a compile time TRUE */
+		}
+		cnd = NULL;
 	}
 	if (got_true)
 	{
+		if (shifting)
+		{
+			TREF(expr_start) = loop_save_start;
+			TREF(expr_start_orig) = loop_save_start_orig;
+		}
 		if (NULL != savechain)
-			setcurtchain(savechain);		/* if we discarded things return the chain to normal */
+			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);
@@ -184,7 +225,8 @@ int f_select(oprtype *a, opctype op)
 		ref->operand[0] = tmparg;
 		ref->operand[1] = put_ilit(FALSE);		/* Not a subroutine reference */
 	}
-	ins_triple(r);
+	if (OC_PASSTHRU == r->opcode)
+		ins_triple(r);
 	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 */
@@ -197,7 +239,7 @@ int f_select(oprtype *a, opctype op)
 	SELECT_CLEANUP;	/* restores TREF(expr_depth), TREF(side_effect_base) and TREF(side_effect_depth) */
 	if (shifting)
 	{
-		shifting = ((1 < TREF(expr_depth)) || ((save_start != save_start_orig) && (OC_NOOP != save_start->opcode)));
+		shifting = ((1 < save_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);
@@ -209,7 +251,7 @@ int f_select(oprtype *a, opctype op)
 			triptr = newtriple(OC_GVRECTARG);
 			triptr->operand[0] = put_tref(save_start);
 		}
-				TREF(expr_start) = save_start;
+		TREF(expr_start) = save_start;
 	}
 	*a = put_tref(r);
 	return TRUE;
diff --git a/sr_port/gbldefs.c b/sr_port/gbldefs.c
index 766bf52..b39ffb6 100644
--- a/sr_port/gbldefs.c
+++ b/sr_port/gbldefs.c
@@ -318,7 +318,7 @@ GBLDEF	void			(*tp_timeout_start_timer_ptr)(int4 tmout_sec) = tp_start_timer_dum
 GBLDEF	void			(*tp_timeout_clear_ptr)(void) = tp_clear_timeout_dummy;
 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	int			(*op_open_ptr)(mval *v, mval *p, mval *t, mval *mspace) = op_open_dummy;
 GBLDEF	void			(*unw_prof_frame_ptr)(void) = unw_prof_frame_dummy;
 /* Initialized only in gtm_startup() */
 GBLDEF	void			(*jnl_file_close_timer_ptr)(void);
@@ -717,7 +717,7 @@ GBLDEF	boolean_t	gvdupsetnoop = TRUE;	/* if TRUE, duplicate SETs do not change G
 						 * incremented and logical SET journal records will be written. By default, this
 						 * behavior is turned ON. GT.M has a way of turning it off with a VIEW command.
 						 */
-GBLDEF boolean_t	gtm_fullblockwrites;	/* Do full (not partial) database block writes T/F */
+GBLDEF  int4		gtm_fullblockwrites;	/* Do full (not partial) 1. file system block writes, or 2. database block writes */
 GBLDEF	volatile boolean_t	in_wcs_recover;	/* TRUE if in "wcs_recover", used by "bt_put" and "generic_exit_handler" */
 GBLDEF	boolean_t	in_gvcst_incr;		/* set to TRUE by gvcst_incr, set to FALSE by gvcst_put
 						 * distinguishes to gvcst_put, if the current db operation is a SET or $INCR */
@@ -738,7 +738,6 @@ GBLDEF	mvax		*mvaxtab,*mvaxtab_end;
 GBLDEF	mlabel		*mlabtab;
 GBLDEF	mline		mline_root;
 GBLDEF	mline		*mline_tail;
-GBLDEF	short int	block_level;
 GBLDEF	triple		t_orig;
 GBLDEF	int		mvmax, mlmax, mlitmax;
 static	char		routine_name_buff[SIZEOF(mident_fixed)], module_name_buff[SIZEOF(mident_fixed)];
diff --git a/sr_port/gde.m b/sr_port/gde.m
index 16d944f..0997672 100755
--- a/sr_port/gde.m
+++ b/sr_port/gde.m
@@ -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,14 +33,15 @@ DBG:	;transfer point for DEBUG and "runtime" %gde
 	s gdeEntryState("zlevel")=$zlevel-1
 	s gdeEntryState("io")=$io
 	s $et=$s(debug:"b:$zs'[""%GDE""!allerrs  ",1:"")_"g:(""%GDE%NONAME""[$p($p($zs,"","",3),""-"")) SHOERR^GDE d ABORT^GDE"
-	s io=$io,useio="io",comlevel=0,combase=$zl,resume(0)=$zl_":INTERACT"
+	s io=$io,useio="io",comlevel=0,combase=$zl,resume(comlevel)=$zl_":INTERACT"
 	i $$set^%PATCODE("M")
 	d GDEINIT^GDEINIT,GDEMSGIN^GDEMSGIN,GDFIND^GDESETGD,CREATE^GDEGET:create,LOAD^GDEGET:'create
 	i debug s prompt="DEBUGDE>",uself="logfile"
 	e  s prompt="GDE>",uself="logfile:(ctrap=$c(3,25,26):exception=""d CTRL^GDE"")"
 	e  s useio="io:(ctrap=$c(3,25,26):exception=""d CTRL^GDE"")"
 	u @useio
-	i $l(comline) d comline,EXIT^GDEEXIT
+	; comline is set to $ZCMDLINE on entry. If the entry zlevel is 0, set the resume point to exit
+	i $l(comline) s:'gdeEntryState("zlevel") resume(comlevel)=$zl_":EXIT^GDEEXIT" d comline,EXIT^GDEEXIT
 	i runtime s prompt="GD_SHOW>",verb="SHOW",x="" f  s x=$o(syntab(x)) q:'$l(x)  i x'="SHOW" k syntab(x)
 INTERACT
 	f  u io:ctrap=$c(25,26) w !,prompt," " r comline u @useio d comline:$l(comline)
@@ -67,7 +68,7 @@ CTRL
 	d ABORT
 	;
 comexit: i 'update d QUIT^GDEQUIT
-	i $$ALL^GDEVERIF,$$GDEPUT^GDEPUT
+	i $$ALL^GDEVERIF,$$GDEPUT^GDEPUT s $zstatus=""
 	e  w $p($zm(gdeerr("VERIFY")\2*2),"!AD")_"FAILED" w !
 	d GETOUT^GDEEXIT
 	h
@@ -89,7 +90,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
+	e  s ($ecode,$zstatus)=""	; clear IOEOF condition (not an error) so later GDE can exit with 0 status
 	q
 SCRIPT:
 	s comlevel=comlevel+1
diff --git a/sr_port/gdeexit.m b/sr_port/gdeexit.m
index 5ef4600..a3b081c 100755
--- a/sr_port/gdeexit.m
+++ b/sr_port/gdeexit.m
@@ -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,7 +12,8 @@
 exit:	;implement the verb: EXIT
 EXIT
 	i 'update d QUIT^GDEQUIT
-	i '$$ALL^GDEVERIF  zm gdeerr("NOEXIT")  q
+	; At $zlevel 1 and 2 the EXIT command is implied and therefore must exit
+	i '$$ALL^GDEVERIF  s $zstatus=gdeerr("NOEXIT") zm gdeerr("NOEXIT") d:3>$zlevel GETOUT^GDEEXIT q
 	i '$$GDEPUT^GDEPUT  q	 ; zm is issued in GDEPUT.m
 	d GETOUT^GDEEXIT
 	h
@@ -36,6 +37,6 @@ GETOUT	; Routine executed just before exiting from GDE. This tries to restore th
 	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)
+	if gdeEntryStateZlvl=0 zhalt +$zstatus
 	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 ebd85db..8abe255 100755
--- a/sr_port/gdeinit.m
+++ b/sr_port/gdeinit.m
@@ -205,7 +205,7 @@ GDEINIT
 	m maxseg("BG")=maxsegcommon	; copy over all common stuff into BG access method first
 	; now add BG specific overrides
 	s minseg("BG","GLOBAL_BUFFER_COUNT")=64
-	i (gtm64=TRUE) s maxseg("BG","GLOBAL_BUFFER_COUNT")=2147483647 ; 2G-1
+	i (gtm64=TRUE) s maxseg("BG","GLOBAL_BUFFER_COUNT")=2097151 ; GTM64_WC_MAX_BUFFS defined in gdsbt.h
 	e  s maxseg("BG","GLOBAL_BUFFER_COUNT")=65536
 ; mm
 	m minseg("MM")=minsegcommon	; copy over all common stuff into MM access method first
diff --git a/sr_i386/GDEINITSZ.m b/sr_port/gdeinitsz.m
similarity index 63%
rename from sr_i386/GDEINITSZ.m
rename to sr_port/gdeinitsz.m
index 7bff1c1..bbe6cb2 100644
--- a/sr_i386/GDEINITSZ.m
+++ b/sr_port/gdeinitsz.m
@@ -2,14 +2,14 @@
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
 ;
-; 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
+; Generated by scantypedefs.m at 16:03:28 on 2017-08-16
+; Build done with GT.M version: GT.M V6.3-001A 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
+;   $gtm_dist: /usr/library/V63001A/dbg
+;   $gtm_exe: /usr/library/V63002/dbg
+;   $gtm_src: /usr/library/V63002/src
+;   $gtm_inc: /usr/library/V63002/inc
 ;
 ; Note this file should not be manually invoked
 ;
diff --git a/sr_port/gdsbml.h b/sr_port/gdsbml.h
index 1618ed1..e4e9306 100755
--- a/sr_port/gdsbml.h
+++ b/sr_port/gdsbml.h
@@ -89,14 +89,12 @@
 
 
 #define DETERMINE_BML_FUNC_COMMON(FUNC, CS, CSA)								\
-{														\
+MBSTART {													\
 	FUNC = (CS->reference_cnt > 0) ? bml_busy : (CSA->hdr->db_got_to_v5_once ? bml_recycled : bml_free);	\
-}
-#ifndef UNIX
- #define DETERMINE_BML_FUNC(FUNC, CS, CSA)	DETERMINE_BML_FUNC_COMMON(FUNC, CS, CSA)
-#else
+} MBEND
+
 # define DETERMINE_BML_FUNC(FUNC, CS, CSA)											\
-{																\
+MBSTART {															\
 	GBLREF	boolean_t	mu_reorg_upgrd_dwngrd_in_prog;									\
 																\
 	if (CSA->nl->trunc_pid)													\
@@ -128,8 +126,7 @@
 		}														\
 	} else	/* Choose bml_func as it was chosen before truncate feature. */							\
 		DETERMINE_BML_FUNC_COMMON(FUNC, CS, CSA);									\
-}
-#endif
+} MBEND
 
 int4 bml_find_free(int4 hint, uchar_ptr_t base_addr, int4 total_bits);
 int4 bml_init(block_id bml);
diff --git a/sr_port/gdsbt.h b/sr_port/gdsbt.h
index af5cd81..1e0f2f3 100644
--- a/sr_port/gdsbt.h
+++ b/sr_port/gdsbt.h
@@ -285,17 +285,6 @@ typedef struct
 #define	SECSHR_OPS_ARRAY_SIZE		1023		/* 1 less than 1K to accommodate the variable secshr_ops_index */
 #define FTOK_OPS_ARRAY_SIZE		 512
 
-/* SECSHR_ACCOUNTING macro assumes csa->nl is dereferencible and does accounting if variable "do_accounting" is set to TRUE */
-#define		SECSHR_ACCOUNTING(value)								\
-{													\
-	if (do_accounting)										\
-	{												\
-		if (csa->nl->secshr_ops_index < SECSHR_OPS_ARRAY_SIZE)					\
-			csa->nl->secshr_ops_array[csa->nl->secshr_ops_index] = (gtm_uint64_t)(value);	\
-		csa->nl->secshr_ops_index++;								\
-	}												\
-}
-
 /*
  * Enable the GTM_CRYPT_UPDATES_REPORT define below to activate logging of encryption-related operations in shared memory. Those
  * operations currently include a write and read of an encrypted block (wcs_wtstart and dsk_read, respectively), update retry or
@@ -695,6 +684,7 @@ typedef struct node_local_struct
 	uint4			saved_lock_space_size;
 	int4			saved_jnl_buffer_size;
 	/* Miscellaneous flag */
+	trans_num	update_underway_tn;
 	boolean_t	lastwriterbypas_msg_issued;	/* whether a LASTWRITERBYPAS message has been once issued for this db */
 	boolean_t	first_writer_seen;	/* Has a process with read-write access to the database opened it yet */
 	boolean_t	first_nonbypas_writer_seen;	/* TRUE when first writer is seen that also does not bypass ftok/access */
diff --git a/sr_port/gdscc.h b/sr_port/gdscc.h
old mode 100755
new mode 100644
index 7d1cb25..9198178
--- a/sr_port/gdscc.h
+++ b/sr_port/gdscc.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	*
@@ -46,8 +46,8 @@
  * operation) to a different data block (that also had the same index block as an ancestor) which resulted in a block split
  * causing the index block to be updated. In this case there is no reason to restart. The index block could have been
  * modified by other operations as well (e.g. M-kill, REORG coalesce or swap operations or any DSE command or a block split
- * operation that caused the height of the global variable tree to increase [C9B11-001813]). In these cases, we dont want
- * this optimization to take effect as we cant be sure everything that was relied upon for the TP transaction was still valid.
+ * operation that caused the height of the global variable tree to increase [C9B11-001813]). In these cases, we don't want
+ * this optimization to take effect as we can't be sure everything that was relied upon for the TP transaction was still valid.
  * These disallowed operations are generically referred to as "kill" type of operations. This optimization is implemented by
  * having a field "killtn" (name derived from "kill" type of operations) in the bt (block-table) structure for each block.
  * This field is assigned the same value as the "tn" whenever an index block gets updated due to one of the disallowed operations.
@@ -217,4 +217,12 @@ typedef struct cw_set_element_struct
 	uint4		blk_prior_state;
 } cw_set_element;
 
+#ifdef DEBUG
+GBLREF	uint4		dollar_tlevel;
+#endif
+
+/* See comment in tp_tend where this macro is used for details */
+#define	IS_BG_PHASE2_COMMIT_IN_CRIT(CSE, MODE) (DBG_ASSERT(dollar_tlevel || (NULL == CSE->recompute_list_head))		\
+					(gds_t_writemap == MODE) || (CSE->recompute_list_head && (gds_t_write == MODE)))
+
 #endif
diff --git a/sr_port/gdsfhead.h b/sr_port/gdsfhead.h
index f0a3d01..a928ce7 100644
--- a/sr_port/gdsfhead.h
+++ b/sr_port/gdsfhead.h
@@ -59,6 +59,9 @@ error_def(ERR_TNWARN);
 error_def(ERR_TPRETRY);
 error_def(ERR_UNIMPLOP);
 
+#define FULL_FILESYSTEM_WRITE 1
+#define FULL_DATABASE_WRITE 2
+
 /* Cache record */
 typedef struct cache_rec_struct
 {
@@ -138,7 +141,9 @@ typedef struct cache_rec_struct
 					 * 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 */
+	bool		needs_first_write; 	/* If this block needs to be written to disk for the first time,
+						 *  note it (only applicable for gtm_fullblockwrites) */
+	/* 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
@@ -225,7 +230,9 @@ typedef struct
 					 * 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 */
+	bool		needs_first_write; 	/* If this block needs to be written to disk for the first time,
+						 *  note it (only applicable for gtm_fullblockwrites) */
+	/*bool		filler4bytealign[1];	 Note: Make sure any changes here are reflected in "cache_state_rec" too */
 } cache_state_rec;
 
 #define		CR_BLKEMPTY		-1
@@ -615,6 +622,9 @@ MBSTART {											\
 #define WAS_OPEN_TRUE		TRUE
 #define WAS_OPEN_FALSE		FALSE
 
+#define SKIP_ASSERT_TRUE	TRUE
+#define SKIP_ASSERT_FALSE	FALSE
+
 /* Below macro sets open, opening and was_open fields of a given region after the corresponding
  * database for that region is opened. Also, if the region was not already open, the macro
  * invokes GVKEYSIZE_INIT_IF_NEEDED to allocate gv_currkey/gv_altkey if not already done.
@@ -727,8 +737,11 @@ MBSTART {					\
 		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 */
+#define		T_COMMIT_CRIT_PHASE0	1	/* csa->t_commit_crit gets set to this when reserving space for jnl record writing.
+						 * The actual journal write happens after releasing crit in phase2 of commit for BG.
+						 */
+#define		T_COMMIT_CRIT_PHASE1	2	/* csa->t_commit_crit gets set to this during bg_update_phase1 for BG */
+#define		T_COMMIT_CRIT_PHASE2	3	/* csa->t_commit_crit gets set to this during bg_update_phase2 for BG */
 
 /* macro to check if we hold crit or are committing (with or without crit) */
 #define		T_IN_CRIT_OR_COMMIT(CSA)	((CSA)->now_crit || (CSA)->t_commit_crit)
@@ -747,8 +760,35 @@ MBSTART {					\
  */
 #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)
+/* Macro to check if a database commit is past the point where it can be successfully rolled back.
+ * If t_commit_crit is T_COMMIT_CRIT_PHASE2, "bg_update_phase2" could have happened on at least one block
+ * and so we cannot roll back easily. If t_commit_crit is T_COMMIT_CRIT_PHASE1, "bg_update_phase1" could
+ * have started on at least one block and so we cannot roll back easily. If it is T_COMMIT_CRIT_PHASE0,
+ * only journal records have been written to the journal buffer and those should be easily rolled back.
+ */
+#define		T_UPDATE_UNDERWAY(CSA)	(T_COMMIT_CRIT_PHASE1 <= (CSA)->t_commit_crit)
+
+/* Below macro sets csa->t_commit_crit to T_COMMIT_CRIT_PHASE1 to signal start of phase1 of db commit.
+ * In addition, it also sets cnl->update_underway_tn which indicates to "mutex_salvage" that in case this process
+ * gets kill -9ed between now and end of commit, and replication is turned on in this region, the
+ * csa->jnl->jnl_buff->phase2_commit_array[] entry corresponding to this commit should be set up such that
+ * when "jnl_phase2_salvage" is called later, it will write a JRT_NULL record on behalf of this transaction.
+ * If a kill -9 happens between begin of commit and now, then a JRT_INCTN record will instead be written.
+ * For non-journaled regions, cnl->update_underway_tn does not matter currently.
+ */
+#define	SET_T_COMMIT_CRIT_PHASE1(CSA, CNL, TN)							\
+MBSTART {											\
+	CSA->t_commit_crit = T_COMMIT_CRIT_PHASE1;	/* phase1 : lock database buffers */	\
+	CNL->update_underway_tn = TN;								\
+} MBEND
+
+#define	SET_REG_SEQNO(CSA, SEQNO, SUPPLEMENTARY, STRM_INDEX, NEXT_STRM_SEQNO, SKIP_ASSERT)	\
+{												\
+	assert(SKIP_ASSERT || (CSA->hdr->reg_seqno < SEQNO));					\
+	CSA->hdr->reg_seqno = SEQNO;								\
+	if (SUPPLEMENTARY)									\
+		CSA->hdr->strm_reg_seqno[STRM_INDEX] = NEXT_STRM_SEQNO;				\
+}
 
 /* the file header has relative pointers to its data structures so each process will malloc
  * one of these and fill it in with absolute pointers upon file initialization.
@@ -798,6 +838,7 @@ MBSTART {														\
 	long			bufindx;										\
 	sm_uc_ptr_t		bufstart;										\
 	GBLREF	boolean_t	dse_running, write_after_image;								\
+	GBLREF	uint4		process_id;										\
 															\
 	assert((gds_t_write != cse->mode) && (gds_t_write_recycled != cse->mode) && gds_t_writemap != cse->mode		\
 		|| (NULL != cse->old_block));	/* don't miss writing a PBLK */						\
@@ -854,6 +895,7 @@ MBSTART {													\
 #define	DBG_CHECK_PINNED_CR_ARRAY_CONTENTS(csd, is_mm, crarray, crarrayindex)					\
 MBSTART {													\
 	GBLREF	boolean_t	write_after_image;								\
+	GBLREF	uint4		process_id;									\
 	cache_rec		*cr;										\
 	int4			crindex, bplmap;								\
 														\
@@ -1226,7 +1268,7 @@ MBSTART {															\
 	if (JNLPOOL_VALIDATED != jnlpool_validate_check)									\
 	{															\
 		do_REPLINSTMISMTCH_check = (!(REPLINSTMISMTCH_CHECK_DONE & jnlpool_validate_check) 				\
-						UNIX_ONLY(&& ((GTMRELAXED != JNLPOOL_USER) || !IS_GTM_IMAGE)));			\
+						&& ((GTMRELAXED != JNLPOOL_USER) || !IS_GTM_IMAGE));				\
 		if (!(SCNDDBNOUPD_CHECK_DONE & jnlpool_validate_check) && SCNDDBNOUPD_CHECK_NEEDED)				\
 		{														\
 			if (jnlpool_ctl->upd_disabled && !is_updproc)								\
@@ -1244,7 +1286,7 @@ MBSTART {															\
 		{														\
 			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)))			\
+				|| (CNL->jnlpool_shmid != jnlpool.repl_inst_filehdr->jnlpool_shmid))				\
 			{													\
 				/* Replication instance filename or jnlpool shmid mismatch. Two possibilities.			\
 				 * (a) Database has already been bound with a replication instance file name that is different	\
@@ -1256,8 +1298,8 @@ MBSTART {															\
 				 * Actually case (b) subsumes (a) so we assert that below. But in pro we handle both cases	\
 				 *	just in case.										\
 				 */												\
-				UNIX_ONLY(assert(CNL->jnlpool_shmid != jnlpool.repl_inst_filehdr->jnlpool_shmid);)		\
-				UNIX_ONLY(assert(SIZEOF(instfilename_copy) == SIZEOF(jnlpool_ctl->jnlpool_id.instfilename)));	\
+				assert(CNL->jnlpool_shmid != jnlpool.repl_inst_filehdr->jnlpool_shmid);				\
+				assert(SIZEOF(instfilename_copy) == SIZEOF(jnlpool_ctl->jnlpool_id.instfilename));		\
 				memcpy(&instfilename_copy[0], jnlpool_instfilename, SIZEOF(instfilename_copy));			\
 				assert(SIZEOF(jnlpool_shmid) == SIZEOF(CNL->jnlpool_shmid));					\
 				jnlpool_shmid = jnlpool.repl_inst_filehdr->jnlpool_shmid;					\
@@ -1514,7 +1556,6 @@ MBSTART {
 	}                                                                       					\
 } MBEND
 
-/* the RET is meaningful only on UNIX */
 #define JNL_ENSURE_OPEN_WCS_WTSTART(csa, reg, num_bufs, cr2flush, CHILLWAIT, RET)		\
 MBSTART {       										\
 	if ((CHILLWAIT) && !FREEZE_LATCH_HELD(csa))						\
@@ -1590,9 +1631,7 @@ n_db_csh_acct_rec_types
 #undef TAB_DB_CSH_ACCT_REC
 
 #include "gvstats_rec.h"
-#ifdef UNIX
 #include "probecrit_rec.h"
-#endif
 
 #define	GVSTATS_SET_CSA_STATISTIC(CSA, COUNTER, VALUE)							\
 MBSTART {												\
@@ -1747,7 +1786,6 @@ MBSTART {												\
 #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)
@@ -1761,8 +1799,11 @@ MBSTART {														\
 	{														\
 		was_latch = FREEZE_LATCH_HELD(CSA);									\
 		if (!was_latch)												\
-			while(!grab_latch(&(CSA)->nl->freeze_latch, FREEZE_LATCH_TIMEOUT))				\
-				assert(FREEZE_LATCH_HELD(CSA));								\
+		{	/* Return value of "grab_latch" does not need to be checked because we pass			\
+			 * in GRAB_LATCH_INDEFINITE_WAIT as the timeout.						\
+			 */												\
+			grab_latch(&(CSA)->nl->freeze_latch, GRAB_LATCH_INDEFINITE_WAIT);				\
+		}													\
 		if (CHILLED_AUTORELEASE(CSD) && !CHILLED_AUTORELEASE_REPORTED(CSD))					\
 		{													\
 			(CSD)->freeze = FALSE;										\
@@ -1843,11 +1884,7 @@ typedef struct sgmnt_data_struct
 	char		filler_256[8];
 	/************* FIELDS SET WHEN DB IS OPEN ********************************/
 	char		now_running[MAX_REL_NAME];/* for active version stamp */
-#	ifdef VMS
-	uint4		owner_node;		/* Node on cluster that "owns" the file -- applies to VMS only */
-#	else
 	uint4		filler_owner_node;	/* 4-byte filler - since owner_node is maintained on VMS only */
-#	endif
 	uint4		image_count;		/* for db freezing. Set to "process_id" on Unix and "image_count" on VMS */
 	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 */
@@ -2551,17 +2588,18 @@ typedef struct	sgmnt_addrs_struct
 	boolean_t	snapshot_in_prog;	/* true if snapshots are in progress for this region */
 	int4		ref_cnt;		/* count of number of times csa->nl->ref_cnt was incremented by this process */
 	int4		fid_index;		/* index for region ordering based on unique_id */
-	boolean_t	do_fullblockwrites;	/* This region enabled for full block writes */
+	int4		do_fullblockwrites;	/* This region enabled for full block writes */
 	int4		regnum;			/* Region number (region open counter) used by journaling so all tokens
 						   have a unique prefix per region (and all regions have same prefix)
 						*/
 	int4		n_pre_read_trigger;	/* For update process to keep track of progress and when to trigger pre-read */
 	uint4		jnlpool_validate_check;	/* See the comment above VALIDATE_INITIALIZED_JNLPOOL for details on this field */
 	int4		regcnt;			/* # of regions that have this as their csa */
-	boolean_t	t_commit_crit;		/* set to FALSE by default. set to TRUE if in the middle of database commit.
-						 * if access method is BG, this assumes a multi-state value.
-						 * FALSE -> T_COMMIT_CRIT_PHASE1 -> T_COMMIT_CRIT_PHASE2 -> FALSE
-						 *           (bg_update_phase1)      (bg_update_phase2)      (finish commit)
+	boolean_t	t_commit_crit;		/* FALSE by default. Non-zero value if in the middle of database commit.
+						 * This assumes the following additional values.
+						 *   = T_COMMIT_CRIT_PHASE0 if commit started and jnl records are being written
+						 *   = T_COMMIT_CRIT_PHASE1 just before calling "bg_update_phase1/mm_update"
+						 *   = T_COMMIT_CRIT_PHASE2 just before calling "bg_update_phase2"
 						 */
 	boolean_t	wcs_pidcnt_incremented;	/* set to TRUE if we incremented cnl->wcs_phase2_commit_pidcnt.
 						 * used by secshr_db_clnup to decrement the shared counter. */
@@ -2798,7 +2836,7 @@ typedef struct	gv_namehead_struct
 	gv_key		clue;				/* Clue key, must be last in namehead struct because of hung buffer. */
 } gv_namehead;
 
-/* Below structure is allocated for every global name that spans across multiple regions in each global directory. */
+/* Below structure is allocated for every global name that spans across multiple regions in each global directory */
 typedef struct gvnh_spanreg_struct
 {
 	int		start_map_index;	/* index into the global directory "maps" array corresponding to the
@@ -2816,16 +2854,15 @@ typedef struct gvnh_spanreg_struct
 						 *	regions that the parent global name spans across lie AFTER
 						 *	this index in the "regions" array.
 						 */
-	int		max_reg_index;		/* index into the global directory "regions" array such that ALL
-						 *	regions that the parent global name spans across lie BEFORE
-						 *	this index in the "regions" array.
-						 *	"max_reg_index" - "min_reg_index" effectively determines the
+	int		max_reg_index;		/* index into the global directory "regions" array corresponding to
+						 *	the LAST region gv_target pointer for the spans of this global.
+						 *	The count (max_reg_index-min_reg_index)+1 effectively determines the
 						 *	size of the array allocated to store the corresponding
 						 *	gv_targets for each unique region the parent global name spans.
 						 */
 	gv_namehead	*gvt_array[1];		/* array of gv_targets corresponding to each region the global name spans.
 						 *	Although the array is defined to be size 1, the actual size allocated
-						 *	depends on "max_reg_index"-"min_reg_index" and having this defined as
+						 *	depends on (max_reg_index-min_reg_index)+1 and having this defined as
 						 *	an array lets us access the entire allocated size with an array index.
 						 *	Set to INVALID_GV_TARGET for array indices that correspond to regions
 						 *	which the parent global does NOT span across.
@@ -3520,13 +3557,15 @@ typedef enum
 	inctn_blkdwngrd,		/* 12 : similar to inctn_blkupgrd except that this is for DOWNGRADE */
 	inctn_blkdwngrd_fmtchng,	/* 13 : similar to inctn_blkupgrd_fmtchng except that this is for DOWNGRADE */
 	inctn_blkreencrypt,		/* 14 : written whenever a GDS block is (re)encrypted using MUPIP REORG -ENCRYPT */
+	inctn_jnlphase2salvage,		/* 15 : used by "jnl_phase2_salvage" to salvage a dead phase2 jnl commit */
 	/* the following opcodes do NOT populate the global variable "inctn_detail" */
-	inctn_opcode_total		/* 15 : MAX. All additions of inctn opcodes should be done BEFORE this line */
+	inctn_opcode_total		/* 16 : MAX. All additions of inctn opcodes should be done BEFORE this line */
 } inctn_opcode_t;
 
 /* macros to check curr_tn */
 #define MAX_TN_V4	((trans_num)(MAXUINT4 - TN_HEADROOM_V4))
 #define MAX_TN_V6	(MAXUINT8 - TN_HEADROOM_V6)
+#define TN_INVALID	(MAXUINT8)	/* impossible db tn */
 #define TN_HEADROOM_V4	(2 * MAXTOTALBLKS_V4)
 #define TN_HEADROOM_V6	(2 * MAXTOTALBLKS_V6)
 #define	HEADROOM_FACTOR	4
@@ -3645,18 +3684,6 @@ MBSTART {								\
 	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 {									\
@@ -3732,10 +3759,6 @@ MBSTART {									\
 		}								\
 	}									\
 } MBEND
-#else
-#define INSERT_KIP_PID(local_csa)
-#define REMOVE_KIP_PID(local_csa)
-#endif
 
 #define DECR_KIP(CSD, CSA, KIP_CSA)						\
 MBSTART {									\
@@ -3755,7 +3778,6 @@ MBSTART {									\
 	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;					\
@@ -3768,44 +3790,11 @@ MBSTART {									\
 	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;						\
-											\
-	local_csd = CSD;								\
-	local_csa = CSA;								\
-	assert(NULL == KIP_CSA);							\
-	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;						\
-											\
-	local_csd = CSD;								\
-	local_csa = CSA;								\
-	assert(NULL != KIP_CSA);							\
-	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_ABANDONED_KILLS(CSD, CSA)	INCR_CNT(&CSD->abandoned_kills, &CSA->nl->wc_var_lock)
 
-#define INCR_INHIBIT_KILLS(CNL)					\
-MBSTART {							\
-	INCR_CNT(&CNL->inhibit_kills, &CNL->wc_var_lock);	\
-} MBEND
+#define INCR_INHIBIT_KILLS(CNL)		INCR_CNT(&CNL->inhibit_kills, &CNL->wc_var_lock)
 
 #define DECR_INHIBIT_KILLS(CNL)						\
 MBSTART {								\
@@ -4313,7 +4302,6 @@ typedef enum
 	REG_JNL_SWITCH_ERROR
 } freeze_status;
 
-#ifdef UNIX
 /* This structure holds state captured on entry into gvcst_redo_root_search which it restores on error or exit */
 typedef struct redo_root_search_context_struct
 {
@@ -4332,7 +4320,6 @@ typedef struct redo_root_search_context_struct
 	unsigned int	t_tries_dbg;
 #	endif
 } redo_root_search_context;
-#endif
 
 #define SET_GV_CURRKEY_FROM_GVT(GVT)						\
 MBSTART {									\
@@ -4689,7 +4676,6 @@ MBSTART {										\
 #define ASSERT_NO_ONLINE_ROLLBACK		0x02
 #define HANDLE_CONCUR_ONLINE_ROLLBACK		0x03
 
-#ifdef UNIX
 /* 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													\
@@ -4763,9 +4749,6 @@ MBSTART {															\
 		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 {									\
@@ -4844,7 +4827,6 @@ typedef struct
 #	endif
 } span_parms;
 
-#ifdef UNIX
 # define DEFINE_NSB_CONDITION_HANDLER(gvcst_xxx_ch)							\
 	CONDITION_HANDLER(gvcst_xxx_ch)									\
 	{												\
@@ -4888,13 +4870,6 @@ MBSTART {	/* We've encountered a spanning node dummy value. Check if spanning no
 		}													\
 	}														\
 } MBEND
-#else
-# define DEFINE_NSB_CONDITION_HANDLER(gvcst_xxx_ch)
-# define IF_NSB_DUMMY_RETURN
-# define RTS_ERROR_IF_SN_DISALLOWED_AND_SPAN_IN_DB
-# define RETURN_NO_VAL_IF_SN_DISALLOWED
-# define RETURN_IF_SN_DISALLOWED(value)
-#endif
 
 #define MAX_NSBCTRL_SZ		30	/* Upper bound on size of ctrl value. 2*10 digs + 1 comma + 1 null + overhead */
 
@@ -5119,6 +5094,9 @@ MBSTART {												\
 /* 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.
  */
+#ifdef USE_NOAIO
+#define       WAIT_FOR_AIO_TO_BE_DONE(FD, TIMEDOUT)   /* NO op, N/A */
+#else
 #define	WAIT_FOR_AIO_TO_BE_DONE(FD, TIMEDOUT)								\
 MBSTART {												\
 	unsigned int	lcnt, ret, save_errno;								\
@@ -5138,6 +5116,7 @@ MBSTART {												\
 		wcs_sleep(lcnt);									\
 	}												\
 } MBEND
+#endif
 
 #define	OK_FOR_WCS_RECOVER_FALSE	FALSE
 #define	OK_FOR_WCS_RECOVER_TRUE		TRUE
@@ -5210,8 +5189,8 @@ void	jnl_fsync(gd_region *reg, uint4 fsync_addr);
 void	jnl_oper_user_ast(gd_region *reg);
 void	jnl_wait(gd_region *reg);
 void	view_jnlfile(mval *dst, gd_region *reg);
-void	jnl_put_jrt_pfin(sgmnt_addrs *csa);
-void	jnl_put_jrt_pini(sgmnt_addrs *csa);
+void	jnl_write_pfin(sgmnt_addrs *csa);
+void	jnl_write_pini(sgmnt_addrs *csa);
 void	jnl_write_epoch_rec(sgmnt_addrs *csa);
 void	jnl_write_inctn_rec(sgmnt_addrs *csa);
 void	fileheader_sync(gd_region *reg);
diff --git a/sr_port/getjobname.c b/sr_port/getjobname.c
index 202d57e..13e069d 100755
--- a/sr_port/getjobname.c
+++ b/sr_port/getjobname.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	*
@@ -17,10 +18,15 @@
 #include "mvalconv.h"
 #include "getjobnum.h"
 #include "getjobname.h"
+#ifdef DEBUG
+#include "wbox_test_init.h"
+#include "gt_timer.h"
+#endif
 
-GBLREF uint4 process_id;
-GBLDEF mval dollar_job;
-static char djbuff[10];	/* storage for dollar job's string form */
+GBLREF	uint4	process_id;
+GBLDEF	mval	dollar_job;
+
+static	char	djbuff[10];	/* storage for dollar job's string form */
 
 void getjobname(void)
 {
@@ -30,4 +36,25 @@ void getjobname(void)
 	assert(dollar_job.str.len <= SIZEOF(djbuff));
 	memcpy(djbuff,dollar_job.str.addr,dollar_job.str.len);
 	dollar_job.str.addr = djbuff;
+#	ifdef DEBUG
+	/* The below white-box code was previously in INVOKE_INIT_SECSHR_ADDRS but when it was removed, the white-box
+	 * code was moved over to "getjobname" which was (and continues to be) invoked just before when INVOKE_INIT_SECSHR_ADDRS
+	 * used to be invoked.
+	 */
+	if (WBTEST_ENABLED(WBTEST_SLAM_SECSHR_ADDRS))
+	{	/* For this white box test, we're going to send ourselves a SIGTERM termination signal at a specific point
+		 * in the processing to make sure it succeeds without exploding during database initialization. To test the
+		 * condition GTM-8455 fixes.
+		 */
+		kill(process_id, SIGTERM);
+		hiber_start(20 * 1000);			/* Wait up to 20 secs - don't use wait_any as the heartbeat timer
+							 * will kill this wait in 0-7 seconds or so.
+							 */
+		/* We sent, we waited, wait expired - weird - funky condition is for identification purposes (to identify the
+		 * actual assert). We should be dead or dying, not trying to resume.
+		 */
+		assert(WBTEST_SLAM_SECSHR_ADDRS == 0);
+	}
+#	endif
+
 }
diff --git a/sr_port/gtm_env_init.c b/sr_port/gtm_env_init.c
index 4eb4f0b..e04b0d3 100755
--- a/sr_port/gtm_env_init.c
+++ b/sr_port/gtm_env_init.c
@@ -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	*
@@ -56,9 +56,9 @@
 #endif
 
 #ifdef FULLBLOCKWRITES
-#  define DEFAULT_FBW_FLAG TRUE
+#  define DEFAULT_FBW_FLAG 1
 #else
-#  define DEFAULT_FBW_FLAG FALSE
+#  define DEFAULT_FBW_FLAG 0
 #endif
 #define SIZEOF_prombuf ggl_prombuf
 
@@ -70,7 +70,7 @@
 GBLREF	boolean_t	dollar_zquit_anyway;	/* if TRUE compile QUITs to not care whether or not they're from an extrinsic */
 GBLREF	uint4		gtmDebugLevel; 		/* Debug level (0 = using default sm module so with
 						   a DEBUG build, even level 0 implies basic debugging) */
-GBLREF	boolean_t	gtm_fullblockwrites;	/* Do full (not partial) database block writes T/F */
+GBLREF	int4		gtm_fullblockwrites;	/* Do full (not partial) database block writes */
 GBLREF	boolean_t	certify_all_blocks;
 GBLREF	uint4		gtm_blkupgrade_flag;	/* controls whether dynamic block upgrade is attempted or not */
 GBLREF	boolean_t	gtm_dbfilext_syslog_disable;	/* control whether db file extension message is logged or not */
@@ -86,13 +86,14 @@ GBLREF	size_t		gtm_max_storalloc;	/* Used for testing: creates an allocation bar
 
 void	gtm_env_init(void)
 {
-	mstr			val, trans;
 	boolean_t		ret, is_defined;
+	char			buf[MAX_TRANS_NAME_LEN];
+	double			time;
+	int			status2, i, j;
+	int4			status;
+	mstr			val, trans;
 	uint4			tdbglvl, tmsock, reservesize, memsize, cachent, trctblsize, trctblbytes;
 	uint4			max_threads, max_procs;
-	int4			status;
-	int			status2;
-	char			buf[MAX_TRANS_NAME_LEN];
 	DCL_THREADGBL_ACCESS;
 
 	SETUP_THREADGBL_ACCESS;
@@ -216,9 +217,26 @@ void	gtm_env_init(void)
 		/* Full Database-block Write mode */
 		val.addr = GTM_FULLBLOCKWRITES;
 		val.len = SIZEOF(GTM_FULLBLOCKWRITES) - 1;
-		gtm_fullblockwrites = logical_truth_value(&val, FALSE, &is_defined);
-		if (!is_defined)
+		gtm_fullblockwrites = (int)logical_truth_value(&val, FALSE, &is_defined);
+		if (!is_defined) /* Variable not defined */
 			gtm_fullblockwrites = DEFAULT_FBW_FLAG;
+		else if (!gtm_fullblockwrites) /* Set to false */
+			gtm_fullblockwrites = FALSE;
+		else /* Set to true, exam for FULL_DATABASE_WRITE */
+		{
+			gtm_fullblockwrites = trans_numeric(&val, &is_defined, TRUE);
+			switch(gtm_fullblockwrites)
+			{
+			case FULL_FILESYSTEM_WRITE:
+			case FULL_DATABASE_WRITE:
+				/* Both these values are valid */
+				break;
+			default:
+				/* Else, assume FULL_FILESYSTEM_WRITE */
+				gtm_fullblockwrites = FULL_FILESYSTEM_WRITE;
+				break;
+			}
+		}
 		/* GDS Block certification */
 		val.addr = GTM_GDSCERT;
 		val.len = SIZEOF(GTM_GDSCERT) - 1;
@@ -294,12 +312,18 @@ void	gtm_env_init(void)
 			}
 		}
 		/* Initialize tpnotacidtime */
-		TREF(tpnotacidtime) = TPNOTACID_DEFAULT_TIME;
+		(TREF(tpnotacidtime)).m[1] = TPNOTACID_DEFAULT_TIME;
 		val.addr = GTM_TPNOTACIDTIME;
 		val.len = SIZEOF(GTM_TPNOTACIDTIME) - 1;
-		if ((status = trans_numeric(&val, &is_defined, TRUE)) && (0 <= status)
-			&& (TPNOTACID_MAX_TIME >= status) && is_defined)
-				TREF(tpnotacidtime) = status;	 /* NOTE assignment above */
+		if (SS_NORMAL == (status = TRANS_LOG_NAME(&val, &trans, buf, SIZEOF(buf), do_sendmsg_on_log2long)))
+		{
+			assert(SIZEOF(buf) > trans.len);
+			*(char *)(buf + trans.len) = 0;
+			errno = 0;
+			time = strtod(buf, NULL);
+			if ((ERANGE != errno) && (TPNOTACID_MAX_TIME >= time))
+				(TREF(tpnotacidtime)).m[1] = time * MILLISECS_IN_SEC;
+		}	/* gtm_startup completes initialization of the tpnotacidtime mval */
 		/* Initialize $gtm_tprestart_log_first */
 		val.addr = GTM_TPRESTART_LOG_FIRST;
 		val.len = STR_LIT_LEN(GTM_TPRESTART_LOG_FIRST);
diff --git a/sr_port/gtm_env_xlate_init.c b/sr_port/gtm_env_xlate_init.c
index 43d19fd..8aeeef8 100755
--- a/sr_port/gtm_env_xlate_init.c
+++ b/sr_port/gtm_env_xlate_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       *
@@ -23,38 +24,31 @@
 
 GBLREF mstr	env_gtm_env_xlate;
 
+error_def(ERR_LOGTOOLONG);
+error_def(ERR_TRNLOGFAIL);
+
 void gtm_env_xlate_init(void)
 {
 	int4		status;
 	mstr		val, tn;
 	char		buf[GTM_PATH_MAX];
 
-	error_def(ERR_TRNLOGFAIL);
-	error_def(ERR_LOGTOOLONG);
-
 	val.addr = GTM_ENV_XLATE;
 	val.len =  STR_LIT_LEN(GTM_ENV_XLATE);
-	if (SS_NORMAL == (status = TRANS_LOG_NAME(&val, &tn, buf, SIZEOF(buf), dont_sendmsg_on_log2long)))
+	env_gtm_env_xlate.len = 0; /* default */
+	if (SS_NORMAL != (status = TRANS_LOG_NAME(&val, &tn, buf, SIZEOF(buf), dont_sendmsg_on_log2long)))
 	{
-		UNIX_ONLY(
-			env_gtm_env_xlate.len = tn.len;
-			env_gtm_env_xlate.addr = (char *)malloc(tn.len);
-			memcpy(env_gtm_env_xlate.addr, buf, tn.len);
-		)
-		VMS_ONLY(
-			/* In op_gvextnam, the logical name is used in VMS, rather than its value (by lib$find_image_symbol),
-			 * so only whether the logical name translates is checked here.
-			 */
-			env_gtm_env_xlate.len = val.len;
-			env_gtm_env_xlate.addr = val.addr;
-		)
-	} else if (SS_NOLOGNAM == status)
-		env_gtm_env_xlate.len = 0;
-#	ifdef UNIX
-	else if (SS_LOG2LONG == status)
-		rts_error(VARLSTCNT(5) ERR_LOGTOOLONG, 3, LEN_AND_LIT(GTM_ENV_XLATE), SIZEOF(buf) - 1);
-#	endif
-	else
-		rts_error(VARLSTCNT(5) ERR_TRNLOGFAIL, 2, LEN_AND_LIT(GTM_ENV_XLATE), status);
+		if (SS_NOLOGNAM == status)
+			return;
+		else if (SS_LOG2LONG == status)
+			rts_error_csa(CSA_ARG(NULL) VARLSTCNT(5) ERR_LOGTOOLONG, 3, LEN_AND_LIT(GTM_ENV_XLATE), SIZEOF(buf) - 1);
+		else
+			rts_error_csa(CSA_ARG(NULL) VARLSTCNT(5) ERR_TRNLOGFAIL, 2, LEN_AND_LIT(GTM_ENV_XLATE), status);
+	}
+	if (0 == tn.len)
+		return;
+	env_gtm_env_xlate.len = tn.len;
+	env_gtm_env_xlate.addr = (char *)malloc(tn.len);
+	memcpy(env_gtm_env_xlate.addr, buf, tn.len);
 	return;
 }
diff --git a/sr_port/gtm_libaio.h b/sr_port/gtm_libaio.h
index 68c4b17..a346ef1 100644
--- a/sr_port/gtm_libaio.h
+++ b/sr_port/gtm_libaio.h
@@ -1,6 +1,6 @@
 /****************************************************************
  *								*
- * Copyright (c) 2016 Fidelity National Information		*
+ * Copyright (c) 2016-2017 Fidelity National Information	*
  * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
@@ -17,9 +17,25 @@
  */
 #if defined(__linux__) && defined(__x86_64__)
 #define USE_LIBAIO
+#elif defined(__CYGWIN__)
+#define USE_NOAIO
 #endif
 
-#ifndef USE_LIBAIO
+#ifdef USE_NOAIO
+      /* AIO NOT SUPPORTED */
+/* minimal just to satisfy mur_init.c and mur_read_file.h.
+ * More would be needed if MUR_USE_AIO were defined */
+struct aiocb {
+	int		aio_fildes;
+	volatile void	*aio_buf;
+	size_t		aio_nbytes;
+	off_t		aio_offset;
+	size_t		aio_bytesread;
+	int		aio_errno;
+};
+#define IF_LIBAIO(x) /* NONE */
+#define IF_LIBAIO_ELSE(x, y) y
+#elif !defined(USE_LIBAIO)
 #include <aio.h>
 #define IF_LIBAIO(x) /* NONE */
 #define IF_LIBAIO_ELSE(x, y) y
diff --git a/sr_port/gtm_threadgbl_defs.h b/sr_port/gtm_threadgbl_defs.h
index 7d6ac0c..692e0a9 100644
--- a/sr_port/gtm_threadgbl_defs.h
+++ b/sr_port/gtm_threadgbl_defs.h
@@ -35,6 +35,7 @@
 THREADGBLDEF(grabbing_crit, 			gd_region *)			/* Region currently grabbing crit in (if any) */
 
 /* Compiler */
+THREADGBLDEF(block_level,			int4)				/* used to check embedded subroutine levels */
 THREADGBLDEF(boolchain,				triple)				/* anchor for chain used by bx_boolop  */
 THREADGBLDEF(boolchain_ptr,			triple *)			/* pointer to anchor for chain used by bx_boolop  */
 THREADGBLDEF(bool_targ_anchor,			tbp)				/* anchor of targ chain for bool relocation */
@@ -66,6 +67,7 @@ THREADGBLDEF(linkage_last,			struct linkage_entry *)		/* Last added entry */
 THREADGBLDEF(objhash_state,			hash128_state_t)		/* Seed value - progressive hash of object file */
 #endif
 THREADGBLDEF(pos_in_chain,			triple)				/* anchor used to restart after a parsing error */
+THREADGBLDEF(rts_error_in_parse,		boolean_t)			/* flag to stop parsing current line */
 THREADGBLDEF(s2n_intlit, 			boolean_t)			/* type info from s2n for advancewindow */
 THREADGBLDEF(routine_source_offset,		uint4)				/* offset of M source within literal text pool */
 THREADGBLDEF(saw_side_effect,			boolean_t)			/* need side effect handling other than naked */
@@ -83,6 +85,7 @@ THREADGBLDEF(trigger_compile_and_link,		boolean_t)			/* A trigger compilation/li
 THREADGBLDEF(window_ident,			mstr)				/* current scanner mident from advancewindow */
 THREADGBLDEF(window_mval,			mval)				/* current scanner mval from advancewindow */
 THREADGBLDEF(window_token,			char)				/* current scanner token from advancewindow */
+THREADGBLDEF(xecute_literal_parse,		boolean_t)			/* flag TRUE when trying what its name says */
 
 /* Database */
 THREADGBLDEF(dbinit_max_delta_secs,		uint4)				/* max time before we bail out in db_init */
@@ -170,7 +173,7 @@ THREADGBLDEF(redo_rootsrch_ctxt,		redo_root_search_context)	/* context to be sav
 										 * gvcst_redo_root_search */
 THREADGBLDEF(semwait2long,			volatile boolean_t)		/* Waited too long for a semaphore */
 THREADGBLDEF(skip_file_corrupt_check,		boolean_t)			/* skip file_corrupt check in grab_crit */
-THREADGBLDEF(tpnotacidtime,			int4)				/* limit for long non-ACID ops in transactions */
+THREADGBLDEF(tpnotacidtime,			mval)				/* limit for long non-ACID ops in transactions */
 THREADGBLDEF(tp_restart_count,			uint4)				/* tp_restart counter */
 THREADGBLDEF(tp_restart_dont_counts,		int4)				/* tp_restart count adjustment; NOTE: DEBUG only */
 THREADGBLDEF(tp_restart_entryref,		mval)				/* tp_restart position for reporting */
@@ -182,6 +185,7 @@ THREADGBLDEF(wcs_recover_done,			boolean_t)			/* TRUE if wcs_recover was ever in
 										 * process. */
 
 /* Local variables */
+THREADGBLDEF(curr_symval_cycle,			unsigned int)			/* When curr_symval is changed, counter is bumped */
 THREADGBLDEF(in_op_fnnext,			boolean_t)			/* set TRUE by op_fnnext; FALSE by op_fnorder */
 THREADGBLDEF(local_collseq,			collseq *)			/* pointer to collation algorithm for lvns */
 THREADGBLDEF(local_collseq_stdnull,		boolean_t)			/* flag temp controlling empty-string subscript
@@ -191,6 +195,9 @@ THREADGBLDEF(local_coll_nums_as_strings,	boolean_t)			/* flag controlling whethe
 										 * evaluate to numbers are treated like numbers
 										 * (collating before strings) or like strings in
 										 * local collations */
+THREADGBLDEF(lvmon_active,			boolean_t)			/* TRUE when local var monitoring is active */
+THREADGBLDEF(lvmon_vars_anchor,			lvmon_var *)			/* Anchor for lv monitoring structure */
+THREADGBLDEF(lvmon_vars_count,			int)				/* Count of lvmon_vars at lvmon_vars_anchor */
 THREADGBLDEF(lv_null_subs,			int)				/* set in gtm_env_init_sp() */
 THREADGBLDEF(max_lcl_coll_xform_bufsiz,		int)				/* max size of local collation buffer,which extends
 										 * from 32K each time the buffer overflows */
@@ -222,7 +229,7 @@ THREADGBLDEF(fnzsearch_sub_mval,		mval)				/* op_fnzsearch subscript constuctor
 THREADGBLDEF(fnzsearch_nullsubs_sav,		int)				/* op_fnzsearch temp for null subs control */
 THREADGBLDEF(fnzsearch_globbuf_ptr,		glob_t *)			/* op_fnzsearch temp for pointing to glob results */
 THREADGBLDEF(glvn_pool_ptr,			glvn_pool *)			/* Pointer to the glvn pool */
-#if defined(GTMDBGFLAGS_ENABLED)
+#ifdef GTMDBGFLAGS_ENABLED
 THREADGBLDEF(gtmdbgflags,			int)
 THREADGBLDEF(gtmdbgflags_freq,			int)
 THREADGBLDEF(gtmdbgflags_freq_cntr,		int)
@@ -451,12 +458,14 @@ THREADGBLDEF(gtm_aio_nr_events,			uint4)		/* Indicates the value of the nr_event
 								 * 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 */
+THREADGBLDEF(nontp_jbuf_rsrv,			jbuf_rsrv_struct_t *)	/* Pointer to structure corresponding to reservations
+									 * on the journal buffer for current non-TP transaction.
+									 */
 /* Debug values */
 #ifdef DEBUG
 THREADGBLDEF(donot_commit,			boolean_t)			/* debug-only - see gdsfhead.h for purpose */
@@ -498,7 +507,6 @@ 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,
diff --git a/sr_port/gtm_threadgbl_deftypes.c b/sr_port/gtm_threadgbl_deftypes.c
index cd58129..5f5ee82 100644
--- a/sr_port/gtm_threadgbl_deftypes.c
+++ b/sr_port/gtm_threadgbl_deftypes.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	*
@@ -91,6 +91,7 @@
 #include "parm_pool.h"
 #include "util.h"		/* for util_outbuff manipulations */
 #include "nametabtyp.h"
+#include "localvarmonitor.h"
 
 /* FOR REPLICATION RELATED GLOBALS */
 #include "repl_msg.h"
diff --git a/sr_port/gtm_threadgbl_init.c b/sr_port/gtm_threadgbl_init.c
index 97dd1b4..c40c8cc 100644
--- a/sr_port/gtm_threadgbl_init.c
+++ b/sr_port/gtm_threadgbl_init.c
@@ -32,17 +32,9 @@
 #include "gtm_limits.h"
 #include "gtm_un.h"
 #include "gtm_signal.h"
-
 #include <sys/time.h>
-#ifdef VMS
-# include <descrip.h>		/* Required for gtmsource.h */
-# include <ssdef.h>
-# include <fab.h>
-# include "desblk.h"
-#endif
-#ifdef UNIX
-# include <glob.h>
-#endif
+#include <glob.h>
+
 #include "cache.h"
 #include "gtm_multi_thread.h"
 #include "hashtab_addr.h"
@@ -86,9 +78,6 @@
 #include "zbreak.h"
 #include "fnpc.h"
 #include "mmseg.h"
-#ifndef VMS
-# include "gtmsiginfo.h"
-#endif
 #include "gtmimagename.h"
 #include "gt_timer.h"
 #include "iosocketdef.h"	/* needed for socket_pool and MAX_N_SOCKETS*/
@@ -109,6 +98,7 @@
 #include "util.h"		/* for util_outbuff manipulations */
 #include "nametabtyp.h"
 #include "gtm_reservedDB.h"
+#include "localvarmonitor.h"
 
 /* FOR REPLICATION RELATED GLOBALS */
 #include "repl_msg.h"
@@ -121,22 +111,14 @@
 #include "gvname_info.h"
 #include "op_merge.h"
 
-#ifdef UNIX
-# include "cli.h"
-# include "invocation_mode.h"
-# include "fgncal.h"
-# include "parse_file.h"	/* for MAX_FBUFF */
-# include "repl_sem.h"
-# include "gtm_zlib.h"
-# include "zro_shlibs.h"
-#endif
-
+#include "cli.h"
+#include "invocation_mode.h"
+#include "fgncal.h"
+#include "parse_file.h"	/* for MAX_FBUFF */
+#include "repl_sem.h"
+#include "gtm_zlib.h"
+#include "zro_shlibs.h"
 #include "jnl_typedef.h"
-
-#ifdef VMS
-# include "gtm_logicals.h"	/* for GTM_MEMORY_NOACCESS_COUNT */
-#endif
-
 #include "gds_blk_upgrade.h"	/* for UPGRADE_IF_NEEDED flag */
 #include "cws_insert.h"		/* for CWS_REORG_ARRAYSIZE */
 
diff --git a/sr_port/gv_rundown.c b/sr_port/gv_rundown.c
old mode 100755
new mode 100644
index e0b69c7..3f34a6e
--- a/sr_port/gv_rundown.c
+++ b/sr_port/gv_rundown.c
@@ -133,7 +133,7 @@ void gv_rundown(void)
 	 * to be safe.
 	 * Note that we use FALSE for the decr_cnt parameter (2nd parameter) to "ftok_sem_release". This is to avoid incorrect
 	 * removal of the ftok semaphore in case the counter is down to 1 but there are processes which did not bump the counter
-	 * (due to the counter overflowing) that are still accessing the semaphore. Even though we dont decrement the counter,
+	 * (due to the counter overflowing) that are still accessing the semaphore. Even though we don't decrement the counter,
 	 * the SEM_UNDO will take care of doing the actual decrement when this process terminates. The only consequence is
 	 * we will not be removing the ftok semaphore when the last process to use it dies (requiring a mupip rundown to clean
 	 * it up). But that is considered okay since these are abnormal exit conditions anyways and hopefully unlikely in practice.
diff --git a/sr_port/gv_select.c b/sr_port/gv_select.c
index f091e6b..c2ac198 100755
--- a/sr_port/gv_select.c
+++ b/sr_port/gv_select.c
@@ -229,8 +229,10 @@ void gv_select(char *cli_buff, int n_len, boolean_t freeze, char opname[], glist
 	}
 	if (freeze)
 	{
-		GTM64_ONLY(init_hashtab_int8(&ext_hash, 0, HASHTAB_COMPACT, HASHTAB_SPARE_TABLE);)
-		NON_GTM64_ONLY(init_hashtab_int4(&ext_hash, 0, HASHTAB_COMPACT, HASHTAB_SPARE_TABLE);)
+		GTM64_ONLY(init_hashtab_int8(&ext_hash, gmap_size * (100.0 / HT_LOAD_FACTOR),
+					HASHTAB_COMPACT, HASHTAB_SPARE_TABLE);)
+		NON_GTM64_ONLY(init_hashtab_int4(&ext_hash, gmap_size * (100.0 / HT_LOAD_FACTOR),
+					HASHTAB_COMPACT, HASHTAB_SPARE_TABLE);)
 	}
 	gl_head->next = NULL;
 	gl_tail = gl_head;
diff --git a/sr_port/gvcst_bmp_mark_free.c b/sr_port/gvcst_bmp_mark_free.c
index 85e5f10..5939436 100755
--- a/sr_port/gvcst_bmp_mark_free.c
+++ b/sr_port/gvcst_bmp_mark_free.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	*
@@ -90,6 +90,7 @@ trans_num gvcst_bmp_mark_free(kill_set *ks)
 	enum db_ver		ondsk_blkver;
 	enum cdb_sc		status;
 	boolean_t		mark_level_as_special;
+	inctn_opcode_t          saved_inctn_opcode;
 	DCL_THREADGBL_ACCESS;
 
 	SETUP_THREADGBL_ACCESS;
@@ -115,7 +116,7 @@ trans_num gvcst_bmp_mark_free(kill_set *ks)
 		assert(cs_data->db_got_to_v5_once); /* assert all V4 fmt blocks (including RECYCLED) have space for V5 upgrade */
 		inctn_detail.blknum_struct.blknum = 0; /* to indicate no adjustment to "blks_to_upgrd" necessary */
 		/* If any of the mini transaction below restarts because of an online rollback, we don't want the application
-		 * refresh to happen (like $ZONLNRLBK++ or rts_error(DBROLLEDBACK). This is because, although we are currently in	{BYPASSOK}
+		 * refresh to happen (like $ZONLNRLBK++ or rts error(DBROLLEDBACK). This is because, although we are currently in
 		 * non-tp (dollar_tleve = 0), we could actually be in a TP transaction and have actually faked dollar_tlevel. In
 		 * such a case, we should NOT * be issuing a DBROLLEDBACK error as TP transactions are supposed to just restart in
 		 * case of an online rollback. So, set the global variable that gtm_onln_rlbk_clnup can check and skip doing the
@@ -233,7 +234,9 @@ trans_num gvcst_bmp_mark_free(kill_set *ks)
 			if (0 == ret_tn) /* db format change occurred. Fall through to below for loop to visit each block */
 			{
 				/* Abort any active transaction to get rid of lingering Non-TP artifacts */
+				saved_inctn_opcode = inctn_opcode; /* t_abort() may change inctn_opcode so save and restore it */
 				t_abort(gv_cur_region, cs_addrs);
+				inctn_opcode = saved_inctn_opcode;
 				break;
 			}
 		}
diff --git a/sr_port/gvcst_init.c b/sr_port/gvcst_init.c
old mode 100755
new mode 100644
index 9caca60..e870f41
--- a/sr_port/gvcst_init.c
+++ b/sr_port/gvcst_init.c
@@ -17,6 +17,7 @@
 #include "gtm_time.h"
 #include "gtm_fcntl.h"
 #include "gtm_stdio.h"
+#include "gtm_unistd.h"
 
 #include "cdb_sc.h"
 #include "gdsroot.h"
@@ -73,12 +74,46 @@
 #include "gtm_dbjnl_dupfd_check.h"
 #endif
 
+/* Deferred database encryption initialization. Check the key handle and skip if already initialized  */
+#define INIT_DEFERRED_DB_ENCRYPTION_IF_NEEDED(REG, CSA, CSD)								\
+MBSTART {														\
+	int		init_status;											\
+	int		fn_len;												\
+	char		*fn;												\
+	boolean_t	do_crypt_init;											\
+	DEBUG_ONLY(boolean_t	was_gtmcrypt_initialized = gtmcrypt_initialized);					\
+															\
+	do_crypt_init = ((USES_ENCRYPTION(CSD->is_encrypted)) && !IS_LKE_IMAGE && CSA->encr_ptr				\
+				&& (GTMCRYPT_INVALID_KEY_HANDLE == (CSA)->encr_key_handle)				\
+				&& !(CSA->encr_ptr->issued_db_init_crypt_warning)					\
+				&& (CSA->encr_ptr->reorg_encrypt_cycle == CSA->nl->reorg_encrypt_cycle));		\
+	if (do_crypt_init)												\
+	{														\
+		assert(was_gtmcrypt_initialized);									\
+		fn = (char *)(REG->dyn.addr->fname);									\
+		fn_len = REG->dyn.addr->fname_len;									\
+		INIT_DB_OR_JNL_ENCRYPTION(CSA, CSD, fn_len, fn, init_status);						\
+		if ((0 != init_status) && (CSA->encr_ptr->reorg_encrypt_cycle == CSA->nl->reorg_encrypt_cycle))		\
+		{													\
+			if (IS_GTM_IMAGE || mu_reorg_encrypt_in_prog)							\
+			{												\
+				GTMCRYPT_REPORT_ERROR(init_status, rts_error, fn_len, fn);				\
+			} else												\
+			{												\
+				GTMCRYPT_REPORT_ERROR(MAKE_MSG_WARNING(init_status), gtm_putmsg, fn_len, fn);		\
+				CSA->encr_ptr->issued_db_init_crypt_warning = TRUE;					\
+			}												\
+		}													\
+	}														\
+} MBEND
+
 GBLREF	boolean_t		mu_reorg_process;
 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		gtmcrypt_initialized;
 GBLREF	boolean_t		gtcm_connection;
 GBLREF	bool			licensed;
 GBLREF	int4			lkid;
@@ -88,8 +123,9 @@ 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	uint4			mu_reorg_encrypt_in_prog;
 GBLREF	boolean_t		mupip_jnl_recover;
+GBLREF	jnl_format_buffer	*non_tp_jfb_ptr;
 GBLREF	buddy_list		*global_tlvl_info_list;
 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 */
@@ -143,7 +179,6 @@ error_def(ERR_DRVLONGJMP);	/* Generic internal only error used to drive longjump
 error_def(ERR_INVSTATSDB);
 error_def(ERR_MMNODYNUPGRD);
 error_def(ERR_REGOPENFAIL);
-error_def(ERR_STATSDBERR);
 error_def(ERR_STATSDBFNERR);
 error_def(ERR_STATSDBINUSE);
 
@@ -233,6 +268,23 @@ void	assert_jrec_member_offsets(void)
 	assert(SIZEOF(token_split_t) == SIZEOF(token_build));   /* Required for TOKEN_SET macro */
 }
 
+CONDITION_HANDLER(gvcst_init_autoDB_ch)
+{
+	START_CH(TRUE);
+	if ((SUCCESS == SEVERITY) || (INFO == SEVERITY))
+	{
+		assert(FALSE);  /* don't know of any possible INFO/SUCCESS errors */
+		CONTINUE;                       /* Keep going for non-error issues */
+	}
+	/* Enable interrupts in case we are here with intrpt_ok_state == INTRPT_IN_GVCST_INIT due to an rts error.
+	 * Normally we would have the new state stored in "prev_intrpt_state" but that is not possible here because
+	 * the corresponding DEFER_INTERRUPTS happened in "gvcst_init" (a different function) so we have an assert
+	 * there that the previous state was INTRPT_OK_TO_INTERRUPT and use that instead of prev_intrpt_state here.
+	 */
+	ENABLE_INTERRUPTS(INTRPT_IN_GVCST_INIT, INTRPT_OK_TO_INTERRUPT);
+	NEXTCH;
+}
+
 void gvcst_init(gd_region *reg)
 {
 	gd_segment		*seg;
@@ -264,12 +316,13 @@ void gvcst_init(gd_region *reg)
 	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;
+	jbuf_rsrv_struct_t	*nontp_jbuf_rsrv_lcl;
+	intrpt_state_t		prev_intrpt_state;
 	DCL_THREADGBL_ACCESS;
 
 	SETUP_THREADGBL_ACCESS;
@@ -409,9 +462,12 @@ void gvcst_init(gd_region *reg)
 				TP_FINAL_RETRY_DECREMENT_T_TRIES_IF_OK;
 			}
 			DEFER_INTERRUPTS(INTRPT_IN_GVCST_INIT, prev_intrpt_state);
+			assert(INTRPT_OK_TO_INTERRUPT == prev_intrpt_state);	/* relied upon by ENABLE_INTERRUPTS
+										 * in "gvcst_init_autoDB_ch".
+										 */
+			ESTABLISH(gvcst_init_autoDB_ch);
 			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));
 			}
@@ -473,7 +529,7 @@ void gvcst_init(gd_region *reg)
 #									ifdef BYPASS_UNLINK_RECREATE_STATSDB
 									baseDBnl->statsdb_created = TRUE;
 #									else
-									rc = unlink(statsdb_path);
+									rc = UNLINK(statsdb_path);
 									if (0 > rc)
 									{	/* Unlink failed - may not have permissions */
 										statsdb_rcerr = STATSDB_UNLINKERR;
@@ -509,7 +565,6 @@ void gvcst_init(gd_region *reg)
 						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));
 						}
@@ -524,7 +579,6 @@ void gvcst_init(gd_region *reg)
 								/* 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),
@@ -536,32 +590,26 @@ void gvcst_init(gd_region *reg)
 										      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 */
@@ -572,11 +620,9 @@ void gvcst_init(gd_region *reg)
 						{	/* 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"
@@ -588,10 +634,10 @@ void gvcst_init(gd_region *reg)
 			}
 			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));
 			}
+			REVERT;
 			ENABLE_INTERRUPTS(INTRPT_IN_GVCST_INIT, prev_intrpt_state);
 		}
 	}
@@ -697,7 +743,7 @@ void gvcst_init(gd_region *reg)
 			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;
+			FILE_CNTL(reg) = FILE_CNTL(prev_reg);
 			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;
@@ -771,7 +817,9 @@ void gvcst_init(gd_region *reg)
 		 * 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 */
+		assert(INTRPT_OK_TO_INTERRUPT == prev_intrpt_state);	/* relied upon by ENABLE_INTERRUPTS
+									 * in dbinit_ch and gvcst_init_autoDB_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
@@ -883,6 +931,8 @@ void gvcst_init(gd_region *reg)
 	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 */
 	DBG_MARK_RTS_ERROR_USABLE;
+	/* Do the deferred encryption initialization now in case it needs to issue an rts_error */
+	INIT_DEFERRED_DB_ENCRYPTION_IF_NEEDED(reg, csa, csd);
 	/* 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
@@ -937,6 +987,9 @@ void gvcst_init(gd_region *reg)
 			non_tp_jfb_ptr->buff = (char *)malloc(MAX_NONTP_JNL_REC_SIZE(bsize));
 			non_tp_jfb_ptr->record_size = 0;	/* initialize it to 0 since TOTAL_NONTPJNL_REC_SIZE macro uses it */
 			non_tp_jfb_ptr->alt_buff = NULL;
+			assert(NULL == TREF(nontp_jbuf_rsrv));
+			ALLOC_JBUF_RSRV_STRUCT(nontp_jbuf_rsrv_lcl, csa);
+			TREF(nontp_jbuf_rsrv) = nontp_jbuf_rsrv_lcl;
 		} else if (bsize > non_tp_jfb_ptr->hi_water_bsize)
 		{	/* Need a larger buffer to accommodate larger non-TP journal records */
 			non_tp_jfb_ptr->hi_water_bsize = bsize;
@@ -947,6 +1000,7 @@ void gvcst_init(gd_region *reg)
 				free(non_tp_jfb_ptr->alt_buff);
 				realloc_alt_buff = TRUE;
 			}
+			assert(NULL != TREF(nontp_jbuf_rsrv));
 		}
 		/* If the journal records need to be encrypted in the journal file and if replication is in use, we will need access
 		 * to both the encrypted (for the journal file) and unencrypted (for the journal pool) journal record contents.
@@ -1148,32 +1202,3 @@ void gvcst_init(gd_region *reg)
 	}
 	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 b464ac0..bef5acc 100644
--- a/sr_port/gvcst_kill.c
+++ b/sr_port/gvcst_kill.c
@@ -118,9 +118,6 @@ LITREF	mval	*fndata_table[2][2];
 #endif
 LITREF	mval	literal_batch;
 
-#define SKIP_ASSERT_TRUE	TRUE
-#define SKIP_ASSERT_FALSE	FALSE
-
 #define	GOTO_RETRY(CDB_STATUS, SKIP_ASSERT)							\
 {												\
 	assert((CDB_STAGNATE > t_tries) || IS_FINAL_RETRY_CODE(CDB_STATUS) || SKIP_ASSERT);	\
diff --git a/sr_port/gvcst_reservedDB_funcs.c b/sr_port/gvcst_reservedDB_funcs.c
index 9e86e94..1654953 100644
--- a/sr_port/gvcst_reservedDB_funcs.c
+++ b/sr_port/gvcst_reservedDB_funcs.c
@@ -58,7 +58,8 @@ 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 */
+STATICDEF intrpt_state_t	gvcst_statsDB_open_ch_intrpt_ok_state;
+STATICDEF 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					\
@@ -77,7 +78,9 @@ MBSTART {							\
 } MBEND
 
 error_def(ERR_DBPRIVERR);
+error_def(ERR_DRVLONGJMP);	/* Generic internal only error used to drive longjump() in a queued condition handler */
 error_def(ERR_RNDWNSTATSDBFAIL);
+error_def(ERR_STATSDBERR);
 
 /* 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
@@ -169,7 +172,9 @@ void gvcst_init_statsDB(gd_region *baseDBreg, boolean_t do_statsdb_init)
 				 * 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.
 				 */
+	gvcst_statsDB_open_ch_intrpt_ok_state = intrpt_ok_state;	/* needed by "gvcst_statsDB_open_ch" */
 	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)
@@ -405,6 +410,36 @@ void gvcst_init_statsDB(gd_region *baseDBreg, boolean_t do_statsdb_init)
 	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);
+	}
+	intrpt_ok_state = gvcst_statsDB_open_ch_intrpt_ok_state;
+	UNWIND(NULL, NULL);			/* Return back to where ESTABLISH_NORET was done */
+}
+
 /* 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.
  */
@@ -680,12 +715,6 @@ CONDITION_HANDLER(gvcst_remove_statsDB_linkage_ch)
 	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);
@@ -694,6 +723,11 @@ CONDITION_HANDLER(gvcst_remove_statsDB_linkage_ch)
 	/* 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);
+	if (DUMPABLE && !SUPPRESS_DUMP)
+	{
+		need_core = TRUE;
+		gtm_fork_n_core();
+	}
 	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 */
 }
diff --git a/sr_port/gvcst_root_search.c b/sr_port/gvcst_root_search.c
old mode 100755
new mode 100644
index 289d068..b0aa513
--- a/sr_port/gvcst_root_search.c
+++ b/sr_port/gvcst_root_search.c
@@ -41,9 +41,7 @@
 #include "get_spec.h"
 #include "collseq.h"
 #include "gtmimagename.h"
-#ifdef UNIX
 #include "error.h"
-#endif
 #include "io.h"
 
 GBLREF	gv_key		*gv_currkey, *gv_altkey;
@@ -57,7 +55,6 @@ GBLREF	unsigned int	t_tries;
 GBLREF	gv_namehead	*reset_gv_target;
 GBLREF	boolean_t	mu_reorg_process;
 GBLREF	boolean_t	mupip_jnl_recover;
-#ifdef UNIX
 # ifdef DEBUG
 GBLREF	boolean_t	is_rcvr_server;
 GBLREF	boolean_t	is_src_server;
@@ -70,7 +67,6 @@ GBLREF	trans_num	start_tn;
 GBLREF	uint4		update_trans;
 GBLREF	inctn_opcode_t	inctn_opcode;
 GBLREF	uint4		t_err;
-#endif
 #ifdef GTM_TRIGGER
 GBLREF	boolean_t		skip_INVOKE_RESTART;
 #endif
@@ -107,7 +103,6 @@ static	mstr	global_collation_mstr;
 	TRIG_TP_SET_SGM;									\
 }
 
-#ifdef UNIX
 #define SAVE_ROOTSRCH_ENTRY_STATE								\
 {												\
 	int				idx;							\
@@ -132,7 +127,7 @@ static	mstr	global_collation_mstr;
 	 * t_begin that it is 0.								\
 	 */											\
 	update_trans = 0;									\
-	inctn_opcode = 0;									\
+	inctn_opcode = inctn_invalid_op;							\
 	rootsrch_ctxt_ptr->t_err = t_err;							\
 	rootsrch_ctxt_ptr->hold_onto_crit = cs_addrs->hold_onto_crit;				\
 	if (CDB_STAGNATE <= t_tries)								\
@@ -214,7 +209,6 @@ void gvcst_redo_root_search()
 	RESTORE_ROOTSRCH_ENTRY_STATE;
 	REVERT;
 }
-#endif
 
 enum cdb_sc gvcst_root_search(boolean_t donot_restart)
 {
diff --git a/sr_port/gvcst_tp_init.c b/sr_port/gvcst_tp_init.c
old mode 100755
new mode 100644
index a226e42..f6f4b97
--- a/sr_port/gvcst_tp_init.c
+++ b/sr_port/gvcst_tp_init.c
@@ -1,6 +1,7 @@
 /****************************************************************
  *								*
- *	Copyright 2003, 2012 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	*
@@ -96,6 +97,7 @@ void gvcst_tp_init(gd_region *greg)
 			 */
 			initialize_list(si->format_buff_list, JFB_ELE_SIZE,
 					DIVIDE_ROUND_UP(JNL_FORMAT_BUFF_INIT_ALLOC, JFB_ELE_SIZE));
+			ALLOC_JBUF_RSRV_STRUCT(si->jbuf_rsrv_ptr, csa);
 		}
 	} else if (NULL != si->jnl_tail)
 	{	/* journaling is currently disallowed although it was allowed (non-zero si->jnl_tail)
@@ -103,6 +105,8 @@ void gvcst_tp_init(gd_region *greg)
 		 */
 		FREEUP_BUDDY_LIST(si->jnl_list);
 		FREEUP_BUDDY_LIST(si->format_buff_list);
+		assert(NULL != si->jbuf_rsrv_ptr);
+		FREE_JBUF_RSRV_STRUCT(si->jbuf_rsrv_ptr);
 		si->jnl_tail = NULL;
 	}
 }
diff --git a/sr_port/gvn.c b/sr_port/gvn.c
index 41c7220..4d30dcc 100755
--- a/sr_port/gvn.c
+++ b/sr_port/gvn.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/indirection.c b/sr_port/indirection.c
index 67740e0..d53c19d 100755
--- a/sr_port/indirection.c
+++ b/sr_port/indirection.c
@@ -46,7 +46,7 @@ int indirection(oprtype *a)
 	concat_athashes = (2 == source_column);
 	INCREMENT_EXPR_DEPTH;
 	advancewindow();
-	if (!expratom(a))
+	if (TREF(xecute_literal_parse) || !expratom(a))
 	{
 		DECREMENT_EXPR_DEPTH;
 		stx_error(ERR_EXPR);
diff --git a/sr_port/init_secshr_addrs.c b/sr_port/init_secshr_addrs.c
deleted file mode 100755
index 2016ad9..0000000
--- a/sr_port/init_secshr_addrs.c
+++ /dev/null
@@ -1,99 +0,0 @@
-/****************************************************************
- *								*
- *	Copyright 2001, 2010 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 "gdsroot.h"
-#include "gtm_facility.h"
-#include "fileinfo.h"
-#include "gdsbt.h"
-#include "gdsfhead.h"
-#include "gdscc.h"
-#include "gdskill.h"
-#include "filestruct.h"
-#include "repl_msg.h"
-#include "gtmsource.h"
-#include "jnl.h"
-#include "buddy_list.h"		/* needed for tp.h */
-#include "hashtab_int4.h"	/* needed for tp.h */
-#include "tp.h"
-#include "init_secshr_addrs.h"
-#ifdef DEBUG
-#include "wbox_test_init.h"
-#include "gt_timer.h"
-#endif
-
-GBLREF gd_addr_fn_ptr	get_next_gdr_addrs;
-GBLREF cw_set_element	*cw_set_addrs;
-GBLREF sgm_info		**first_sgm_info_addrs;
-GBLREF sgm_info		**first_tp_si_by_ftok_addrs;
-GBLREF unsigned char	*cw_depth_addrs;
-GBLREF uint4		rundown_process_id;
-GBLREF uint4		rundown_image_count;
-GBLREF int4		rundown_os_page_size;
-GBLREF gd_region	**jnlpool_reg_addrs;
-GBLREF inctn_opcode_t	*inctn_opcode_addrs;
-GBLREF inctn_detail_t	*inctn_detail_addrs;
-GBLREF uint4		*dollar_tlevel_addrs;
-GBLREF uint4		*update_trans_addrs;
-GBLREF sgmnt_addrs	**cs_addrs_addrs;
-GBLREF sgmnt_addrs 	**kip_csa_addrs;
-GBLREF boolean_t	*need_kip_incr_addrs;
-GBLREF trans_num	*start_tn_addrs;
-
-#define DEF_PGSZ	512
-
-void init_secshr_addrs(gd_addr_fn_ptr getnxtgdr, cw_set_element *cwsetaddrs,
-	sgm_info **firstsiaddrs, sgm_info **firstsibyftokaddrs,
-	unsigned char *cwsetdepthaddrs, uint4 epid,
-	uint4 icnt, int4 gtmospagesize, gd_region **jpool_reg_address,
-	inctn_opcode_t *inctn_opcode_address,
-	inctn_detail_t *inctn_detail_address, uint4 *dollar_tlevel_address,
-	uint4 *update_trans_address, sgmnt_addrs **cs_addrs_address,
-	sgmnt_addrs **kip_csa_address, boolean_t *need_kip_incr_address,
-	trans_num *start_tn_address)
-{
-	get_next_gdr_addrs = getnxtgdr;
-	cw_set_addrs = cwsetaddrs;
-	first_sgm_info_addrs = firstsiaddrs;
-	first_tp_si_by_ftok_addrs = firstsibyftokaddrs;
-	cw_depth_addrs = cwsetdepthaddrs;
-	rundown_process_id = epid;
-	assert(rundown_process_id);
-	rundown_image_count = icnt;
-	rundown_os_page_size = ((0 != gtmospagesize) && ((gtmospagesize / DEF_PGSZ) * DEF_PGSZ) == gtmospagesize) ? gtmospagesize
-														  : DEF_PGSZ;
-	jnlpool_reg_addrs = jpool_reg_address;
-	inctn_opcode_addrs = inctn_opcode_address;
-	inctn_detail_addrs = inctn_detail_address;
-	dollar_tlevel_addrs = dollar_tlevel_address;
-	update_trans_addrs = update_trans_address;
-	cs_addrs_addrs = cs_addrs_address;
-	kip_csa_addrs = kip_csa_address;
-	need_kip_incr_addrs = need_kip_incr_address;
-#	ifdef DEBUG
-	if (WBTEST_ENABLED(WBTEST_SLAM_SECSHR_ADDRS))
-	{	/* For this white box test, we're going to send ourselves a SIGTERM termination signal at a specific point
-		 * in the processing to make sure it succeeds without exploding during database initialization. To test the 
-		 * condition GTM-8455 fixes
-		 */
-		kill(epid, SIGTERM);
-		hiber_start(20 * 1000);			/* Wait up to 20 secs - don't use wait_any as the heartbeat timer
-							 * will kill this wait in 0-7 seconds or so.
-							 */
-		/* We sent, we waited, wait expired - weird - funky condition is for identification purposes (to identify the	
-		 * actual assert). We should be dead or dying, not trying to resume.
-		 */
-		assert(WBTEST_SLAM_SECSHR_ADDRS == 0);
-	}
-#	endif
-	start_tn_addrs = start_tn_address;	/* WARNING secshr_db_clnup relies on this being the last assignment in this setup */
-}
diff --git a/sr_port/init_secshr_addrs.h b/sr_port/init_secshr_addrs.h
deleted file mode 100644
index 8b5311a..0000000
--- a/sr_port/init_secshr_addrs.h
+++ /dev/null
@@ -1,51 +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.	*
- *								*
- ****************************************************************/
-
-#ifndef INIT_SECSHR_ADDRS_INCLUDED
-#define INIT_SECSHR_ADDRS_INCLUDED
-
-void init_secshr_addrs(gd_addr_fn_ptr getnxtgdr, cw_set_element *cwsetaddrs,
-		       sgm_info **firstsiaddrs, sgm_info **firstsibyftokaddrs,
-		       unsigned char *cwsetdepthaddrs, uint4 epid,
-		       uint4 icnt, int4 gtmospagesize, gd_region **jpool_reg_address,
-		       inctn_opcode_t *inctn_opcode_address,
-		       inctn_detail_t *inctn_detail_address, uint4 *dollar_tlevel_address,
-		       uint4 *update_trans_address, sgmnt_addrs **cs_addrs_address,
-		       sgmnt_addrs **kip_csa_addrs, boolean_t *need_kip_incr_address,
-		       trans_num *start_tn_address);
-
-#include "dpgbldir.h"		/* for "get_next_gdr" used by INVOKE_INIT_SECSHR_ADDRS macro */
-
-GBLREF	sgm_info		*first_sgm_info;	/* List of all regions (unsorted) in TP transaction */
-GBLREF	sgm_info		*first_tp_si_by_ftok;	/* List of READ or UPDATED regions sorted on ftok order */
-GBLREF	cw_set_element		cw_set[];
-GBLREF	unsigned char		cw_set_depth;
-GBLREF	uint4			process_id;
-GBLREF	uint4			image_count;
-GBLREF	jnlpool_addrs		jnlpool;
-GBLREF	inctn_opcode_t		inctn_opcode;
-GBLREF	inctn_detail_t		inctn_detail;			/* holds detail to fill in to inctn jnl record */
-GBLREF	uint4			dollar_tlevel;
-GBLREF	uint4			update_trans;
-GBLREF	sgmnt_addrs		*cs_addrs;
-GBLREF	sgmnt_addrs 		*kip_csa;
-GBLREF	boolean_t		need_kip_incr;
-GBLREF	trans_num		start_tn;
-
-#define	INVOKE_INIT_SECSHR_ADDRS								\
-	init_secshr_addrs(get_next_gdr, cw_set, &first_sgm_info, &first_tp_si_by_ftok,		\
-				&cw_set_depth, process_id, image_count, OS_PAGE_SIZE,		\
-				&jnlpool.jnlpool_dummy_reg, &inctn_opcode, &inctn_detail,	\
-				&dollar_tlevel, &update_trans, &cs_addrs,			\
-				&kip_csa, &need_kip_incr, &start_tn);
-
-#endif /* INIT_SECSHR_ADDRS_INCLUDED */
diff --git a/sr_port/ins_errtriple.c b/sr_port/ins_errtriple.c
index 057ff52..8424adb 100755
--- a/sr_port/ins_errtriple.c
+++ b/sr_port/ins_errtriple.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,13 @@
 GBLREF	int4		pending_errtriplecode;	/* if non-zero contains the error code to invoke ins_errtriple with */
 GBLREF	triple		t_orig;
 
+error_def(ERR_ASSERT);
+error_def(ERR_GTMASSERT);
+error_def(ERR_DIVZERO);
+error_def(ERR_NEGFRACPWR);
+error_def(ERR_NUMOFLOW);
+error_def(ERR_PATNOTFOUND);
+
 void ins_errtriple(int4 in_error)
 {
 	boolean_t	add_rterror_triple;
@@ -50,14 +57,19 @@ void ins_errtriple(int4 in_error)
 			x = x->exorder.fl;
 			assert(OC_ILIT == x->opcode);	/* corresponds to put_ilit(FALSE) in previous ins_errtriple */
 		}
+		/* delete all trailing triples and if the first, replace them below with an OC_RTERROR triple */
 		dqdelchain(x, TREF(curtchain), exorder);
+		CHKTCHAIN(TREF(curtchain), exorder, FALSE);
 		assert(!add_rterror_triple || ((TREF(pos_in_chain)).exorder.bl->exorder.fl == TREF(curtchain)));
 		assert(!add_rterror_triple || ((TREF(curtchain))->exorder.bl == (TREF(pos_in_chain)).exorder.bl));
+		if ((ERR_DIVZERO == in_error) || (ERR_NEGFRACPWR == in_error)
+				|| (ERR_NUMOFLOW == in_error) || (ERR_PATNOTFOUND == in_error))
+			TREF(rts_error_in_parse) = TRUE;	/* WARNING: fallthrough */
 	} else
 		/* For IS_STX_WARN errors (if not compiling a trigger), parsing continues, so dont strip the chain */
 		add_rterror_triple = TRUE;
 	if (add_rterror_triple)
-	{
+	{	/* WARN error or first error in the current line */
 		triptr = newtriple(OC_RTERROR);
 		triptr->operand[0] = put_ilit(in_error);
 		triptr->operand[1] = put_ilit(FALSE);	/* not a subroutine reference */
diff --git a/sr_port/io.h b/sr_port/io.h
index c881d82..5a2c2ed 100644
--- a/sr_port/io.h
+++ b/sr_port/io.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	*
@@ -17,10 +17,6 @@
 #define _OSF_SOURCE
 #include <iconv.h>
 #undef _OSF_SOURCE
-#else /* no iconv.h - must define size_t on VMS platform */
-#ifdef VMS
-#include <sys/types.h>
-#endif
 #endif
 #include <stdarg.h>
 
@@ -80,16 +76,14 @@ typedef unsigned char params;
  */
 enum io_dev_type
 {	tt,		/* terminal	*/
-	mt,		/* mag tape	*/
+	mt,		/* mag tape - obsolete but left so devices aren't renumbered - could reuse */
 	rm,		/* rms		*/
 	us,		/* user device driver */
-	mb,		/* mail box	*/
+	mb,		/* mail box - obsolete but left so devices aren't renumbered - could reuse */
 	nl,		/* null device	*/
 	ff,		/* fifo device  */
 	gtmsocket,	/* socket device, socket is already used by sys/socket.h */
-#ifdef UNIX
 	pi,		/* pipe */
-#endif
 	n_io_dev_types	/* terminator	*/
 };
 
@@ -100,14 +94,6 @@ enum io_dev_state
 	n_io_dev_states
 };
 
-#ifdef VMS
-enum code_set_type
-{
-	ascii,
-	ebcdic
-};
-#endif
-
 typedef struct
 {
 	struct	io_desc_struct	*in;
@@ -139,7 +125,7 @@ typedef struct io_desc_struct
 	unsigned char			esc_state;
 	void				*dev_sp;
 	struct dev_dispatch_struct	*disp_ptr;
-#if defined(KEEP_zOS_EBCDIC) || defined(VMS)
+#if defined(KEEP_zOS_EBCDIC)
 	iconv_t				input_conv_cd;
 	iconv_t				output_conv_cd;
 	enum code_set_type		in_code_set;
@@ -218,37 +204,36 @@ void io_init(boolean_t term_ctrl);
 bool io_is_rm(mstr *name);
 bool io_is_sn(mstr *tn);
 struct mv_stent_struct *io_find_mvstent(io_desc *io_ptr, boolean_t clear_mvstent);
-bool io_open_try(io_log_name *naml, io_log_name *tl, mval *pp, int4 timeout, mval *mspace);
+boolean_t io_open_try(io_log_name *naml, io_log_name *tl, mval *pp, int4 msec_timeout, mval *mspace);
 enum io_dev_type io_type(mstr *tn);
 void io_init_name(void);
 
-#define ioxx_open(X)		short io##X##_open(io_log_name *dev_name, mval *pp, int fd, mval *mspace, int4 timeout)
-#define ioxx_dummy(X)		short io##X##_dummy(io_log_name *dev_name, mval *pp, int fd, mval *mspace, int4 timeout)
+#define ioxx_open(X)		short io##X##_open(io_log_name *dev_name, mval *pp, int fd, mval *mspace, int4 msec_timeout)
+#define ioxx_dummy(X)		short io##X##_dummy(io_log_name *dev_name, mval *pp, int fd, mval *mspace, int4 msec_timeout)
 #define ioxx_close(X)		void io##X##_close(io_desc *iod, mval *pp)
 #define ioxx_use(X)		void io##X##_use(io_desc *iod, mval *pp)
-#define ioxx_read(X)		int io##X##_read(mval *v, int4 t)
-#define ioxx_rdone(X)		int io##X##_rdone (mint *v, int4 timeout)
+#define ioxx_read(X)		int io##X##_read(mval *v, int4 msec_timeout)
+#define ioxx_rdone(X)		int io##X##_rdone (mint *v, int4 msec_timeout)
 #define ioxx_write(X)		void io##X##_write(mstr *v)
 #define ioxx_wtone(X)		void io##X##_wtone(int c)
 #define ioxx_wteol(X)		void io##X##_wteol(int4 cnt, io_desc *iod)
 #define ioxx_wtff(X)		void io##X##_wtff(void)
 #define ioxx_wttab(X)		void io##X##_wttab(int4 x)
 #define ioxx_flush(X)		void io##X##_flush(io_desc *iod)
-#define ioxx_readfl(X)		int io##X##_readfl(mval *v, int4 width, int4 timeout)
+#define ioxx_readfl(X)		int io##X##_readfl(mval *v, int4 width, int4 msec_timeout)
 #define xx_iocontrol(X)		void X##_iocontrol(mstr *mn, int4 argcnt, va_list args)
 #define xx_dlr_device(X)	void X##_dlr_device(mstr *d)
 #define xx_dlr_key(X)		void X##_dlr_key(mstr *d)
 #define xx_dlr_zkey(X)		void X##_dlr_zkey(mstr *d)
 
 /* Following definitions have a pattern that most of the routines follow. Only exceptions are:
- *      1. ioff_open() is an extra routine
- *      2. iopi_open() is an extra routine on unix
- *	3. iopi_iocontrol() is an extra routine on unix to handle write /writeof
+ *	1. ioff_open() is an extra routine
+ *	2. iopi_open() is an extra routine
+ *	3. iopi_iocontrol()  to handle write /writeof
  *	4. iosocket_dlr_zkey() is only for sockets
  */
 
-#define ioxx(X) ioxx_##X(tt); ioxx_##X(mt); ioxx_##X(rm); VMS_ONLY(ioxx_##X(mb);) ioxx_##X(nl); \
-	ioxx_##X(us); ioxx_##X(tcp); ioxx_##X(socket)
+#define ioxx(X) ioxx_##X(tt); ioxx_##X(mt); ioxx_##X(rm); ioxx_##X(nl); ioxx_##X(us); ioxx_##X(socket)
 #define xxdlr(X) xx_iocontrol(X); xx_dlr_device(X); xx_dlr_key(X)
 #define xxdlrzk(X) xx_iocontrol(X); xx_dlr_device(X); xx_dlr_key(X); xx_dlr_zkey(X)
 
@@ -270,16 +255,14 @@ xxdlrzk(nil);
 xxdlr(ious);
 xxdlrzk(iosocket);
 ioxx_open(ff);
-#ifdef UNIX
 ioxx_open(pi);
 xxdlrzk(iopi);	/* we need iopi_iocontrol(), iopi_dlr_device(), iopi_dlr_key() and iopi_dlr_zkey() */
 xxdlr(iott);	/* we need iott_iocontrol(), iott_dlr_device() and iott_dlr_key() */
-#endif
 ioxx_wttab(us);
 /* iott_ prototypes */
 uchar_ptr_t iott_escape(uchar_ptr_t strin, uchar_ptr_t strtop, io_desc *io_ptr);
 
-/* iomt_ prototypes */
+/* iomt_ prototypes which need to stay until we nix the iomt routines */
 void iomt_getrec(io_desc *dv);
 void iomt_rdstream(uint4 len, void *str, io_desc *dv);
 int iomt_readblk(io_desc *dv);
@@ -301,24 +284,16 @@ void iomt_skiprecord(io_desc *dev, int count);
 void iomt_tm(io_desc *dev);
 void iomt_wtdoslab(io_desc *dv);
 
-
 /* iosocket_ prototypes */
 boolean_t iosocket_listen(io_desc *iod, unsigned short len);
 boolean_t iosocket_wait(io_desc *iod, int4 timepar);
 void iosocket_poolinit(void);
-#ifndef VMS
 void iosocket_pass_local(io_desc *iod, pid_t pid, int4 timeout, int argcnt, va_list args);
 void iosocket_accept_local(io_desc *iod, mval *handlevar, pid_t pid, int4 timeout, int argcnt, va_list args);
-#endif
 
-/* tcp_ prototypes */
+/* tcp_ prototypes used by mupip */
 int tcp_open(char *host, unsigned short port, int4 timeout, boolean_t passive);
 
-/* iomb_ prototypes */
-#ifdef VMS
-int iomb_dataread (int timeout);
-#endif
-
 bool same_device_check(mstr tname, char *buf);
 
 #define	iotype(O,X,Y,Z) 								\
@@ -332,11 +307,7 @@ bool same_device_check(mstr tname, char *buf);
 		NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL	\
 }
 
-#ifdef __sparc
-int outc(char ch);
-#else
 int outc(int ch);
-#endif
 
 void get_dlr_device(mval *v);
 void get_dlr_key(mval *v);
@@ -353,10 +324,11 @@ dev_dispatch_struct *io_get_fgn_driver(mstr *s);
 
 #define MAX_CHSET_NAME	64
 #define TAB_BUF_SZ	128
+#define READTIMESTR	"READ"
 
 LITREF unsigned char spaces_block[];
 
-#if defined(KEEP_zOS_EBCDIC) || defined(VMS)
+#if defined(KEEP_zOS_EBCDIC)
 
 LITREF unsigned char ebcdic_spaces_block[];
 
@@ -381,12 +353,12 @@ LITREF unsigned char ebcdic_spaces_block[];
 
 #endif /* __MVS__ */
 
-#else /* !KEEP_zOS_EBCDIC && !VMS*/
+#else /* !KEEP_zOS_EBCDIC */
 
 #define SPACES_BLOCK spaces_block
 #define RM_SPACES_BLOCK spaces_block
 
-#endif /* KEEP_zOS_EBCDIC || VMS */
+#endif /* KEEP_zOS_EBCDIC */
 
 #define ICONV_OPEN_CD(DESC_CD, CODE_SRC, CODE_TARGET)		\
 {								\
diff --git a/sr_port/io_dev_dispatch.h b/sr_port/io_dev_dispatch.h
index c44ea9b..1bc8346 100755
--- a/sr_port/io_dev_dispatch.h
+++ b/sr_port/io_dev_dispatch.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,37 +12,17 @@
 
 /* mupip_io_dev_dispatch.h is a subset of this file which includes those needed only by MUPIP
  * so, if you need to make a change here, please keep the other one in sync.
- *
- * VMS can have addresses in literal constants while most Unix platforms cannot
  */
 
-UNIX_ONLY(GBLDEF) VMS_ONLY(LITDEF) dev_dispatch_struct io_dev_dispatch[] =
+GBLDEF dev_dispatch_struct io_dev_dispatch[] =
 {
-#	ifdef UNIX
 	iotype(iott, iott, iott, nil),
-#	else
-	iotype(iott, iott, nil, nil),
-#	endif
-	iotype(iomt, iomt, nil, nil),
-#	ifdef UNIX
+	ionil_dev,			/* placeholder where mt once lived */
 	iotype(iorm, iorm, iopi, iopi),
-#	else
-	iotype(iorm, iorm, nil, nil),
-#	endif
 	iotype(ious, ious, ious, nil),
-#	ifdef UNIX
-	ionil_dev,
-#	else
-	iotype(iomb, iomb, nil, nil),
-#	endif
+	ionil_dev,			/* placeholder where mb once lived */
 	iotype(ionl, ionl, nil, nil),
-#	ifdef UNIX
 	iotype(ioff, iorm, iopi, nil),
-#	else
-	iotype(ioff, iorm, nil, nil),
-#	endif
-	iotype(iosocket, iosocket, iosocket, iosocket)
-#	ifdef UNIX
-	,iotype(iopi, iorm, iopi, iopi)
-#	endif
+	iotype(iosocket, iosocket, iosocket, iosocket),
+	iotype(iopi, iorm, iopi, iopi)
 };
diff --git a/sr_port/io_init.c b/sr_port/io_init.c
index 3a61be2..1b9c888 100755
--- a/sr_port/io_init.c
+++ b/sr_port/io_init.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,7 +30,7 @@ GBLREF io_pair		io_std_device;		/* standard device	*/
 GBLREF io_log_name	*dollar_principal;	/* pointer to log name GTM$PRINCIPAL if defined */
 GBLREF bool		prin_in_dev_failure;
 GBLREF bool		prin_out_dev_failure;
-GBLREF int		(*op_open_ptr)(mval *v, mval *p, int t, mval *mspace);
+GBLREF int		(*op_open_ptr)(mval *v, mval *p, const mval *t, mval *mspace);
 
 GBLREF io_log_name	*io_root_log_name;	/* root of linked list	*/
 GBLREF mstr		sys_input;
@@ -39,6 +40,8 @@ GBLREF mstr		gtm_principal;
 GBLREF boolean_t	err_same_as_out;
 #endif
 
+LITREF	mval	literal_zero;
+
 error_def(ERR_FILEOPENFAIL);
 error_def(ERR_LOGTOOLONG);
 error_def(ERR_SYSCALL);
@@ -172,7 +175,7 @@ void io_init(boolean_t term_ctrl)
 	else
 		rts_error_csa(CSA_ARG(NULL) VARLSTCNT(1) status);
 	ESTABLISH(io_init_ch);
-	(*op_open_ptr)(&val, &pars, 0, 0);
+	(*op_open_ptr)(&val, &pars, (mval *)&literal_zero, 0);
 	io_curr_device.in  = io_std_device.in  = inp->iod;
 	val.str = sys_output;
 	if ((SS_NORMAL == TRANS_LOG_NAME(&gtm_netout, &tn, buf1, SIZEOF(buf1), do_sendmsg_on_log2long))
@@ -211,7 +214,7 @@ void io_init(boolean_t term_ctrl)
 			pars.str.len = SIZEOF(open_params_list);
 			pars.str.addr = (char *)open_params_list;
 		}
-		(*op_open_ptr)(&val, &pars, 0, 0);
+		(*op_open_ptr)(&val, &pars, (mval *)&literal_zero, 0);
 	}
 	io_curr_device.out = io_std_device.out = outp->iod;
 	term_setup(term_ctrl);
diff --git a/sr_port/iosocket_bind.c b/sr_port/iosocket_bind.c
index e490d91..0e10aeb 100755
--- a/sr_port/iosocket_bind.c
+++ b/sr_port/iosocket_bind.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	*
@@ -41,11 +42,11 @@ error_def(ERR_SOCKBIND);
 error_def(ERR_SOCKINIT);
 error_def(ERR_TEXT);
 
-boolean_t iosocket_bind(socket_struct *socketptr, int4 timepar, boolean_t update_bufsiz, boolean_t newversion)
+boolean_t iosocket_bind(socket_struct *socketptr, int4 msec_timeout, boolean_t update_bufsiz, boolean_t newversion)
 {
 	int			temp_1 = 1;
 	char			*errptr, *charptr;
-	int4			errlen, msec_timeout, real_errno;
+	int4			errlen, real_errno;
 	short			len;
 	in_port_t		actual_port;
 	boolean_t		no_time_left = FALSE, ioerror;
@@ -72,13 +73,11 @@ boolean_t iosocket_bind(socket_struct *socketptr, int4 timepar, boolean_t update
 		socketptr->sd = socketptr->temp_sd;
 		socketptr->temp_sd = FD_INVALID;
 	}
-	if (timepar != NO_M_TIMEOUT)
+	if (NO_M_TIMEOUT != msec_timeout)
 	{
-		msec_timeout = timeout2msec(timepar);
 		sys_get_curr_time(&cur_time);
 		add_int_to_abs_time(&cur_time, msec_timeout, &end_time);
 	}
-
 	do
 	{
 		temp_1 = 1;
@@ -180,11 +179,14 @@ boolean_t iosocket_bind(socket_struct *socketptr, int4 timepar, boolean_t update
 				case EINTR:
 					break;
 				case EADDRINUSE:
-					if (NO_M_TIMEOUT != timepar)
+					if (NO_M_TIMEOUT != msec_timeout)
 					{
 						sys_get_curr_time(&cur_time);
 						cur_time = sub_abs_time(&end_time, &cur_time);
-						if (cur_time.at_sec > 0)
+						msec_timeout = (int4)(cur_time.at_sec * MILLISECS_IN_SEC +
+							/* Round up in order to prevent premature timeouts */
+							DIVIDE_ROUND_UP(cur_time.at_usec, MICROSECS_IN_MSEC));
+						if (msec_timeout > 0)
 							no_time_left = FALSE;
 					} else
 						no_time_left = FALSE;	/* retry */
diff --git a/sr_port/iosocket_connect.c b/sr_port/iosocket_connect.c
index 9f3e1f0..ec80d9d 100644
--- a/sr_port/iosocket_connect.c
+++ b/sr_port/iosocket_connect.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,14 +35,14 @@
 
 #define	ESTABLISHED	"ESTABLISHED"
 
-GBLREF	volatile int4           outofband;
-GBLREF	boolean_t               dollar_zininterrupt;
-GBLREF	stack_frame             *frame_pointer;
-GBLREF	unsigned char           *stackbase, *stacktop, *msp, *stackwarn;
-GBLREF	mv_stent                *mv_chain;
-GBLREF	int			socketus_interruptus;
+GBLREF	boolean_t		dollar_zininterrupt;
 GBLREF	d_socket_struct		*newdsocket;	/* in case jobinterrupt */
+GBLREF	int			socketus_interruptus;
 GBLREF	int4			gtm_max_sockets;
+GBLREF	mv_stent		*mv_chain;
+GBLREF	stack_frame		*frame_pointer;
+GBLREF	unsigned char		*stackbase, *stacktop, *msp, *stackwarn;
+GBLREF	volatile int4		outofband;
 
 error_def(ERR_GETNAMEINFO);
 error_def(ERR_GETSOCKNAMERR);
@@ -54,11 +55,11 @@ error_def(ERR_STACKOFLOW);
 error_def(ERR_TEXT);
 error_def(ERR_ZINTRECURSEIO);
 
-boolean_t iosocket_connect(socket_struct *sockptr, int4 timepar, boolean_t update_bufsiz)
+boolean_t iosocket_connect(socket_struct *sockptr, int4 msec_timeout, boolean_t update_bufsiz)
 {
 	int		temp_1;
 	char		*errptr;
-	int4            errlen, msec_timeout, save_errno, last_errno;
+	int4		errlen, last_errno, save_errno;
 	int		d_socket_struct_len, res, nfds, sockerror;
 	fd_set		writefds;
 	boolean_t	no_time_left = FALSE;
@@ -66,65 +67,61 @@ boolean_t iosocket_connect(socket_struct *sockptr, int4 timepar, boolean_t updat
 	short		len;
 	io_desc		*iod;
 	d_socket_struct *dsocketptr, *real_dsocketptr;
-        socket_interrupt *sockintr, *real_sockintr;
-	ABS_TIME        cur_time, end_time;
+	socket_interrupt *sockintr, *real_sockintr;
+	ABS_TIME	cur_time, end_time;
 	struct timeval	*sel_time;
-        mv_stent        *mv_zintdev;
+	mv_stent	*mv_zintdev;
 	struct addrinfo *remote_ai_ptr, *raw_ai_ptr, *local_ai_ptr;
 	int		errcode, real_errno;
 	char		ipaddr[SA_MAXLEN + 1];
 	char		port_buffer[NI_MAXSERV];
 	GTM_SOCKLEN_TYPE	sockbuflen, tmp_addrlen;
 
-	DBGSOCK((stdout, "socconn: ************* Entering socconn - timepar: %d\n",timepar));
-        /* check for validity */
+	DBGSOCK((stdout, "socconn: ************* Entering socconn - msec_timeout: %d\n",msec_timeout));
+	/* check for validity */
 	dsocketptr = sockptr->dev;
-        assert(NULL != dsocketptr);
-        sockintr = &dsocketptr->sock_save_state;
+	assert(NULL != dsocketptr);
+	sockintr = &dsocketptr->sock_save_state;
 	iod = dsocketptr->iod;
 	real_dsocketptr = (d_socket_struct *)iod->dev_sp;	/* not newdsocket which is not saved on error */
-        real_sockintr = &real_dsocketptr->sock_save_state;
-
-        iod->dollar.key[0] = '\0';
+	real_sockintr = &real_dsocketptr->sock_save_state;
+	iod->dollar.key[0] = '\0';
 	need_socket = need_connect = TRUE;
 	need_select = FALSE;
-
-        /* Check for restart */
-        if (dsocketptr->mupintr)
-        {       /* We have a pending read restart of some sort - check we aren't recursing on this device */
-                assertpro(sockwhich_invalid != sockintr->who_saved);	/* Interrupt should never have an invalid save state */
-                if (dollar_zininterrupt)
-                        rts_error_csa(CSA_ARG(NULL) VARLSTCNT(1) ERR_ZINTRECURSEIO);
-                assertpro(sockwhich_connect == sockintr->who_saved);	/* ZINTRECURSEIO should have caught */
-                DBGSOCK((stdout, "socconn: *#*#*#*#*#*#*#  Restarted interrupted connect\n"));
-                mv_zintdev = io_find_mvstent(iod, FALSE);
-                if (mv_zintdev)
-                {
-                        if (sockintr->end_time_valid)
-                                /* Restore end_time for timeout */
-                                end_time = sockintr->end_time;
+	/* Check for restart */
+	if (dsocketptr->mupintr)
+	{       /* We have a pending read restart of some sort - check we aren't recursing on this device */
+		assertpro(sockwhich_invalid != sockintr->who_saved);	/* Interrupt should never have an invalid save state */
+		if (dollar_zininterrupt)
+			rts_error_csa(CSA_ARG(NULL) VARLSTCNT(1) ERR_ZINTRECURSEIO);
+		assertpro(sockwhich_connect == sockintr->who_saved);	/* ZINTRECURSEIO should have caught */
+		DBGSOCK((stdout, "socconn: *#*#*#*#*#*#*#  Restarted interrupted connect\n"));
+		mv_zintdev = io_find_mvstent(iod, FALSE);
+		if (mv_zintdev)
+		{
+			if (sockintr->end_time_valid)
+				/* Restore end_time for timeout */
+				end_time = sockintr->end_time;
 			if ((socket_connect_inprogress == sockptr->state) && (FD_INVALID != sockptr->sd))
 			{
 				need_select = TRUE;
 				need_socket = need_connect = FALSE;	/* sd still good */
 			}
-
-                        /* Done with this mv_stent. Pop it off if we can, else mark it inactive. */
-                        if (mv_chain == mv_zintdev)
-                                POP_MV_STENT();         /* pop if top of stack */
-                        else
-                        {       /* else mark it unused, see iosocket_open for use */
-                                mv_zintdev->mv_st_cont.mvs_zintdev.buffer_valid = FALSE;
-                                mv_zintdev->mv_st_cont.mvs_zintdev.io_ptr = NULL;
-                        }
-                        DBGSOCK((stdout, "socconn: mv_stent found - endtime: %d/%d\n", end_time.at_sec, end_time.at_usec));
-                } else
-                        DBGSOCK((stdout, "socconn: no mv_stent found !!\n"));
-                real_dsocketptr->mupintr = dsocketptr->mupintr = FALSE;
-                real_sockintr->who_saved = sockintr->who_saved = sockwhich_invalid;
-        } else if (timepar != NO_M_TIMEOUT)
+			/* Done with this mv_stent. Pop it off if we can, else mark it inactive. */
+			if (mv_chain == mv_zintdev)
+				POP_MV_STENT();	 /* pop if top of stack */
+			else
+			{       /* else mark it unused, see iosocket_open for use */
+				mv_zintdev->mv_st_cont.mvs_zintdev.buffer_valid = FALSE;
+				mv_zintdev->mv_st_cont.mvs_zintdev.io_ptr = NULL;
+			}
+			DBGSOCK((stdout, "socconn: mv_stent found - endtime: %d/%d\n", end_time.at_sec, end_time.at_usec));
+		} else
+			DBGSOCK((stdout, "socconn: no mv_stent found !!\n"));
+		real_dsocketptr->mupintr = dsocketptr->mupintr = FALSE;
+		real_sockintr->who_saved = sockintr->who_saved = sockwhich_invalid;
+	} else if (NO_M_TIMEOUT != msec_timeout)
 	{
-		msec_timeout = timeout2msec(timepar);
 		sys_get_curr_time(&cur_time);
 		add_int_to_abs_time(&cur_time, msec_timeout, &end_time);
 	}
@@ -189,10 +186,10 @@ boolean_t iosocket_connect(socket_struct *sockptr, int4 timepar, boolean_t updat
 				remote_ai_ptr->ai_next = NULL;
 				if (-1 == setsockopt(sockptr->sd, SOL_SOCKET, SO_REUSEADDR,
 					&temp_1, SIZEOF(temp_1)))
-        			{
+				{
 					save_errno = errno;
-                			errptr = (char *)STRERROR(save_errno);
-                			errlen = STRLEN(errptr);
+					errptr = (char *)STRERROR(save_errno);
+					errlen = STRLEN(errptr);
 					close(sockptr->sd);	/* Don't leave a dangling socket around */
 					sockptr->sd = FD_INVALID;
 					if (NULL != sockptr->remote.ai_head)
@@ -200,10 +197,10 @@ boolean_t iosocket_connect(socket_struct *sockptr, int4 timepar, boolean_t updat
 						freeaddrinfo(sockptr->remote.ai_head);
 						sockptr->remote.ai_head = NULL;
 					}
-                			rts_error_csa(CSA_ARG(NULL) VARLSTCNT(7) ERR_SETSOCKOPTERR, 5,
+					rts_error_csa(CSA_ARG(NULL) VARLSTCNT(7) ERR_SETSOCKOPTERR, 5,
 						  RTS_ERROR_LITERAL("SO_REUSEADDR"), save_errno, errlen, errptr);
-                			return FALSE;
-        			}
+					return FALSE;
+				}
 #				ifdef TCP_NODELAY
 				temp_1 = sockptr->nodelay ? 1 : 0;
 				if (-1 == setsockopt(sockptr->sd,
@@ -285,7 +282,7 @@ boolean_t iosocket_connect(socket_struct *sockptr, int4 timepar, boolean_t updat
 						need_connect = FALSE;
 						break;
 					case EINTR:
-						if (outofband && 0 != timepar)
+						if (outofband && 0 != msec_timeout)
 						{	/* handle outofband unless zero timeout */
 							save_errno = 0;
 							need_socket = need_connect = FALSE;
@@ -297,7 +294,7 @@ boolean_t iosocket_connect(socket_struct *sockptr, int4 timepar, boolean_t updat
 					case EWOULDBLOCK:
 #					endif
 						need_socket = need_connect = FALSE;
-						if (0 != timepar)
+						if (0 != msec_timeout)
 							need_select = TRUE;
 					/* fall through */
 					case ETIMEDOUT:	/* the other side bound but not listening */
@@ -305,14 +302,17 @@ boolean_t iosocket_connect(socket_struct *sockptr, int4 timepar, boolean_t updat
 #					ifndef VMS
 					case ENOENT:	/* LOCAL socket not there */
 #					endif
-						if (!no_time_left && 0 != timepar && NO_M_TIMEOUT != timepar)
+						if (!no_time_left && (0 != msec_timeout) && (NO_M_TIMEOUT != msec_timeout))
 						{
 							sys_get_curr_time(&cur_time);
 							cur_time = sub_abs_time(&end_time, &cur_time);
-							if (cur_time.at_sec <= 0)
-								no_time_left = TRUE;
+							msec_timeout = (int4)(cur_time.at_sec * MILLISECS_IN_SEC +
+								/* Round up in order to prevent premature timeouts */
+								DIVIDE_ROUND_UP(cur_time.at_usec, MICROSECS_IN_MSEC));
+							if (0 >= msec_timeout)
+								msec_timeout = 0;
 						}
-						if (0 == timepar)
+						if (0 == msec_timeout)
 							no_time_left = TRUE;
 						else if (!no_time_left)
 						{
@@ -335,13 +335,16 @@ boolean_t iosocket_connect(socket_struct *sockptr, int4 timepar, boolean_t updat
 			sockerror = 0;
 			do
 			{ /* unless outofband loop on select if connection continuing */
-				if (NO_M_TIMEOUT == timepar)
+				if (NO_M_TIMEOUT == msec_timeout)
 					sel_time = NULL;
 				else
 				{
 					sys_get_curr_time(&cur_time);
 					cur_time = sub_abs_time(&end_time, &cur_time);
-					if (cur_time.at_sec > 0)
+					msec_timeout = (int4)(cur_time.at_sec * MILLISECS_IN_SEC +
+						/* Round up in order to prevent premature timeouts */
+						DIVIDE_ROUND_UP(cur_time.at_usec, MICROSECS_IN_MSEC));
+					if (0 < msec_timeout)
 						sel_time = (struct timeval *)&cur_time;
 					else
 					{	/* timed out so done */
@@ -462,10 +465,10 @@ boolean_t iosocket_connect(socket_struct *sockptr, int4 timepar, boolean_t updat
 			} else
 				sockptr->state = socket_connect_inprogress;
 			real_sockintr->who_saved = sockintr->who_saved = sockwhich_connect;
-			if (NO_M_TIMEOUT != timepar)
+			if (NO_M_TIMEOUT != msec_timeout)
 			{
 				real_sockintr->end_time = sockintr->end_time = end_time;
-                               	real_sockintr->end_time_valid  = sockintr->end_time_valid = TRUE;
+				real_sockintr->end_time_valid  = sockintr->end_time_valid = TRUE;
 			} else
 				real_sockintr->end_time_valid = sockintr->end_time_valid = FALSE;
 			real_sockintr->newdsocket = sockintr->newdsocket = newdsocket;
@@ -496,12 +499,12 @@ boolean_t iosocket_connect(socket_struct *sockptr, int4 timepar, boolean_t updat
 	sockptr->state = socket_connected;
 	sockptr->first_read = sockptr->first_write = TRUE;
 	/* update dollar_key */
-        len = SIZEOF(ESTABLISHED) - 1;
-        memcpy(&iod->dollar.key[0], ESTABLISHED, len);
-        iod->dollar.key[len++] = '|';
-        memcpy(&iod->dollar.key[len], sockptr->handle, sockptr->handle_len);
-        len += sockptr->handle_len;
-        iod->dollar.key[len++] = '|';
+	len = SIZEOF(ESTABLISHED) - 1;
+	memcpy(&iod->dollar.key[0], ESTABLISHED, len);
+	iod->dollar.key[len++] = '|';
+	memcpy(&iod->dollar.key[len], sockptr->handle, sockptr->handle_len);
+	len += sockptr->handle_len;
+	iod->dollar.key[len++] = '|';
 	/* translate internal address to numeric ip address */
 	assert(FALSE == need_socket);
 	if (NULL != sockptr->remote.ai_head)
@@ -559,7 +562,6 @@ boolean_t iosocket_connect(socket_struct *sockptr, int4 timepar, boolean_t updat
 		}
 		STRNDUP(ipaddr, SA_MAXLEN, sockptr->remote.saddr_ip);
 		strncpy(&iod->dollar.key[len], sockptr->remote.saddr_ip, DD_BUFLEN - 1 - len);
-#	ifndef VMS
 	} else
 	{	/* getsockname does not return info for AF_UNIX connected socket so copy from remote side */
 		local_ai_ptr->ai_socktype = sockptr->remote.ai.ai_socktype;
@@ -567,9 +569,7 @@ boolean_t iosocket_connect(socket_struct *sockptr, int4 timepar, boolean_t updat
 		local_ai_ptr->ai_protocol = sockptr->remote.ai.ai_protocol;
 		SOCKET_ADDR_COPY(sockptr->local, sockptr->remote.sa, sockptr->remote.ai.ai_addrlen);
 		STRNCPY_STR(&iod->dollar.key[len], ((struct sockaddr_un *)(sockptr->remote.sa))->sun_path, DD_BUFLEN - len - 1);
-#	endif
 	}
 	iod->dollar.key[DD_BUFLEN - 1] = '\0';			/* In case we fill the buffer */
-
 	return TRUE;
 }
diff --git a/sr_port/iosocket_iocontrol.c b/sr_port/iosocket_iocontrol.c
index ca96779..61560fd 100755
--- a/sr_port/iosocket_iocontrol.c
+++ b/sr_port/iosocket_iocontrol.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,32 @@
 #include "stringpool.h"
 #include "min_max.h"
 #include "error.h"
+#include "gdsroot.h"
+#include "gdskill.h"
+#include "gdsbt.h"
+#include "gtm_facility.h"
+#include "fileinfo.h"
+#include "gdsfhead.h"
+#include "gdscc.h"
+#include "filestruct.h"
+#include "buddy_list.h"		/* needed for tp.h */
+#include "jnl.h"
+#include "hashtab_int4.h"	/* needed for tp.h */
+#include "tp.h"
+#include "send_msg.h"
+#include "gtmmsg.h"		/* for gtm_putmsg() prototype */
+#include "change_reg.h"
+#include "setterm.h"
+#include "getzposition.h"
+#ifdef DEBUG
+#include "have_crit.h"		/* for the TPNOTACID_CHECK macro */
+#endif
 
 GBLREF spdesc		stringpool;
 GBLREF io_pair		io_curr_device;
+
 LITREF	mval		skiparg;
+LITREF mval		literal_notimeout;
 
 error_def(ERR_EXPR);
 error_def(ERR_INVCTLMNE);
@@ -41,18 +63,22 @@ error_def(ERR_INVCTLMNE);
 #define READ		"READ|"
 #define MAXEVENTLITLEN	(SIZEOF(LISTENING)-1)
 #define MAXZKEYITEMLEN	(MAX_HANDLE_LEN + SA_MAXLITLEN + MAXEVENTLITLEN + 2)	/* 1 pipe and a semicolon */
+#define FORMATTIMESTR "FORMAT"
 
 void	iosocket_iocontrol(mstr *mn, int4 argcnt, va_list args)
 {
 	char		action[MAX_DEVCTL_LENGTH];
 	unsigned short 	depth;
-	int		length, n, timeout;
+	int		length, n;
+	int4		msec_timeout;
 	pid_t		pid;
 	mval		*arg, *handlesvar = NULL;
 #ifdef	GTM_TLS
 	mval		*option, *tlsid, *password, *extraarg;
 #endif
+	DCL_THREADGBL_ACCESS;
 
+	SETUP_THREADGBL_ACCESS;
 	if (0 == mn->len)
 		return;
 	assert(MAX_DEVCTL_LENGTH > mn->len);
@@ -75,21 +101,15 @@ void	iosocket_iocontrol(mstr *mn, int4 argcnt, va_list args)
 		iosocket_listen(io_curr_device.in, depth);
 	} else if (0 == memcmp(action, "WAIT", length))
 	{
-		if (1 > argcnt)
-			timeout = NO_M_TIMEOUT;
+		arg = (0 < argcnt) ? va_arg(args, mval *) : (mval *)&literal_notimeout;
+		if ((NULL != arg) && !M_ARG_SKIPPED(arg) && MV_DEFINED(arg))
+			MV_FORCE_MSTIMEOUT(arg, msec_timeout, FORMATTIMESTR);
 		else
 		{
-			arg = va_arg(args, mval *);
-			if ((NULL != arg) && !M_ARG_SKIPPED(arg) && MV_DEFINED(arg))
-				timeout = MV_FORCE_INTD(arg);
-			else
-			{
-				rts_error_csa(CSA_ARG(NULL) VARLSTCNT(1) ERR_EXPR);
-				return;
-			}
+			rts_error_csa(CSA_ARG(NULL) VARLSTCNT(1) ERR_EXPR);
+			return;
 		}
-		iosocket_wait(io_curr_device.in, timeout);
-#	ifndef VMS
+		iosocket_wait(io_curr_device.in, msec_timeout);
 	} else if (0 == memcmp(action, "PASS", length))
 	{
 		n = argcnt;
@@ -107,13 +127,12 @@ void	iosocket_iocontrol(mstr *mn, int4 argcnt, va_list args)
 		{
 			arg = va_arg(args, mval *);
 			n--;
-			if ((NULL != arg) && !M_ARG_SKIPPED(arg) && MV_DEFINED(arg))
-				timeout = MV_FORCE_INTD(arg);
-			else
-				timeout = NO_M_TIMEOUT;
+			if ((NULL == arg) || M_ARG_SKIPPED(arg) || !MV_DEFINED(arg))
+				arg = (mval *)&literal_notimeout;
 		} else
-			timeout = NO_M_TIMEOUT;
-		iosocket_pass_local(io_curr_device.out, pid, timeout, n, args);
+			arg = (mval *)&literal_notimeout;
+		MV_FORCE_MSTIMEOUT(arg, msec_timeout, FORMATTIMESTR);
+		iosocket_pass_local(io_curr_device.out, pid, msec_timeout, n, args);
 	} else if (0 == memcmp(action, "ACCEPT", length))
 	{
 		n = argcnt;
@@ -138,16 +157,15 @@ void	iosocket_iocontrol(mstr *mn, int4 argcnt, va_list args)
 		{
 			arg = va_arg(args, mval *);
 			n--;
-			if ((NULL != arg) && !M_ARG_SKIPPED(arg) && MV_DEFINED(arg))
-				timeout = MV_FORCE_INTD(arg);
-			else
-				timeout = NO_M_TIMEOUT;
+			if ((NULL == arg) || M_ARG_SKIPPED(arg) || !MV_DEFINED(arg))
+				arg = (mval *)&literal_notimeout;
 		} else
-			timeout = NO_M_TIMEOUT;
-		iosocket_accept_local(io_curr_device.in, handlesvar, pid, timeout, n, args);
+			arg = (mval *)&literal_notimeout;
+		MV_FORCE_MSTIMEOUT(arg, msec_timeout, FORMATTIMESTR);
+		iosocket_accept_local(io_curr_device.in, handlesvar, pid, msec_timeout, n, args);
 #ifdef	GTM_TLS
 	} else if (0 == memcmp(action, "TLS", length))
-	{	/*	WRITE /TLS(option[,[timeout][,tlsid[,password]]]) */
+	{	/*	WRITE /TLS(option[,[msec_timeout][,tlsid[,password]]]) */
 		if (1 <= argcnt)
 		{
 			option = va_arg(args, mval *);
@@ -166,12 +184,11 @@ void	iosocket_iocontrol(mstr *mn, int4 argcnt, va_list args)
 		if (2 <= argcnt)
 		{
 			arg = va_arg(args, mval *);
-			if ((NULL != arg) && !M_ARG_SKIPPED(arg) && MV_DEFINED(arg))
-				timeout = MV_FORCE_INTD(arg);
-			else
-				timeout = NO_M_TIMEOUT;
+			if ((NULL == arg) || M_ARG_SKIPPED(arg) || !MV_DEFINED(arg))
+				arg = (mval *)&literal_notimeout;
 		} else
-			timeout = NO_M_TIMEOUT;
+			arg = (mval *)&literal_notimeout;
+		MV_FORCE_MSTIMEOUT(arg, msec_timeout, FORMATTIMESTR);
 		if (3 <= argcnt)
 		{
 			tlsid = va_arg(args, mval *);
@@ -199,8 +216,7 @@ void	iosocket_iocontrol(mstr *mn, int4 argcnt, va_list args)
 				extraarg = NULL;
 		} else
 			extraarg = NULL;
-		iosocket_tls(option, timeout, tlsid, password, extraarg);
-#	endif
+		iosocket_tls(option, msec_timeout, tlsid, password, extraarg);
 #	endif
 	} else
 		rts_error_csa(CSA_ARG(NULL) VARLSTCNT(1) ERR_INVCTLMNE);
diff --git a/sr_port/iosocket_poolinit.c b/sr_port/iosocket_poolinit.c
index 413f7df..88fae66 100755
--- a/sr_port/iosocket_poolinit.c
+++ b/sr_port/iosocket_poolinit.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	*
@@ -28,6 +29,8 @@
 
 GBLREF  d_socket_struct         *socket_pool;
 
+LITREF	mval		literal_notimeout;
+
 static char socketpoolv[] = "socketpool";
 static char socketpoolp = '\0';
 static char socketpoolm[] = "socket";
@@ -35,29 +38,21 @@ static char socketpoolm[] = "socket";
 void iosocket_poolinit(void)
 {
 	mval 		sockv, sockp, sockm;
-	int   		t;
 	io_log_name	*nl;
 
 	memset(&sockv, 0, SIZEOF(mval));
 	memset(&sockp, 0, SIZEOF(mval));
 	memset(&sockm, 0, SIZEOF(mval));
-
 	sockv.mvtype = MV_STR;
 	sockv.str.len = SIZEOF(socketpoolv) - 1;
 	sockv.str.addr = &socketpoolv[0];
-
 	sockp.mvtype = MV_STR;
 	sockp.str.len = SIZEOF(socketpoolp);
 	sockp.str.addr = &socketpoolp;
-
 	sockm.mvtype = MV_STR;
 	sockm.str.len = SIZEOF(socketpoolm) - 1;
 	sockm.str.addr = &socketpoolm[0];
-
-	t = NO_M_TIMEOUT;
-
-	op_open(&sockv, &sockp, t, &sockm);
-
+	op_open(&sockv, &sockp, (mval *)&literal_notimeout, &sockm);
 	nl = get_log_name(&sockv.str, NO_INSERT);
 	assert(NULL != nl);
 	socket_pool =  (d_socket_struct *)(nl->iod->dev_sp);
diff --git a/sr_port/iosocket_rdone.c b/sr_port/iosocket_rdone.c
index 20b7bd6..b72bff9 100755
--- a/sr_port/iosocket_rdone.c
+++ b/sr_port/iosocket_rdone.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,15 +22,15 @@
 
 GBLREF io_pair	io_curr_device;
 
-int	iosocket_rdone(mint *v, int4 timeout)
+int	iosocket_rdone(mint *v, int4 msec_timeout)
 {
-	mval		tmp;
+	gtm_chset_t	ichset;
 	int		ret;
-	uint4		codepoint;
 	io_desc		*iod;
-	gtm_chset_t	ichset;
+	mval		tmp;
+	uint4		codepoint;
 
-	ret = iosocket_readfl(&tmp, 1, timeout);
+	ret = iosocket_readfl(&tmp, 1, msec_timeout);
 	if (ret)
 	{
 		if (0 < tmp.str.len)
diff --git a/sr_port/iosocket_read.c b/sr_port/iosocket_read.c
index 874f88a..6ae811d 100755
--- a/sr_port/iosocket_read.c
+++ b/sr_port/iosocket_read.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	*
@@ -18,7 +19,7 @@
 #include "gt_timer.h"
 #include "iosocketdef.h"
 
-int	iosocket_read(mval *v, int4 timeout)
+int	iosocket_read(mval *v, int4 msec_timeout)
 {
-	return iosocket_readfl(v, 0, timeout); /* 0 means not fixed length */
+	return iosocket_readfl(v, 0, msec_timeout); /* 0 means not fixed length */
 }
diff --git a/sr_port/iosocket_readfl.c b/sr_port/iosocket_readfl.c
index a746e1a..5a8d2eb 100644
--- a/sr_port/iosocket_readfl.c
+++ b/sr_port/iosocket_readfl.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	*
@@ -21,10 +21,8 @@
 #include "gtm_socket.h"
 #include "gtm_inet.h"
 #include "gtm_string.h"
-#ifdef UNIX
 #include "gtm_fcntl.h"
 #include "eintr_wrappers.h"
-#endif
 #include "gt_timer.h"
 #include "io.h"
 #include "iotimer.h"
@@ -49,10 +47,8 @@ GBLREF	stack_frame      	*frame_pointer;
 GBLREF	unsigned char    	*stackbase, *stacktop, *msp, *stackwarn;
 GBLREF	mv_stent         	*mv_chain;
 GBLREF	io_pair 		io_curr_device;
-#ifdef UNIX
 GBLREF	io_pair			io_std_device;
 GBLREF	bool			prin_in_dev_failure;
-#endif
 GBLREF	bool			out_of_time;
 GBLREF	spdesc 			stringpool;
 GBLREF	volatile int4		outofband;
@@ -74,7 +70,7 @@ error_def(ERR_STACKCRIT);
 error_def(ERR_STACKOFLOW);
 error_def(ERR_TEXT);
 error_def(ERR_ZINTRECURSEIO);
-UNIX_ONLY(error_def(ERR_NOPRINCIO);)
+error_def(ERR_NOPRINCIO);
 
 #ifdef UNICODE_SUPPORTED
 /* Maintenance of $KEY, $DEVICE and $ZB on a badchar error */
@@ -124,9 +120,9 @@ void iosocket_readfl_badchar(mval *vmvalptr, int datalen, int delimlen, unsigned
 #endif
 
 /* VMS uses the UCX interface; should support others that emulate it
- * width == 0 is a flag for non-fixed length read. timeout is in seconds
+ * width == 0 is a flag for non-fixed length read. timeout is in milliseconds
  */
-int	iosocket_readfl(mval *v, int4 width, int4 timeout)
+int	iosocket_readfl(mval *v, int4 width, int4 msec_timeout)
 {
 	int		ret, byteperchar;
 	boolean_t 	timed, vari, more_data, terminator, has_delimiter, requeue_done, do_delim_conv, need_get_chset;
@@ -136,7 +132,6 @@ int	iosocket_readfl(mval *v, int4 width, int4 timeout)
 	io_desc		*iod;
 	d_socket_struct	*dsocketptr;
 	socket_struct	*socketptr;
-	int4		msec_timeout; /* timeout in milliseconds */
 	TID		timer_id;
 	ABS_TIME	cur_time, end_time, time_for_read, zero;
 	char		*errptr;
@@ -161,21 +156,17 @@ int	iosocket_readfl(mval *v, int4 width, int4 timeout)
 	dsocketptr = (d_socket_struct *)(iod->dev_sp);
 	if (0 >= dsocketptr->n_socket)
 	{
-#		ifndef VMS
 		if (iod == io_std_device.in)
 		{
-			result = ionl_readfl(v, width, timeout);
+			result = ionl_readfl(v, width, msec_timeout);
 			REVERT_GTMIO_CH(&iod->pair, ch_set);
 			return result;
 		} else
 		{
-#		endif
 			iod->dollar.za = 9;
 			rts_error_csa(CSA_ARG(NULL) VARLSTCNT(1) ERR_NOSOCKETINDEV);
 			return 0;
-#		ifndef VMS
 		}
-#		endif
 	}
 	if (dsocketptr->n_socket <= dsocketptr->current_socket)
 	{
@@ -276,7 +267,7 @@ int	iosocket_readfl(mval *v, int4 width, int4 timeout)
 		assert(chars_read <= bytes_read);
 		DBGSOCK((stdout, "socrfl: .. mv_stent found - bytes_read: %d  chars_read: %d  max_bufflen: %d"
 			 "  interrupts: %d\n", bytes_read, chars_read, max_bufflen, socketus_interruptus));
-		DBGSOCK((stdout, "socrfl: .. timeout: %d\n", timeout));
+		DBGSOCK((stdout, "socrfl: .. msec_timeout: %d\n", msec_timeout));
 		DBGSOCK_ONLY2(if (sockintr->end_time_valid) DBGSOCK((stdout, "socrfl: .. endtime: %d/%d\n", end_time.at_sec,
 								     end_time.at_usec)));
 		DBGSOCK((stdout, "socrfl: .. buffer address: 0x"lvaddr"  stringpool: 0x"lvaddr"\n",
@@ -339,28 +330,24 @@ int	iosocket_readfl(mval *v, int4 width, int4 timeout)
 	}
 	need_get_chset = FALSE;		/* if we change ichset, make sure converter available */
 	time_for_read.at_sec  = 0;
-	if (0 == timeout)
+	if (0 == msec_timeout)
 		time_for_read.at_usec = 0;
-	else if (socketptr->def_moreread_timeout)
-		time_for_read.at_usec = socketptr->moreread_timeout * 1000;
 	else
-		time_for_read.at_usec = INITIAL_MOREREAD_TIMEOUT * 1000;
+		time_for_read.at_usec = (socketptr->def_moreread_timeout ? socketptr->moreread_timeout : INITIAL_MOREREAD_TIMEOUT)
+					* MICROSECS_IN_MSEC;
 	DBGSOCK((stdout, "socrfl: moreread_timeout = %d def_moreread_timeout= %d time = %d \n",
 		 socketptr->moreread_timeout, socketptr->def_moreread_timeout, time_for_read.at_usec));
 	timer_id = (TID)iosocket_readfl;
 	out_of_time = FALSE;
-	if (NO_M_TIMEOUT == timeout)
+	if (NO_M_TIMEOUT == msec_timeout)
 	{
 		timed = FALSE;
-		msec_timeout = NO_M_TIMEOUT;
 		assert(!sockintr->end_time_valid);
 	} else
 	{
 		timed = TRUE;
-		msec_timeout = timeout2msec(timeout);
-		if (msec_timeout > 0)
+		if (0 < msec_timeout)
 		{	/* There is time to wait */
-#			ifdef UNIX
 			/* Set blocking I/O */
 			FCNTL2(socketptr->sd, F_GETFL, flags);
 			if (flags < 0)
@@ -382,7 +369,6 @@ int	iosocket_readfl(mval *v, int4 width, int4 timeout)
 						LEN_AND_LIT("F_SETFL FOR NON BLOCKING I/O"),
 						save_errno, LEN_AND_STR(errptr));
 			}
-#			endif
 			sys_get_curr_time(&cur_time);
 			if (!sockintr->end_time_valid)
 				add_int_to_abs_time(&cur_time, msec_timeout, &end_time);
@@ -392,13 +378,13 @@ int	iosocket_readfl(mval *v, int4 width, int4 timeout)
 				 */
 			 	end_time = sockintr->end_time;	 /* Restore end_time for timeout */
 				cur_time = sub_abs_time(&end_time, &cur_time);
-				if (0 > cur_time.at_sec)
+				msec_timeout = (int4)(cur_time.at_sec * MILLISECS_IN_SEC +
+						DIVIDE_ROUND_UP(cur_time.at_usec, MICROSECS_IN_MSEC));
+				if (0 >= msec_timeout)
 				{
 					msec_timeout = -1;
 					out_of_time = TRUE;
-				} else
-					msec_timeout = (int4)(cur_time.at_sec * MILLISECS_IN_SEC +
-							      DIVIDE_ROUND_UP(cur_time.at_usec, MICROSECS_IN_MSEC));
+				}
 				DBGSOCK((stdout, "socrfl: Taking timeout end time from read restart data - "
 					 "computed msec_timeout: %d\n", msec_timeout));
 			}
@@ -519,7 +505,7 @@ int	iosocket_readfl(mval *v, int4 width, int4 timeout)
 				{	/* Something bad happened. Feed the error to the lower levels for proper handling */
 					DBGSOCK((stdout, "socrfl: Read error: status: %d  errno: %d\n", charlen, errno));
 					status = charlen;
-                                        DEBUG_ONLY(bufflen = 0);  /* Triggers assert in iosocket_snr if we end up there anyway */
+					DEBUG_ONLY(bufflen = 0);  /* Triggers assert in iosocket_snr if we end up there anyway */
 				}
 			}
 		} else
@@ -545,18 +531,18 @@ int	iosocket_readfl(mval *v, int4 width, int4 timeout)
 			status = 0;			/* Consistent treatment of no more data */
 		} else if (0 < status)
 		{
-			if (timeout && !socketptr->def_moreread_timeout && !one_read_done)
+			if (timed && !socketptr->def_moreread_timeout && !one_read_done)
 			{
 				one_read_done = TRUE;
 				DBGSOCK((stdout, "socrfl: before moreread_timeout = %d timeout = %d \n",
-					 socketptr->moreread_timeout,time_for_read.at_usec));
-				time_for_read.at_usec = DEFAULT_MOREREAD_TIMEOUT * 1000;
-				DBGSOCK((stdout, "socrfl: after timeout = %d \n",time_for_read.at_usec));
+					 socketptr->moreread_timeout, time_for_read.at_usec));
+				time_for_read.at_usec = DEFAULT_MOREREAD_TIMEOUT * MICROSECS_IN_MSEC;
+				DBGSOCK((stdout, "socrfl: after timeout = %d \n", time_for_read.at_usec));
 			}
 			DBGSOCK((stdout, "socrfl: Bytes read: %d\n", status));
 			bytes_read += (int)status;
-			UNIX_ONLY(if (iod == io_std_device.out)
-					  prin_in_dev_failure = FALSE);
+			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.
 			 */
@@ -596,23 +582,23 @@ int	iosocket_readfl(mval *v, int4 width, int4 timeout)
 								DBGSOCK2((stdout, "socrfl: UTF16BE BOM detected\n"));
 							}
 						} else if (0 == memcmp(buffptr, UTF16LE_BOM, UTF16LE_BOM_LEN))
-                                                {
-                                                        if (CHSET_UTF16BE == ichset)
+						{
+							if (CHSET_UTF16BE == ichset)
 							{
 								iod->dollar.za = 9;
-                                                                rts_error_csa(CSA_ARG(NULL) VARLSTCNT(6) ERR_BOMMISMATCH, 4,
-                                                                          chset_names[CHSET_UTF16LE].len,
-                                                                          chset_names[CHSET_UTF16LE].addr,
-                                                                          chset_names[CHSET_UTF16BE].len,
-                                                                          chset_names[CHSET_UTF16BE].addr);
+								rts_error_csa(CSA_ARG(NULL) VARLSTCNT(6) ERR_BOMMISMATCH, 4,
+									chset_names[CHSET_UTF16LE].len,
+									chset_names[CHSET_UTF16LE].addr,
+									chset_names[CHSET_UTF16BE].len,
+									chset_names[CHSET_UTF16BE].addr);
 							} else
 							{
-                                                                iod->ichset = ichset = CHSET_UTF16LE;
+								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"));
-                                                        }
+								DBGSOCK2((stdout, "socrfl: UTF16LE BOM detected\n"));
+							}
 						} else
 						{	/* No BOM specified. If UTF16, default BOM to UTF16BE per Unicode
 							 * standard
@@ -638,7 +624,7 @@ int	iosocket_readfl(mval *v, int4 width, int4 timeout)
 					}
 				} else
 				{	/* Check for UTF8 BOM. If found, just eliminate it. */
-                                        if ((UTF8_BOM_LEN <= bytes_read) && (0 == memcmp(buffptr, UTF8_BOM, UTF8_BOM_LEN)))
+					if ((UTF8_BOM_LEN <= bytes_read) && (0 == memcmp(buffptr, UTF8_BOM, UTF8_BOM_LEN)))
 					{
 						bytes_read -= UTF8_BOM_LEN;        /* Throw way BOM */
 						DBGSOCK2((stdout, "socrfl: UTF8 BOM detected/ignored\n"));
@@ -755,7 +741,7 @@ int	iosocket_readfl(mval *v, int4 width, int4 timeout)
 				if ((c_ptr + mb_len) > c_top)	/* Verify entire char is in buffer */
 					break;
 			}
-                        DBGSOCK((stdout, "socrfl: End char scan - c_ptr: 0x"lvaddr"  c_top: 0x"lvaddr"\n", c_ptr, c_top));
+			DBGSOCK((stdout, "socrfl: End char scan - c_ptr: 0x"lvaddr"  c_top: 0x"lvaddr"\n", c_ptr, c_top));
 			if (c_ptr < c_top) /* Width size READ completed OR partial last char, push back bytes into input buffer */
 			{
 				iosocket_unsnr(socketptr, c_ptr, c_top - c_ptr);
@@ -815,7 +801,6 @@ int	iosocket_readfl(mval *v, int4 width, int4 timeout)
 	{
 		if (0 < msec_timeout)
 		{
-#			ifdef UNIX
 			FCNTL3(socketptr->sd, F_SETFL, flags, fcntl_res);
 			if (fcntl_res < 0)
 			{
@@ -826,7 +811,6 @@ int	iosocket_readfl(mval *v, int4 width, int4 timeout)
 						LEN_AND_LIT("F_SETFL FOR RESTORING SOCKET OPTIONS"),
 						save_errno, LEN_AND_STR(errptr));
 			}
-#			endif
 			if (out_of_time)
 			{
 				ret = FALSE;
@@ -869,9 +853,8 @@ int	iosocket_readfl(mval *v, int4 width, int4 timeout)
 		DBGSOCK((stdout, "socrfl: .. mv_stent: bytes_read: %d  chars_read: %d  max_bufflen: %d  "
 			 "interrupts: %d  buffer_start: 0x"lvaddr"\n",
 			 bytes_read, chars_read, max_bufflen, socketus_interruptus, stringpool.free));
-		DBGSOCK_ONLY(if (sockintr->end_time_valid) DBGSOCK((stdout, "socrfl: .. endtime: %d/%d  timeout: %d  "
-								    "msec_timeout: %d\n", end_time.at_sec, end_time.at_usec,
-								    timeout, msec_timeout)));
+		DBGSOCK_ONLY(if (sockintr->end_time_valid) DBGSOCK((stdout, "socrfl: .. endtime: %d/%d  msec_timeout: %d\n",
+								    end_time.at_sec, end_time.at_usec, msec_timeout)));
 		TRCTBL_ENTRY(SOCKRFL_OUTOFBAND, bytes_read, (INTPTR_T)chars_read, stringpool.free, NULL);	/* BYPASSOK */
 		REVERT_GTMIO_CH(&iod->pair, ch_set);
 		outofband_action(FALSE);
@@ -903,7 +886,6 @@ int	iosocket_readfl(mval *v, int4 width, int4 timeout)
 			v->str.addr = (char *)stringpool.free;
 			stringpool.free += v->str.len;
 		}
-
 	} else
 	{
 		v->str.len = 0;
@@ -922,18 +904,17 @@ int	iosocket_readfl(mval *v, int4 width, int4 timeout)
 		iod->dollar.za = 9;
 		len = SIZEOF(ONE_COMMA) - 1;
 		memcpy(iod->dollar.device, ONE_COMMA, len);
-#ifdef		GTM_TLS
+#		ifdef GTM_TLS
 		if (socketptr->tlsenabled && (0 > real_errno))
 			errptr = (char *)gtm_tls_get_error();
 		else	/* TLS not enabled or system call error */
-#endif
+#		endif
 			errptr = (char *)STRERROR(real_errno);
 		errlen = STRLEN(errptr);
-                devlen = MIN((SIZEOF(iod->dollar.device) - len - 1), errlen);
-                memcpy(&iod->dollar.device[len], errptr, devlen + 1);
-                if (devlen < errlen)
-                        iod->dollar.device[SIZEOF(iod->dollar.device) - 1] = '\0';
-#		ifdef UNIX
+		devlen = MIN((SIZEOF(iod->dollar.device) - len - 1), errlen);
+		memcpy(&iod->dollar.device[len], errptr, devlen + 1);
+		if (devlen < errlen)
+			iod->dollar.device[SIZEOF(iod->dollar.device) - 1] = '\0';
 		if (io_curr_device.in == io_std_device.in)
 		{
 			if (!prin_in_dev_failure)
@@ -944,7 +925,6 @@ int	iosocket_readfl(mval *v, int4 width, int4 timeout)
 				stop_image_no_core();
 			}
 		}
-#		endif
 		if (iod->dollar.zeof || -1 == status || 0 < iod->error_handler.len)
 		{
 			iod->dollar.zeof = TRUE;
diff --git a/sr_port/iosocket_wait.c b/sr_port/iosocket_wait.c
index 82d26e9..b79ab26 100644
--- a/sr_port/iosocket_wait.c
+++ b/sr_port/iosocket_wait.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	*
@@ -69,7 +69,7 @@ error_def(ERR_ZINTRECURSEIO);
 error_def(ERR_STACKCRIT);
 error_def(ERR_STACKOFLOW);
 
-boolean_t iosocket_wait(io_desc *iod, int4 timepar)
+boolean_t iosocket_wait(io_desc *iod, int4 msec_timeout)
 {
 	struct 	timeval  	utimeout, *utimeoutptr;
 	ABS_TIME		cur_time, end_time;
@@ -88,7 +88,7 @@ boolean_t iosocket_wait(io_desc *iod, int4 timepar)
 	socket_struct   	*socketptr;
 	socket_interrupt	*sockintr;
 	char            	*errptr, *charptr;
-	int4            	errlen, ii, jj, msec_timeout;
+	int4            	errlen, ii, jj;
 	int4			nselect, nlisten, nconnected, rlisten, rconnected;
 	int4			oldestconnectedcycle, oldestconnectedindex;
 	int4			oldestlistencycle, oldestlistenindex;
@@ -212,11 +212,10 @@ boolean_t iosocket_wait(io_desc *iod, int4 timepar)
 		}
 		if (nselect)
 		{
-			if (NO_M_TIMEOUT != timepar)
+			if (NO_M_TIMEOUT != msec_timeout)
 			{
-				utimeout.tv_sec = timepar;
-				utimeout.tv_usec = 0;
-				msec_timeout = timeout2msec(timepar);
+				utimeout.tv_sec = msec_timeout / MILLISECS_IN_SEC;
+				utimeout.tv_usec = (msec_timeout % MILLISECS_IN_SEC) * MICROSECS_IN_MSEC;
 				sys_get_curr_time(&cur_time);
 				if (!retry_accept && (!zint_restart || !sockintr->end_time_valid))
 					add_int_to_abs_time(&cur_time, msec_timeout, &end_time);
@@ -226,15 +225,16 @@ boolean_t iosocket_wait(io_desc *iod, int4 timepar)
 					*/
 					DBGSOCK((stdout, "socwait: Taking timeout end time from wait restart data\n"));
 					cur_time = sub_abs_time(&end_time, &cur_time);
-					if (0 > cur_time.at_sec)
+					msec_timeout = (int4)(cur_time.at_sec * MILLISECS_IN_SEC +
+						/* Round up in order to prevent premature timeouts */
+						DIVIDE_ROUND_UP(cur_time.at_usec, MICROSECS_IN_MSEC));
+					if (0 > msec_timeout)
 					{
 						msec_timeout = -1;
 						utimeout.tv_sec = 0;
 						utimeout.tv_usec = 0;
 					} else
 					{
-						msec_timeout = (int4)(cur_time.at_sec * MILLISECS_IN_SEC +
-								      DIVIDE_ROUND_UP(cur_time.at_usec, MICROSECS_IN_MSEC));
 						utimeout.tv_sec = cur_time.at_sec;
 						utimeout.tv_usec = (gtm_tv_usec_t)cur_time.at_usec;
 					}
@@ -246,7 +246,7 @@ boolean_t iosocket_wait(io_desc *iod, int4 timepar)
 #ifdef USE_POLL
 				if ((0 < rconnected) || (0 <rlisten))
 					poll_timeout = 0;
-				else if (NO_M_TIMEOUT == timepar)
+				else if (NO_M_TIMEOUT == msec_timeout)
 					poll_timeout = -1;
 				else
 					poll_timeout = (utimeout.tv_sec * MILLISECS_IN_SEC) +
@@ -258,7 +258,7 @@ boolean_t iosocket_wait(io_desc *iod, int4 timepar)
 				utimeoutptr = &utimeout;
 				if ((0 < rconnected) || (0 <rlisten))
 					utimeout.tv_sec = utimeout.tv_usec = 0;
-				else if (NO_M_TIMEOUT == timepar)
+				else if (NO_M_TIMEOUT == msec_timeout)
 					utimeoutptr = (struct timeval *)NULL;
 				rv = select(select_max_fd + 1, (void *)&select_fdset, (void *)0, (void *)0, utimeoutptr);
 #endif
@@ -274,7 +274,7 @@ boolean_t iosocket_wait(io_desc *iod, int4 timepar)
 							mv_chain->mv_st_cont.mvs_zintdev.io_ptr = iod;
 							mv_chain->mv_st_cont.mvs_zintdev.buffer_valid = FALSE;
 							sockintr->who_saved = sockwhich_wait;
-							if (NO_M_TIMEOUT != timepar)
+							if (NO_M_TIMEOUT != msec_timeout)
 							{
 								sockintr->end_time = end_time;
 								sockintr->end_time_valid = TRUE;
@@ -291,11 +291,14 @@ boolean_t iosocket_wait(io_desc *iod, int4 timepar)
 						assertpro(FALSE);      /* Should *never* return from outofband_action */
 						return FALSE;   /* For the compiler.. */
 					}
-					if (NO_M_TIMEOUT != timepar)
+					if (NO_M_TIMEOUT != msec_timeout)
 					{
 						sys_get_curr_time(&cur_time);
 						cur_time = sub_abs_time(&end_time, &cur_time);
-						if (0 > cur_time.at_sec)
+						msec_timeout = (int4)(cur_time.at_sec * MILLISECS_IN_SEC +
+							/* Round up in order to prevent premature timeouts */
+							DIVIDE_ROUND_UP(cur_time.at_usec, MICROSECS_IN_MSEC));
+						if (0 >msec_timeout)
 						{
 							rv = 0;		/* time out */
 							break;
@@ -309,7 +312,7 @@ boolean_t iosocket_wait(io_desc *iod, int4 timepar)
 			if ((rv == 0) && (0 == rconnected) && (0 == rlisten))
 			{	/* none selected or prior pending event */
 				iod->dollar.key[0] = '\0';
-				if (NO_M_TIMEOUT != timepar)
+				if (NO_M_TIMEOUT != msec_timeout)
 				{
 					dollar_truth = FALSE;
 					REVERT_GTMIO_CH(&iod->pair, ch_set);
@@ -326,7 +329,7 @@ boolean_t iosocket_wait(io_desc *iod, int4 timepar)
 		} else if ((0 == rlisten) && (0 == rconnected))
 		{	/* nothing to select and no pending events */
 			iod->dollar.key[0] = '\0';
-			if (NO_M_TIMEOUT != timepar)
+			if (NO_M_TIMEOUT != msec_timeout)
 			{
 				dollar_truth = FALSE;
 				REVERT_GTMIO_CH(&iod->pair, ch_set);
@@ -402,7 +405,7 @@ boolean_t iosocket_wait(io_desc *iod, int4 timepar)
 		{	/* unexpected nothing to do */
 			assert((0 < oldestlistencycle) || (0 < oldestconnectedcycle));
 			iod->dollar.key[0] = '\0';
-			if (NO_M_TIMEOUT != timepar)
+			if (NO_M_TIMEOUT != msec_timeout)
 			{
 				dollar_truth = FALSE;
 				REVERT_GTMIO_CH(&iod->pair, ch_set);
@@ -437,7 +440,6 @@ boolean_t iosocket_wait(io_desc *iod, int4 timepar)
 			if (NULL != socketptr->remote.saddr_ip)
 			{
 				strncpy(&iod->dollar.key[len], socketptr->remote.saddr_ip, DD_BUFLEN - 1 - len);
-#			ifndef VMS
 			} else
 			{
 				assertpro(socket_local == socketptr->protocol);
@@ -448,13 +450,12 @@ boolean_t iosocket_wait(io_desc *iod, int4 timepar)
 				else
 					charptr = (char *)"";
 				strncpy(&dsocketptr->iod->dollar.key[len], charptr, DD_BUFLEN - len - 1);
-#			endif
 			}
 			iod->dollar.key[DD_BUFLEN - 1] = '\0';
 		}
 		break;
 	}
-	if (NO_M_TIMEOUT != timepar)
+	if (NO_M_TIMEOUT != msec_timeout)
 		dollar_truth = TRUE;
 	REVERT_GTMIO_CH(&iod->pair, ch_set);
 	return TRUE;
@@ -518,9 +519,7 @@ int iosocket_accept(d_socket_struct *dsocketptr, socket_struct *socketptr, boole
 			case ETIMEDOUT:
 			case ECONNRESET:
 			case ENOTCONN:
-#			ifndef VMS
 			case ENOSR:
-#			endif
 				return errno;	/* pending connection gone so retry */
 			default:
 				errptr = (char *)STRERROR(errno);
@@ -604,7 +603,6 @@ int iosocket_accept(d_socket_struct *dsocketptr, socket_struct *socketptr, boole
 	dsocketptr->iod->dollar.key[len++] = '|';
 	if (socket_local != newsocketptr->protocol)
 		strncpy(&dsocketptr->iod->dollar.key[len], newsocketptr->remote.saddr_ip, DD_BUFLEN - 1 - len);
-#	ifndef VMS
 	else
 	{ /* get path from listening socket local side */
 		assert(NULL != socketptr->local.sa);
@@ -613,7 +611,6 @@ int iosocket_accept(d_socket_struct *dsocketptr, socket_struct *socketptr, boole
 		SOCKET_ADDR_COPY(newsocketptr->remote, socketptr->local.sa, SIZEOF(struct sockaddr_un));
 		newsocketptr->remote.ai.ai_addrlen = socketptr->local.ai.ai_addrlen;
 	}
-#	endif
 	dsocketptr->iod->dollar.key[DD_BUFLEN - 1] = '\0';		/* In case we fill the buffer */
 	newsocketptr->remote.ai.ai_family = SOCKET_REMOTE_ADDR(newsocketptr)->sa_family;
 	return 0;
diff --git a/sr_port/jnl.h b/sr_port/jnl.h
index ba3fad3..c54fe26 100644
--- a/sr_port/jnl.h
+++ b/sr_port/jnl.h
@@ -15,12 +15,14 @@
 
 #ifdef DEBUG
 #include <stddef.h>           /* for offsetof macro (see OFFSETOF usage in assert below) */
+#include "wbox_test_init.h"
 #endif
 
 #ifndef JNLSP_H_INCLUDED
 #include "jnlsp.h"
 #endif
 #include "gtmcrypt.h"
+#include "sleep.h"
 
 error_def(ERR_JNLBADLABEL);
 error_def(ERR_JNLENDIANBIG);
@@ -38,14 +40,18 @@ error_def(ERR_JNLENDIANLITTLE);
  * 	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 don't get extracted at all.
+ *	5) Add a line in the big comment block just before "repl_filter_t" is typedefed in repl_filter.h
+ *		to update the "Filter format", "Journal format" and "GT.M version" columns.
+ *	6) Add Vxx_JNL_VER to repl_filter.h and examine usages of Vxx_JNL_VER where xx corresponds to older
+ *		journal version to see if those need to be replaced with the newer version macro.
  * 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.
+ * 	7) Add REPL_FILTER_Vxx enum to repl_filter_t typedef in repl_filter.h
+ * 	8) Add/Edit IF_xTOy macros in repl_filter.h to transform from/to the NEW jnl format version only.
  * 		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.
+ * 	9) Add/Edit prototype and implement functions jnl_xTOy() and jnl_yTOx() in repl_filter.c
+ * 	10) 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.
- * 	8) Periodically determine if the size of the array repl_filter_old2cur is huge and if so trim support of
+ * 	11) Periodically determine if the size of the array repl_filter_old2cur is huge and if so trim support of
  * 		rolling upgrade (using replication internal filters) for older GT.M versions/jnl-formats.
  * 		This would mean bumping the macro JNL_VER_EARLIEST_REPL and examining all arrays that are defined
  * 		using this macro and changing the entries in all those arrays accordingly (e.g. repl_filter_old2cur
@@ -53,8 +59,8 @@ error_def(ERR_JNLENDIANLITTLE);
  * 		which needs to change to say IF_curTO17 if the earliest supported version changes to V17 or so).
  *
  */
-#define JNL_LABEL_TEXT		"GDSJNL26"	/* see above comment paragraph for todos whenever this is changed */
-#define JNL_VER_THIS		26
+#define JNL_LABEL_TEXT		"GDSJNL27"	/* see above comment paragraph for todos whenever this is changed */
+#define JNL_VER_THIS		27
 #define JNL_VER_EARLIEST_REPL	17		/* Replication filter support starts here GDSJNL17 = GT.M V5.1-000.
 						 * (even though it should be V5.0-000, since that is pre-multisite,
 						 * the replication connection with V55000 will error out at handshake
@@ -96,9 +102,7 @@ error_def(ERR_JNLENDIANLITTLE);
  * Also a research in ELWOOD journal file showed that "EB" was one of the few patterns that had the least occurrences */
 #define JNL_REC_SUFFIX_CODE	0xEB
 
-/* 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.
- */
+/* With sync_io, we do journal writes to disk at filesystem block size boundaries. */
 #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
@@ -158,10 +162,13 @@ error_def(ERR_JNLENDIANLITTLE);
 #define	WCSFLU_IN_COMMIT	16	/* Set if caller is t_end or tp_tend. See wcs_flu for explanation of when this is set */
 #define	WCSFLU_MSYNC_DB		32	/* Force a full msync if NO_MSYNC is defined. Currently used only in Unix wcs_flu(). */
 #define	WCSFLU_SPEEDUP_NOBEFORE	64	/* Do not flush dirty db buffers. Just write an epoch record.
-					 * Used to speedup nobefore jnl for Unix. Flag ignored in VMS.
+					 * Used to speedup nobefore jnl.
 					 */
 #define	WCSFLU_CLEAN_DBSYNC    128	/* wcs_flu invoked by wcs_clean_dbsync (as opposed to t_end/tp_tend invocation) */
-
+#define	WCSFLU_FORCE_EPOCH     256	/* skip the optimization that writes epoch only if an epoch is not the most recently
+					 * written record. This is necessary for some callers (e.g. update process writing
+					 * an epoch for the -noresync startup case).
+					 */
 /* options for error_on_jnl_file_lost */
 #define JNL_FILE_LOST_TURN_OFF	0	/* Turn off journaling. */
 #define JNL_FILE_LOST_ERRORS	1	/* Throw an rts_error. */
@@ -194,18 +201,23 @@ error_def(ERR_JNLENDIANLITTLE);
 #define	JNL_WRITE_LOGICAL_RECS(X)	(JNL_ENABLED(X) || REPL_WAS_ENABLED(X))
 
 /* The following macro should be used to invoke the function "jnl_write" for any logical record. This macro
- * checks if journaling is enabled and if so invokes "jnl_write" else it invokes "jnl_write_poolonly" which
+ * checks if journaling is enabled and if so invokes "jnl_write" else it invokes "jnl_pool_write" which
  * writes only to the journal pool.
  */
-#define	JNL_WRITE_APPROPRIATE(CSA, JPC, RECTYPE, JREC, BLKPTR, JFB, JPLCTX)							\
-{															\
+#define	JNL_WRITE_APPROPRIATE(CSA, JPC, RECTYPE, JREC, JFB)								\
+MBSTART {														\
+	GBLREF	boolean_t		is_replicator;									\
+															\
 	assert(JNL_ENABLED(CSA) || REPL_WAS_ENABLED(CSA));								\
 	assert((NULL == JFB) || (RECTYPE == ((jnl_record *)(((jnl_format_buffer *)JFB)->buff))->prefix.jrec_type));	\
 	if (JNL_ENABLED(CSA))												\
-		jnl_write(JPC, RECTYPE, JREC, BLKPTR, JFB, JPLCTX); /* write to jnlbuffer, jnlfile, jnlpool */			\
-	else														\
-		jnl_write_poolonly(JPC, RECTYPE, JREC, JFB, JPLCTX);	/* write to jnlpool only */				\
-}
+		jnl_write(JPC, RECTYPE, JREC, JFB); 	/* write to jnlbuffer */					\
+	if (REPL_ALLOWED(CSA) && is_replicator)										\
+	{														\
+		assert(REPL_ENABLED(CSA) || REPL_WAS_ENABLED(CSA));							\
+		jnl_pool_write(CSA, RECTYPE, JREC, JFB);	/* write to jnlpool */					\
+	}														\
+} MBEND
 
 #define MUEXTRACT_TYPE(A) 	(((A)[0]-'0')*10 + ((A)[1]-'0')) /* A is a character pointer */
 
@@ -258,7 +270,7 @@ MBSTART {						\
  * 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)		\
+#define	ADJUST_GBL_JREC_TIME_JNLPOOL(jgbl, jpl)			\
 {								\
 	if (jgbl.gbl_jrec_time < jpl->prev_jnlseqno_time)	\
 	{							\
@@ -393,6 +405,38 @@ enum repl_state_codes
 	repl_was_open	/* region is currently not replicated, but it was earlier; jnl_file_lost() changes open to was_open */
 };
 
+#define	JNL_PHASE2_COMMIT_ARRAY_SIZE	4096	/* Max # of jnl commits that can still be in phase2.
+						 * Note that even if a phase2 commit is complete, the slot it occupies
+						 * cannot be reused by anyone else until all phase2 commit slots that
+						 * started before this slot are also done.
+						 */
+/* Individual structure describing an active phase2 jnl commit in jnl_buffer shared memory */
+typedef struct
+{
+	trans_num	curr_tn;
+	seq_num		jnl_seqno;
+	seq_num		strm_seqno;
+	uint4		process_id;
+	uint4		start_freeaddr;		/* jb->rsrv_freeaddr at start of this commit */
+	uint4		tot_jrec_len;		/* total length of jnl records in jnl buffer corresponding to this tn */
+	uint4		pini_addr;		/* jpc->pini_addr when this phase2 commit entry was allocated */
+	uint4		jrec_time;		/* time corresponding to this transaction */
+	bool		in_phase2;		/* TRUE if the UPDATE_JBP_RSRV_FREEADDR call for this phas2 commit entry happened
+						 *	through UPDATE_JRS_RSRV_FREEADDR in t_end/tp_tend.
+						 * FALSE if the call happened directly in "jnl_write" (e.g. PFIN/INCTN etc.).
+						 * This distinction helps cleanup orphaned slots (owning pid is killed prematurely).
+						 */
+	bool		replication;		/* TRUE if this transaction bumped the jnl_seqno. Note that even though a
+						 * region might have replication turned on, there are some transactions
+						 * (e.g. inctn operations from reorg, file extensions, 2nd phase of kill etc.)
+						 * which will not bump the jnl_seqno. Those will have this set to FALSE.
+						 * This is needed by "jnl_write_salvage" to know if a JRT_INCTN or JRT_NULL needs
+						 * to be written.
+						 */
+	bool		write_complete;		/* TRUE if this pid is done writing jnl records to jnlbuff */
+	bool		filler_8byte_align[1];
+} jbuf_phase2_in_prog_t;
+
 typedef struct
 {
  	trans_num		eov_tn;		/* curr_tn is saved as eov_tn by jnl_write_epoch. Used by recover/rollback */
@@ -408,14 +452,21 @@ typedef struct
 	boolean_t		before_images;	/* If TRUE, before-image processing is enabled */
 						/* end not volatile QUAD */
 	uintszofptr_t		buff_off;	/* relative offset to filesystem-block-size aligned buffer start */
-	volatile int4		free;		/* relative index of first byte to write in buffer */
+	volatile int4		free,		/* relative index of first byte to write in buffer */
+				rsrv_free;	/* relative index corresponding to jb->rsrv_freeaddr */
 	volatile uint4		freeaddr,	/* virtual on-disk address which will correspond to free, when it is written */
+				rsrv_freeaddr,	/* freeaddr when all in-progress phase2 jnl commits are complete.
+						 * rsrv_freeaddr >= freeaddr at all times.
+						 */
+				next_align_addr,/* rsrv_freeaddr BEFORE which next JRT_ALIGN record needs to be written */
 				end_of_data,	/* Synched offset updated by jnl_write_epoch. Used by recover/rollback */
 				filesize;	/* highest virtual address available in the file (units in disk-blocks)
 						 * file size in bytes limited to 4GB by autoswitchlimit, so 'filesize' <= 8MB
 						 * so filesize cannot overflow the four bytes of a uint4
 						 */
-						/* end mainline QUAD */
+	uint4			phase2_commit_index1;
+	uint4			phase2_commit_index2;
+	jbuf_phase2_in_prog_t	phase2_commit_array[JNL_PHASE2_COMMIT_ARRAY_SIZE];
 	volatile int4		blocked;
 	volatile uint4	 	fsync_dskaddr;  /* dskaddr upto which fsync is done */
 	volatile int4		dsk;		/* relative index of 1st byte to write to disk;
@@ -430,20 +481,18 @@ typedef struct
 		unsigned short	length;
 		int4		dev_specific;
 	}			iosb;
-	/* alignsize is removed and log2_of_alignsize introduced */
-	uint4         		log2_of_alignsize;      /* Ceiling of log2(alignsize) */
+	uint4         		alignsize;      	/* current alignsize (max value possible is 2Gb, not 4Gb) */
 	jnl_tm_t		eov_timestamp;		/* jgbl.gbl_jrec_time saved by jnl_write_epoch. Used by recover/rollback */
 	uint4			cycle;			/* shared copy of the number of the current journal file generation */
 	volatile int4		qiocnt,			/* Number of qio's issued */
 				bytcnt,			/* Number of bytes written */
 				errcnt,			/* Number of errors during writing */
 				reccnt[JRT_RECTYPES];	/* Number of records written per opcode */
-	int			filler_align[37 - JRT_RECTYPES];	/* So buff below starts on even (QW) keel */
-	/* Note the above filler will fail if JRT_RECTYPES grows beyond 37 elements and give compiler warning in VMS
-	 * if JRT_RECTYPES equals 37. In that case, change the start num to the next odd number above MAX(37,JRT_RECTYPES).
+	int			filler_align[42 - JRT_RECTYPES];	/* So buff below starts on even (QW) keel */
+	/* Note the above filler will fail if JRT_RECTYPES grows beyond 42 elements
+	 * In that case, change the start num to the next even number.
 	 */
 	volatile jnl_tm_t	prev_jrec_time;		/* to ensure that time never decreases across successive jnl records */
-	volatile int4		free_update_pid;	/* pid that is updating jb->free and jb->freeaddr */
 	volatile uint4		next_epoch_time;	/* Time when next epoch is to be written (in epoch-seconds) */
 	volatile boolean_t	need_db_fsync;          /* need an fsync of the db file */
 	volatile int4		io_in_prog;		/* VMS only: write in progress indicator (NOTE: must manipulate
@@ -451,45 +500,59 @@ typedef struct
 	uint4			enospc_errcnt;		/* number of times jb->errcnt was last incremented due to ENOSPC error
 							 * when writing to this journal file */
 	uint4			max_jrec_len;		/* copy of max_jrec_len from journal file header */
-	uint4			fs_block_size;		/* underlying journal file system block size;
-							 * primarily used in Unix, 512 in VMS */
+	uint4			fs_block_size;		/* underlying journal file system block size */
 	volatile uint4		post_epoch_freeaddr;	/* virtual on-disk address after last epoch */
 	boolean_t		last_eof_written;	/* No more records may be written to the file due to autoswitch */
 	uint4			end_of_data_at_open;	/* Offset of EOF record when jnl file is first opened in shm */
+	uint4			re_read_dskaddr;	/* If non-zero, "jnl_qio_start" will read a filesystem-block of data
+							 * corresponding to jbp->dskaddr before initiating any new writes
+							 * to the journal file.
+							 */
 	/* CACHELINE_PAD macros provide spacing between the following latches so that they do
 	   not interfere with each other which can happen if they fall in the same data cacheline
 	   of a processor.
 	*/
 	CACHELINE_PAD(SIZEOF(global_latch_t), 0)	/* start next latch at a different cacheline than previous fields */
 	global_latch_t		io_in_prog_latch;	/* UNIX only: write in progress indicator */
-	CACHELINE_PAD(SIZEOF(global_latch_t), 1)	/* pad enough space so next latch falls in different cacheline */
+	CACHELINE_PAD(SIZEOF(global_latch_t), 1)	/* start next latch at a different cacheline than previous fields */
 	global_latch_t		fsync_in_prog_latch;	/* fsync in progress indicator */
-        CACHELINE_PAD(SIZEOF(global_latch_t), 2)	/* pad enough space so next non-filler byte falls in different cacheline */
+        CACHELINE_PAD(SIZEOF(global_latch_t), 2)	/* start next latch at a different cacheline than previous fields */
+	global_latch_t		phase2_commit_latch;	/* Used by "jnl_phase2_cleanup" to update "phase2_commit_index1" */
+	CACHELINE_PAD(SIZEOF(global_latch_t), 3)	/* pad enough space so next non-filler byte falls in different cacheline */
 	/**********************************************************************************************/
 	/* Important: must keep header structure quadword (8 byte)  aligned for buffers used in QIO's */
 	/**********************************************************************************************/
 	unsigned char		buff[1];		/* Actually buff[size] */
 } jnl_buffer;
 
-#define	FIX_NONZERO_FREE_UPDATE_PID(csa, jbp)										\
-{															\
-	assert(csa->now_crit);	/* hold crit before manipulating freeaddr/free */					\
-	assert(jbp->free_update_pid);											\
-	UNIX_ONLY(assert(!is_proc_alive(jbp->free_update_pid, 0));)							\
-	VMS_ONLY(assert(FALSE);) /* secshr_db_clnup should have cleaned up this field even in case of STOP/ID */	\
-	if ((jbp->freeaddr % jbp->size) != jbp->free)									\
-	{	/* Previous process in jnl_write got killed after incrementing freeaddr but before incrementing		\
-		 * free. Recalculate jbp->free based on current value of jbp->freeaddr. */				\
-		jbp->free = jbp->freeaddr % jbp->size;									\
-		jbp->free_update_pid = 0;										\
-	}														\
-	DBG_CHECK_JNL_BUFF_FREEADDR(jbp);										\
+/* Sets jbp->freeaddr & jbp->free. They need to be kept in sync at all times */
+#define	SET_JBP_FREEADDR(JBP, FREEADDR)										\
+{														\
+	DEBUG_ONLY(uint4 jbp_freeaddr;)										\
+	DEBUG_ONLY(uint4 jbp_rsrv_freeaddr;)									\
+														\
+	assert(JBP->phase2_commit_latch.u.parts.latch_pid == process_id);					\
+	DEBUG_ONLY(jbp_freeaddr = JBP->freeaddr;)								\
+	assert(FREEADDR >= jbp_freeaddr);									\
+	DEBUG_ONLY(jbp_rsrv_freeaddr = JBP->rsrv_freeaddr;)							\
+	assert(FREEADDR <= jbp_rsrv_freeaddr);									\
+	JBP->freeaddr = FREEADDR;										\
+	/* Write memory barrier here to enforce the fact that freeaddr *must* be seen to be updated before	\
+	 * free is updated. It is less important if free is stale so we do not require a 2nd barrier for that	\
+	 * and will let the lock release (crit lock required since clustering not currently supported) do the	\
+	 * 2nd memory barrier for us. This barrier takes care of this process's responsibility to broadcast	\
+	 * cache changes. It is up to readers to also specify a read memory barrier if necessary to receive	\
+	 * this broadcast.											\
+	 */													\
+	SHM_WRITE_MEMORY_BARRIER;										\
+	JBP->free = (FREEADDR) % JBP->size;									\
+	DBG_CHECK_JNL_BUFF_FREEADDR(JBP);									\
 }
 
-#define	DBG_CHECK_JNL_BUFF_FREEADDR(jbp)							\
+#define	DBG_CHECK_JNL_BUFF_FREEADDR(JBP)							\
 {												\
-	assert((jbp->freeaddr % jbp->size) == jbp->free);					\
-	assert((jbp->freeaddr >= jbp->dskaddr)							\
+	assert((JBP->freeaddr % JBP->size) == JBP->free);					\
+	assert((JBP->freeaddr >= JBP->dskaddr)							\
 		|| (gtm_white_box_test_case_enabled						\
 			&& (WBTEST_JNL_FILE_LOST_DSKADDR == gtm_white_box_test_case_number)));	\
 }
@@ -519,15 +582,18 @@ typedef struct jnl_private_control_struct
 	fd_type			channel,		/* output channel, aka fd in UNIX */
 				old_channel;		/* VMS only - for dealing with deferred deassign */
 	gd_id			fileid;			/* currently initialized and used only by source-server */
-	vms_lock_sb		*jnllsb;		/* VMS only */
 	uint4			pini_addr,		/* virtual on-disk address for JRT_PINI record, if journaling */
 				new_freeaddr;
-	int4			temp_free;		/* M Temp copy of free relative index until full write done */
-	double			filler_q0;		/* reset QUAD end mainline */
-	int4			new_dsk;		/* A VMS only */
-	uint4			new_dskaddr;		/* A VMS only */
+	uint4			phase2_freeaddr;	/* Used by "jnl_write_reserve" in phase1 to denote freeaddr
+							 * that takes into account the cumulative length of journal records
+							 * already reserved till now in phase1.
+							 * Used by JB_FREEADDR_APPROPRIATE macro in phase2 to indicate the
+							 * freeaddr corresponding to the journal record about to be written
+							 * by this process.
+							 */
+	uint4			phase2_free;		/* jb->free     to use in "jnl_write_phase2" */
+	boolean_t		in_jnl_phase2_salvage;	/* in "jnl_phase2_salvage" */
 	int4			status;			/* A for error reporting */
-	volatile boolean_t	dsk_update_inprog;	/* A VMS only */
 	volatile boolean_t	qio_active;		/* jnl buffer write in progress in THIS process (recursion indicator) */
 	boolean_t		fd_mismatch;		/* TRUE when jpc->channel does not point to the active journal */
 	volatile boolean_t	sync_io;		/* TRUE if the process is using O_SYNC/O_DSYNC for this jnl (UNIX) */
@@ -536,6 +602,7 @@ typedef struct jnl_private_control_struct
 	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 */
+	trans_num		curr_tn;		/* db tn used by callees of "jnl_write_phase2" */
 } jnl_private_control;
 
 typedef enum
@@ -572,6 +639,7 @@ typedef struct
 {
 	sgmnt_addrs		*fence_list;
 	int			level;
+	boolean_t		replication;
 	token_num		token;
 	seq_num			strm_seqno;	/* valid only in case of replication. uninitialized in case of ZTP */
 } jnl_fence_control;
@@ -654,7 +722,6 @@ typedef struct
 	block_id		encryption_hash_cutoff;
 	trans_num		encryption_hash2_start_tn;
 	char			encr_filler[80];
-	/* The below two arrays are unused in VMS but defined there to keep the layout similar between Unix & VMS */
 	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 */
@@ -846,11 +913,25 @@ typedef struct	/* variable length */
 	char			blk_contents[1];	/* Actually blk_contents[bsiz] */
 } struct_jrec_blk;
 
+/* Note: A JRT_ALIGN is the ONLY journal record which does not have the full "jrec_prefix" prefix. This is because
+ * we need it to be as small as 16-bytes in size (See "jnl_phase2_salvage" for a discussion on WHY). Hence the below
+ * special definition which takes in a minimal set of fields from jrec_prefix to keep the smallest size (including
+ * the 4-byte suffix) at 16 bytes. The "time" member is kept at the same offset as other jnl records. This lets us
+ * use jnlrec->prefix.time to access the time even for JRT_ALIGN records. But the "checksum" member is at a
+ * different offset since it is at offset 12 bytes in other records which is not possible for JRT_ALIGN given it
+ * needs to be 16-bytes in size including a 4-byte suffix. A design choice was to move the checksum to offset 4 bytes
+ * in all the other records but that meant changes to various stuff (like replication filters to transform from the new
+ * format to old format etc.) and was not considered worth the effort. Instead we will need to ensure all code that
+ * needs to access the checksum field uses "prefix.checksum" only if it is sure the input record type is not JRT_ALIGN.
+ * If the caller code is not sure, it needs to use the GET_JREC_CHECKSUM macro.
+ */
 typedef struct	/* variable length */
 {
-	jrec_prefix		prefix;
-	jnl_string		align_str;
-	/* Note: Actual string (potentially 0-length too) follows the align_string and then jrec_suffix */
+	uint4			jrec_type : 8;		/* Offset:0 :: Actually, enum jnl_record_type */
+	uint4			forwptr : 24;		/* Offset:1 :: Offset to beginning of next record */
+	uint4			checksum;		/* Offset:4 :: Generated from journal record */
+	jnl_tm_t		time;			/* Offset:8 :: 4-byte time stamp */
+	/* Note: Actual string (potentially 0-length too) follows "forwptr" and then "jrec_suffix" */
 } struct_jrec_align;
 
 /* Please change the "GBLDEF struct_jrec_tcom" initialization, if below is changed */
@@ -1011,8 +1092,8 @@ typedef union
 #define FIXED_ZTWORM_RECLEN	OFFSETOF(struct_jrec_ztworm, ztworm_str)
 #define FIXED_LGTRIG_RECLEN	OFFSETOF(struct_jrec_lgtrig, lgtrig_str)
 #define FIXED_UPD_RECLEN	OFFSETOF(struct_jrec_upd, mumps_node)
-#define MIN_ALIGN_RECLEN	(OFFSETOF(struct_jrec_align, align_str.text[0]) + JREC_SUFFIX_SIZE)
-#define FIXED_ALIGN_RECLEN	OFFSETOF(struct_jrec_align, align_str.text[0])
+#define FIXED_ALIGN_RECLEN	SIZEOF(struct_jrec_align)
+#define MIN_ALIGN_RECLEN	(FIXED_ALIGN_RECLEN + JREC_SUFFIX_SIZE)
 #define FIXED_BLK_RECLEN 	OFFSETOF(struct_jrec_blk, blk_contents[0])
 #define FIXED_PBLK_RECLEN 	OFFSETOF(struct_jrec_blk, blk_contents[0])
 #define FIXED_AIMG_RECLEN 	OFFSETOF(struct_jrec_blk, blk_contents[0])
@@ -1021,8 +1102,8 @@ typedef union
 
 #define JREC_PREFIX_SIZE	SIZEOF(jrec_prefix)
 #define JREC_SUFFIX_SIZE	SIZEOF(jrec_suffix)
-#define MIN_JNLREC_SIZE		(JREC_PREFIX_SIZE + JREC_SUFFIX_SIZE)
-#define JREC_PREFIX_UPTO_LEN_SIZE	(offsetof(jrec_prefix, pini_addr))
+#define MIN_JNLREC_SIZE		(FIXED_ALIGN_RECLEN + JREC_SUFFIX_SIZE)	/* An ALIGN record is the smallest possible record */
+#define JREC_PREFIX_UPTO_LEN_SIZE	(OFFSETOF(jrec_prefix, pini_addr))
 
 /* JNL_FILE_TAIL_PRESERVE macro indicates maximum number of bytes to ensure allocated at the end of the journal file
  * 	 to store the journal records that will be written whenever the journal file gets closed.
@@ -1092,7 +1173,6 @@ typedef struct
 	token_num			mur_jrec_strm_seqno;	/* This is the strm_seqno of the current record that backward
 								 * recovery/rollback is playing in its forward phase.
 								 */
-	VMS_ONLY(seq_num		max_resync_seqno;)	/* for update process and rollback fetchresync */
 	unsigned short			filler_short;
 	unsigned short			mur_jrec_participants;
 	jnl_tm_t			gbl_jrec_time;
@@ -1144,12 +1224,242 @@ typedef struct
 	boolean_t			mur_update;		/* a copy of mur_options.update to be accessible to GTM runtime */
 } jnl_gbls_t;
 
-/* Include this here as it is needed for the interface to jnl_write() and jnl_write_poolonly() */
+#define	IN_PHASE2_JNL_COMMIT(CSA)	(CSA->t_commit_crit)
+
+/* If a transaction's total journal record size exceeds the journal buffer size (minus one filesystem-block-size
+ * just to be safe) we might have to flush a part of the transaction's journal records before writing the remaining
+ * part. For this reason, we write the entire transaction's journal records while holding crit as otherwise it gets
+ * tricky to handle process kills after it has written a part of the journal records but not all.
+ */
+#define	IS_PHASE2_JNL_COMMIT_NEEDED_IN_CRIT(JBP, JREC_LEN)	((JREC_LEN + (JBP)->fs_block_size) > (JBP)->size)
+
+#define	JB_FREEADDR_APPROPRIATE(IN_PHASE2, JPC, JB)	(IN_PHASE2 ? JPC->phase2_freeaddr : JB->rsrv_freeaddr)
+#define	JB_FREE_APPROPRIATE(IN_PHASE2, JPC, JB)		(IN_PHASE2 ? JPC->phase2_free : JB->rsrv_free)
+#define	JB_CURR_TN_APPROPRIATE(IN_PHASE2, JPC, CSA)	(IN_PHASE2 ? JPC->curr_tn : CSA->ti->curr_tn)
+
+#define	ASSERT_JNL_PHASE2_COMMIT_INDEX_IS_VALID(IDX, MAX_INDEX)	assert((0 <= IDX) && (MAX_INDEX > IDX))
+
+#define	INCR_PHASE2_COMMIT_INDEX(IDX, PHASE2_COMMIT_ARRAY_SIZE)	\
+MBSTART {							\
+	if (PHASE2_COMMIT_ARRAY_SIZE == ++IDX)			\
+		IDX = 0;					\
+} MBEND								\
+
+#define	DECR_PHASE2_COMMIT_INDEX(IDX, PHASE2_COMMIT_ARRAY_SIZE)	\
+MBSTART {							\
+	if (0 == IDX--)						\
+		IDX = PHASE2_COMMIT_ARRAY_SIZE - 1;		\
+} MBEND								\
+
+/* Sets jbp->rsrv_freeaddr & jbp->rsrv_free. They need to be kept in sync at all times */
+#define	SET_JBP_RSRV_FREEADDR(JBP, RSRV_FREEADDR)	\
+{							\
+	assert(JBP->freeaddr <= RSRV_FREEADDR);		\
+	JBP->rsrv_freeaddr = RSRV_FREEADDR;		\
+	JBP->rsrv_free = (RSRV_FREEADDR) % JBP->size;	\
+}
+
+#define SET_JPC_PHASE2_FREEADDR(JPC, JBP, FREEADDR)	\
+{							\
+	JPC->phase2_freeaddr = FREEADDR;		\
+	JPC->phase2_free = (FREEADDR) % JBP->size;	\
+}
+
+#define	UPDATE_JBP_RSRV_FREEADDR(CSA, JPC, JBP, JPL, RLEN, INDEX, IN_PHASE2, JNL_SEQNO, STRM_SEQNO, REPLICATION)	\
+MBSTART {														\
+	uint4			rsrv_freeaddr;										\
+	int			nextIndex, endIndex;									\
+	jbuf_phase2_in_prog_t	*phs2cmt;										\
+															\
+	GBLREF	uint4		process_id;										\
+	GBLREF	uint4		dollar_tlevel;										\
+															\
+	assert(CSA->now_crit);												\
+	/* Allocate a slot. But before that, check if the slot array is full.						\
+	 * endIndex + 1 == first_index implies full.	Note: INCR_PHASE2_COMMIT_INDEX macro does the + 1		\
+	 * endIndex     == first_index implies empty.									\
+	 */														\
+	endIndex = JBP->phase2_commit_index2;										\
+	nextIndex = endIndex;												\
+	INCR_PHASE2_COMMIT_INDEX(nextIndex, JNL_PHASE2_COMMIT_ARRAY_SIZE);						\
+	while (nextIndex == JBP->phase2_commit_index1)									\
+	{	/* Slot array is full. Wait for phase2 to finish. */							\
+		jnl_phase2_cleanup(CSA, JBP);										\
+		if (nextIndex != JBP->phase2_commit_index1)								\
+			break;												\
+		BG_TRACE_PRO_ANY(CSA, jnlbuff_phs2cmt_array_full);							\
+		SLEEP_USEC(1, FALSE);											\
+	}														\
+	ASSERT_JNL_PHASE2_COMMIT_INDEX_IS_VALID(endIndex, JNL_PHASE2_COMMIT_ARRAY_SIZE);				\
+	phs2cmt = &JBP->phase2_commit_array[endIndex];									\
+	phs2cmt->process_id = process_id;										\
+	assert(JPC->curr_tn == CSA->ti->curr_tn);									\
+	phs2cmt->curr_tn = JPC->curr_tn;										\
+	assert(!REPLICATION || JNL_SEQNO);										\
+	phs2cmt->jnl_seqno = JNL_SEQNO;											\
+	assert(!REPLICATION												\
+		|| !((repl_inst_hdr_ptr_t)((sm_uc_ptr_t)JPL + ((jnlpool_ctl_ptr_t)JPL)->filehdr_off))->is_supplementary	\
+		|| STRM_SEQNO);												\
+	phs2cmt->strm_seqno = STRM_SEQNO;										\
+	rsrv_freeaddr = JBP->rsrv_freeaddr;										\
+	phs2cmt->start_freeaddr = rsrv_freeaddr;									\
+	phs2cmt->tot_jrec_len = RLEN;											\
+	/* The below assert ensures "jnl_phase2_salvage" can definitely replace this transaction's journal		\
+	 * records with a combination of JRT_NULL/JRT_INCTN/JRT_ALIGN records. See comment there for why		\
+	 * this is necessary and how this assert achieves that.								\
+	 * In case of the forward phase of MUPIP JOURNAL RECOVER or ROLLBACK, replication would be turned off		\
+	 * but it is possible it plays forward a pre-existing NULL record. Account for that below.			\
+	 */														\
+	assert(!IN_PHASE2												\
+		|| (!REPLICATION && ((RLEN == INCTN_RECLEN) || (RLEN >= (INCTN_RECLEN + MIN_ALIGN_RECLEN))))		\
+		|| ((REPLICATION || jgbl.forw_phase_recovery)								\
+				&& ((RLEN == NULL_RECLEN) || (RLEN >= (NULL_RECLEN + MIN_ALIGN_RECLEN)))));		\
+	phs2cmt->pini_addr = JPC->pini_addr;										\
+	phs2cmt->jrec_time = jgbl.gbl_jrec_time;									\
+	phs2cmt->in_phase2 = IN_PHASE2;											\
+	phs2cmt->replication = REPLICATION;										\
+	phs2cmt->write_complete = FALSE;										\
+	rsrv_freeaddr += RLEN;												\
+	assert(rsrv_freeaddr <= JBP->next_align_addr);									\
+	assert(rsrv_freeaddr > JBP->freeaddr);										\
+	INDEX = endIndex;												\
+	SET_JBP_RSRV_FREEADDR(JBP, rsrv_freeaddr);									\
+	SHM_WRITE_MEMORY_BARRIER; /* see corresponding SHM_READ_MEMORY_BARRIER in "jnl_phase2_cleanup" */		\
+	JBP->phase2_commit_index2 = nextIndex;										\
+} MBEND
+
+#define	JNL_PHASE2_WRITE_COMPLETE(CSA, JBP, INDEX, NEW_FREEADDR)				\
+MBSTART {											\
+	jbuf_phase2_in_prog_t	*phs2cmt;							\
+												\
+	GBLREF	uint4		process_id;							\
+												\
+	phs2cmt = &JBP->phase2_commit_array[INDEX];						\
+	assert(phs2cmt->process_id == process_id);						\
+	assert(FALSE == phs2cmt->write_complete);						\
+	assert(((phs2cmt->start_freeaddr + phs2cmt->tot_jrec_len) == NEW_FREEADDR)		\
+		|| (gtm_white_box_test_case_enabled						\
+			&& (WBTEST_JNL_FILE_LOST_DSKADDR == gtm_white_box_test_case_number)));	\
+	phs2cmt->write_complete = TRUE;								\
+	/* Invoke "jnl_phase2_cleanup" sparingly as it calls "grab_latch". So we do it twice.	\
+	 * Once at half-way mark and once when a wrap occurs.					\
+	 */											\
+	if (!INDEX || ((JNL_PHASE2_COMMIT_ARRAY_SIZE / 2) == INDEX))				\
+		jnl_phase2_cleanup(CSA, JBP);							\
+} MBEND
+
+#define	JNL_PHASE2_CLEANUP_IF_POSSIBLE(CSA, JBP)						\
+MBSTART {											\
+	if (JBP->phase2_commit_index1 != JBP->phase2_commit_index2)				\
+		jnl_phase2_cleanup(CSA, JBP);	/* There is something to be cleaned up */	\
+} MBEND
+
+#define	NEED_TO_FINISH_JNL_PHASE2(JRS)	((NULL != JRS) && JRS->tot_jrec_len)
+
+#define	FINISH_JNL_PHASE2_IN_JNLBUFF(CSA, JRS)										\
+MBSTART {														\
+	assert(NEED_TO_FINISH_JNL_PHASE2(JRS));										\
+	jnl_write_phase2(CSA, JRS);			/* Mark jnl record writing into jnlbuffer as complete */	\
+	assert(!NEED_TO_FINISH_JNL_PHASE2(JRS));									\
+} MBEND
+
+#define	FINISH_JNL_PHASE2_IN_JNLPOOL_IF_NEEDED(REPLICATION, JNLPOOL)							\
+MBSTART {														\
+	if (REPLICATION && JNLPOOL.jrs.tot_jrec_len)									\
+	{														\
+		JPL_PHASE2_WRITE_COMPLETE(JNLPOOL);	/* Mark jnl record writing into jnlpool   as complete */	\
+		assert(0 == JNLPOOL.jrs.tot_jrec_len);									\
+	}														\
+} MBEND
+
+#define	NONTP_FINISH_JNL_PHASE2_IN_JNLBUFF_AND_JNLPOOL(CSA, JRS, REPLICATION, JNLPOOL)					\
+MBSTART {														\
+	FINISH_JNL_PHASE2_IN_JNLBUFF(CSA, JRS);				/* Step CMT16 (if BG), Step CMT06a (if MM) */	\
+	FINISH_JNL_PHASE2_IN_JNLPOOL_IF_NEEDED(REPLICATION, JNLPOOL);	/* Step CMT17 (if BG), Step CMT06b (if MM) */	\
+} MBEND
+
+#define	TP_FINISH_JNL_PHASE2_IN_JNLBUFF_AND_JNLPOOL(JNL_FENCE_CTL, REPLICATION, JNLPOOL)				\
+MBSTART {														\
+	sgmnt_addrs	*csa;												\
+	sgm_info	*si;												\
+															\
+	for (csa = JNL_FENCE_CTL.fence_list;  JNL_FENCE_LIST_END != csa;  csa = csa->next_fenced)			\
+	{														\
+		si = csa->sgm_info_ptr;											\
+		assert(si->update_trans);										\
+		jrs = si->jbuf_rsrv_ptr;										\
+		assert(JNL_ALLOWED(csa));										\
+		if (NEED_TO_FINISH_JNL_PHASE2(jrs))									\
+			FINISH_JNL_PHASE2_IN_JNLBUFF(csa, jrs);		/* Step CMT16 (if BG), Step CMT06a (if MM) */	\
+	}														\
+	FINISH_JNL_PHASE2_IN_JNLPOOL_IF_NEEDED(replication, jnlpool);	/* Step CMT17 (if BG), Step CMT06b (if MM) */	\
+} MBEND
+
+/* BEGIN : Structures used by "jnl_write_reserve" */
+typedef struct
+{
+	enum jnl_record_type	rectype;	/* equivalent to jrec_prefix.jrec_type */
+	uint4			reclen;		/* equivalent to jrec_prefix.forwptr */
+	void			*param1;
+} jrec_rsrv_elem_t;
+
 typedef struct
 {
-	uint4			write;			/* Incrementally changing version of jnlpool_ctl_struct::write */
-	uint4			write_total;		/* Total bytes written */
-} jnlpool_write_ctx_t;
+	uint4			alloclen;	/* # of "jrec_rsrv_elem_t" structures allocated in "jrs_array" array */
+	uint4			usedlen;	/* # of "jrec_rsrv_elem_t" structures currently used in "jrs_array" array */
+	uint4			tot_jrec_len;	/* Total length (in bytes) of jnl records that will be used up by this array */
+	uint4			phase2_commit_index;	/* index into corresponding jb->phase2_commit_array entry */
+	jrec_rsrv_elem_t	*jrs_array;	/* Pointer to array of "jrec_rsrv_elem_t" structures currently allocated */
+} jbuf_rsrv_struct_t;
+
+#define	ALLOC_JBUF_RSRV_STRUCT(JRS, CSA)								\
+MBSTART {												\
+	JRS = (jbuf_rsrv_struct_t *)malloc(SIZEOF(jbuf_rsrv_struct_t));					\
+	(JRS)->alloclen = 0;			/* initialize "alloclen" */				\
+	(JRS)->jrs_array = NULL;									\
+	REINIT_JBUF_RSRV_STRUCT(JRS, CSA, CSA->jnl, NULL);/* initialize "usedlen" and "tot_jrec_len" */	\
+} MBEND
+
+#define	REINIT_JBUF_RSRV_STRUCT(JRS, CSA, JPC, JBP)				\
+MBSTART {									\
+	uint4	freeaddr;							\
+										\
+	(JRS)->usedlen = 0;							\
+	(JRS)->tot_jrec_len = 0;						\
+	(JPC)->curr_tn = CSA->ti->curr_tn;					\
+	if (NULL != JBP)							\
+	{									\
+		freeaddr = ((jnl_buffer_ptr_t)JBP)->rsrv_freeaddr;		\
+		JPC->phase2_freeaddr = freeaddr;				\
+	}									\
+} MBEND
+
+#define	UPDATE_JRS_RSRV_FREEADDR(CSA, JPC, JBP, JRS, JPL, JNL_FENCE_CTL, REPLICATION)			\
+MBSTART {												\
+	SET_JNLBUFF_PREV_JREC_TIME(JBP, jgbl.gbl_jrec_time, DO_GBL_JREC_TIME_CHECK_TRUE);		\
+		/* Keep jb->prev_jrec_time up to date */						\
+	assert(JNL_ENABLED(CSA));									\
+	assert(JBP->rsrv_freeaddr >= JBP->freeaddr);							\
+	assert(0 < JRS->tot_jrec_len);									\
+	UPDATE_JBP_RSRV_FREEADDR(CSA, JPC, JBP, JPL, JRS->tot_jrec_len, JRS->phase2_commit_index, TRUE,	\
+					JNL_FENCE_CTL.token, JNL_FENCE_CTL.strm_seqno, REPLICATION);	\
+} MBEND
+
+#define	FREE_JBUF_RSRV_STRUCT(JRS)		\
+MBSTART {					\
+	assert(NULL != JRS);			\
+	if (NULL != JRS)			\
+	{					\
+		if (NULL != JRS->jrs_array)	\
+			free(JRS->jrs_array);	\
+		free(JRS);			\
+		JRS = NULL;			\
+	}					\
+} MBEND
+
+#define	INIT_NUM_JREC_RSRV_ELEMS	4
+
+/* END  : Structures used by "jnl_write_reserve" */
 
 #define JNL_SHARE_SIZE(X)	(JNL_ALLOWED(X) ? 							\
 				(ROUND_UP(JNL_NAME_EXP_SIZE + SIZEOF(jnl_buffer), OS_PAGE_SIZE)		\
@@ -1157,13 +1467,16 @@ typedef struct
 					OS_PAGE_SIZE) + OS_PAGE_SIZE) : 0)
 
 /* pass address of jnl_buffer to get address of expanded jnl file name */
-#define JNL_GDID_PVT(CSA)        ((CSA)->jnl->fileid)
+#define JNL_GDID_PVT(CSA)	((CSA)->jnl->fileid)
 #define JNL_GDID_PTR(CSA)	((gd_id_ptr_t)(&((CSA)->nl->jnl_file.u)))
 
 /* 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 ">=".
+ * Use JNL_FILE_SWITCHED when only JPC is available. Use JNL_FILE_SWITCHED2 when JPC and JB (i.e. JPC->jnl_buff)
+ * are both available. The latter saves a dereference in t_end/tp_tend (every drop helps while inside crit).
  */
-#define JNL_FILE_SWITCHED(JPC) 	((JPC)->cycle != (JPC)->jnl_buff->cycle)
+#define JNL_FILE_SWITCHED(JPC) 		((JPC)->cycle != (JPC)->jnl_buff->cycle)
+#define JNL_FILE_SWITCHED2(JPC, JB) 	((JPC)->cycle != (JB)->cycle)
 
 /* The jrec_len of 0 causes a switch. */
 #define SWITCH_JNL_FILE(JPC)	jnl_file_extend(JPC, 0)
@@ -1179,6 +1492,26 @@ typedef struct
 #define GET_STRM_SEQNO(j)	(((jnl_record *)(j))->jrec_null.strm_seqno)
 #define GET_REPL_JNL_SEQNO(j)	(IS_REPLICATED(((jrec_prefix *)j)->jrec_type) ? GET_JNL_SEQNO(j) : 0)
 
+/* Note: JRT_ALIGN record does not have a "prefix.tn" or "prefix.pini_addr" field (all other jnl records have it)
+ * and has "prefix.checksum" at a different offset. Hence the below GET_JREC* and SET_JREC* macros. IF the caller knows
+ * for sure that "RECTYPE" is not a JRT_ALIGN, then it can directly use "prefix.tn" etc. ELSE it has to use the below macros.
+ */
+#define GET_JREC_TN(JNLREC, RECTYPE)	((JRT_ALIGN != RECTYPE)									\
+						? (DBG_ASSERT(TN_INVALID != JNLREC->prefix.tn) JNLREC->prefix.tn) : TN_INVALID)
+/* A JRT_ALIGN record does not have a "pini_addr" field so treat it as pointing to the first PINI record in the journal file
+ * for the purposes of a journal extract etc.
+ */
+#define GET_JREC_PINI_ADDR(JNLREC, RECTYPE) ((JRT_ALIGN != RECTYPE) ? JNLREC->prefix.pini_addr : JNL_FILE_FIRST_RECORD)
+#define GET_JREC_CHECKSUM(JNLREC, RECTYPE) ((JRT_ALIGN != RECTYPE)							\
+						? JNLREC->prefix.checksum : ((struct_jrec_align *)JNLREC)->checksum)
+#define	SET_JREC_CHECKSUM(JNLREC, RECTYPE, CHECKSUM)			\
+MBSTART {								\
+	if (JRT_ALIGN != RECTYPE)					\
+		JNLREC->prefix.checksum = CHECKSUM;			\
+	else								\
+		((struct_jrec_align *)JNLREC)->checksum = CHECKSUM;	\
+} MBEND
+
 /* For MUPIP JOURNAL -ROLLBACK, getting the strm_reg_seqno from the file header is not as straightforward
  * as accessing csd->strm_reg_seqno[idx]. This is because it increments this field in mur_output_record even
  * before we reach t_end/tp_tend. That is done for convenience of the implementation. But this assumes that the
@@ -1206,7 +1539,6 @@ typedef struct
 		 * and that is not possible in case of a FORWARD rollback. Assert that.			\
 		 */											\
 		assert(!jgbl.mur_options_forward);							\
-		VMS_ONLY(assert(FALSE);)								\
 		strm_seqno = jgbl.mur_jrec_strm_seqno;							\
 		strm_num = GET_STRM_INDEX(strm_seqno);							\
 		strm_seqno = GET_STRM_SEQ60(strm_seqno);						\
@@ -1218,10 +1550,6 @@ typedef struct
 	}												\
 }
 
-/* Given a journal record, GET_TN returns the tn field
- */
-#define GET_TN(j)		(((*jrec_prefix)(j))->prefix.tn)
-
 /* In t_end(), we need to write the after-image if DSE or mupip recover/rollback is playing it.
  * But to write it out, we should have it already built before bg_update().
  * Hence, we pre-build the block here itself before invoking t_end().
@@ -1333,7 +1661,7 @@ 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.
  */
-#  define	JNL_MAX_SET_KILL_RECLEN(CSD)	(uint4)ROUND_UP2((FIXED_UPD_RECLEN + JREC_SUFFIX_SIZE)			\
+#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)
 
@@ -1413,10 +1741,10 @@ typedef struct
 #define JNLBUFFUPDAPNDX_SIZE	(SIZEOF(JNLBUFFUPDAPNDX) - 4 + (2 * 6))
 
 /* Yields a portable value for the minimum journal buffer size */
-#define JNL_BUFF_PORT_MIN(CSD)		(UNIX_ONLY(JNL_BUFFER_MIN) VMS_ONLY(CSD->blk_size / DISK_BLOCK_SIZE + 1))
+#define JNL_BUFF_PORT_MIN(CSD)		(JNL_BUFFER_MIN)
 
 /* Defines the increment value for journal buffer size's rounding-up */
-#define JNL_BUFF_ROUND_UP_STEP(CSD)	(UNIX_ONLY(MIN(MAX_IO_BLOCK_SIZE, CSD->blk_size)) VMS_ONLY(CSD->blk_size) / DISK_BLOCK_SIZE)
+#define JNL_BUFF_ROUND_UP_STEP(CSD)	(MIN(MAX_IO_BLOCK_SIZE, CSD->blk_size) / DISK_BLOCK_SIZE)
 
 /* Rounds up the passed journal buffer value and assigns it to the specified variable */
 #define ROUND_UP_JNL_BUFF_SIZE(DEST, VALUE, CSD)							\
@@ -1442,8 +1770,8 @@ typedef struct
 	DEST = jnl_buffer_adj_value;									\
 }
 
-# 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
+#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
 
 /* 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
@@ -1463,42 +1791,43 @@ MBSTART {									\
  * 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);						\
-	}									\
+#define	DO_JNL_FLUSH_IF_POSSIBLE(REG, CSA, FLUSH_DONE, DSKADDR, FREEADDR, RSRV_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->rsrv_freeaddr)							\
+	{											\
+		was_crit = CSA->now_crit;							\
+		if (!was_crit)									\
+			grab_crit(REG);								\
+		DSKADDR = jbp->dskaddr;								\
+		FREEADDR = jbp->freeaddr;							\
+		RSRV_FREEADDR = jbp->rsrv_freeaddr;						\
+		if (JNL_ENABLED(CSA->hdr) && (DSKADDR != RSRV_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 */
@@ -1516,13 +1845,18 @@ 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);
-void	jnl_write_logical(sgmnt_addrs *csa, jnl_format_buffer *jfb, uint4 com_csum, jnlpool_write_ctx_t *jplctx);
-void	jnl_write_ztp_logical(sgmnt_addrs *csa, jnl_format_buffer *jfb, uint4 com_csum, seq_num jnl_seqno,
-				jnlpool_write_ctx_t *jplctx);
+void	jnl_write_logical(sgmnt_addrs *csa, jnl_format_buffer *jfb, uint4 com_csum);
+void	jnl_write_ztp_logical(sgmnt_addrs *csa, jnl_format_buffer *jfb, uint4 com_csum, seq_num jnl_seqno);
 void	jnl_write_eof_rec(sgmnt_addrs *csa, struct_jrec_eof *eof_record);
 void	jnl_write_trunc_rec(sgmnt_addrs *csa, uint4 orig_total_blks, uint4 orig_free_blocks, uint4 total_blks_after_trunc);
-void	jnl_write_poolonly(jnl_private_control *jpc, enum jnl_record_type rectype, jnl_record *jnl_rec, jnl_format_buffer *jfb,
-				jnlpool_write_ctx_t *jplctx);
+void	jnl_write_reserve(sgmnt_addrs *csa, jbuf_rsrv_struct_t *nontp_jbuf_rsrv,
+					enum jnl_record_type rectype, uint4 reclen, void *param1);
+void	jnl_write_phase2(sgmnt_addrs *csa, jbuf_rsrv_struct_t *jbuf_rsrv_ptr);
+void	jnl_phase2_cleanup(sgmnt_addrs *csa, jnl_buffer_ptr_t jbp);
+void	jnl_phase2_salvage(sgmnt_addrs *csa, jnl_buffer_ptr_t jbp, jbuf_phase2_in_prog_t *deadCmt);
+void	jnl_pool_write(sgmnt_addrs *csa, enum jnl_record_type rectype, jnl_record *jnl_rec, jnl_format_buffer *jfb);
+void	jnl_write_align_rec(sgmnt_addrs *csa, uint4 align_filler_len, jnl_tm_t time);
+void	jnl_write_multi_align_rec(sgmnt_addrs *csa, uint4 align_filler_len, jnl_tm_t time);
 
 jnl_format_buffer	*jnl_format(jnl_action_code opcode, gv_key *key, mval *val, uint4 nodeflags);
 
diff --git a/sr_port/jnl2ext.c b/sr_port/jnl2ext.c
old mode 100755
new mode 100644
index 6d5ad0c..89035e6
--- a/sr_port/jnl2ext.c
+++ b/sr_port/jnl2ext.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	*
@@ -45,12 +46,10 @@
 									\
 	DELIMIT_CURR;							\
 	lcl_strm_seqno = STRM_SEQNO;					\
-	UNIX_ONLY(lcl_strm_num = GET_STRM_INDEX(lcl_strm_seqno);)	\
-	VMS_ONLY(lcl_strm_num = 0;)					\
+	lcl_strm_num = GET_STRM_INDEX(lcl_strm_seqno);			\
 	CURR = (char *)i2ascl((uchar_ptr_t)CURR, lcl_strm_num);		\
 	DELIMIT_CURR;							\
-	UNIX_ONLY(lcl_strm_seqno = GET_STRM_SEQ60(lcl_strm_seqno);)	\
-	VMS_ONLY(lcl_strm_seqno = 0;)					\
+	lcl_strm_seqno = GET_STRM_SEQ60(lcl_strm_seqno);		\
 	CURR = (char *)i2ascl((uchar_ptr_t)CURR, lcl_strm_seqno);	\
 }
 
@@ -77,7 +76,7 @@ char	*jnl2extcvt(jnl_record *rec, int4 jnl_len, char **ext_buff, int *extract_bu
 
 	extbuf = *ext_buff;
 	exttop = extbuf + *extract_bufsiz;
-	for ( ; jnl_len > JREC_PREFIX_UPTO_LEN_SIZE && jnl_len >= (rec_len = rec->prefix.forwptr) && rec_len > MIN_JNLREC_SIZE; )
+	for ( ; jnl_len > JREC_PREFIX_UPTO_LEN_SIZE && jnl_len >= (rec_len = rec->prefix.forwptr) && (MIN_JNLREC_SIZE <= rec_len); )
 	{
 		if (MAX_ONE_JREC_EXTRACT_BUFSIZ > (exttop - extbuf))
 		{	/* Remaining space not enough to hold the worst-case journal extract of ONE jnl record. Expand linearly */
@@ -101,12 +100,6 @@ char	*jnl2extcvt(jnl_record *rec, int4 jnl_len, char **ext_buff, int *extract_bu
 	return extbuf;
 }
 
-/* This was earlier declared as a local variable, but was moved up, because the HPIA compiler for some reason seems to
- * optimize things, and thus not update the buffer correctly. Problem shows up only in optimized builds. Moving it to
- * global status fixed the issue
- */
-GBLDEF char key_buff[SIZEOF(gv_key) + MAX_KEY_SZ + 7];
-
 char	*jnl2ext(char *jnl_buff, char *ext_buff)
 {
   	char		*curr, *val_ptr, rectype;
@@ -115,6 +108,7 @@ char	*jnl2ext(char *jnl_buff, char *ext_buff)
 	gv_key		*key;
 	jnl_string	*keystr, *ztwormstr;
 	int		val_extr_len, val_len, rec_len, tid_len;
+	char		key_buff[SIZEOF(gv_key) + MAX_KEY_SZ + 7];
 
 	rec = (jnl_record *)jnl_buff;
 	rectype = rec->prefix.jrec_type;
diff --git a/sr_port/jnl_file_close.c b/sr_port/jnl_file_close.c
index 48da9d9..4257114 100644
--- a/sr_port/jnl_file_close.c
+++ b/sr_port/jnl_file_close.c
@@ -44,10 +44,7 @@
 #include "eintr_wrappers.h"
 #include "anticipatory_freeze.h"
 #include "error.h"
-
-#ifdef UNIX
 #include "wcs_clean_dbsync.h"
-#endif
 
 GBLREF 	jnl_gbls_t		jgbl;
 GBLREF	boolean_t		in_jnl_file_autoswitch;
@@ -116,14 +113,16 @@ void	jnl_file_close(gd_region *reg, boolean_t clean, boolean_t in_jnl_switch)
 			 * However, if we are already in the tail due to a prior disruption, skip the
 			 * pini/pfin and just write the eof.
 			 */
-			if (jb->freeaddr != jb->end_of_data_at_open)
+			assert(jb->rsrv_freeaddr >= jb->freeaddr);
+			if (jb->rsrv_freeaddr != jb->end_of_data_at_open)
 			{
 				DEBUG_ONLY(jpc->status = SS_NORMAL);
-				in_tail = ((off_t)jb->freeaddr > ((off_t)DISK_BLOCK_SIZE * jb->filesize) - JNL_FILE_TAIL_PRESERVE);
+				in_tail = ((off_t)jb->rsrv_freeaddr
+							> ((off_t)DISK_BLOCK_SIZE * jb->filesize) - JNL_FILE_TAIL_PRESERVE);
 				if ((0 == jpc->pini_addr) && !in_tail)
 				{
-					jnl_put_jrt_pini(csa);
-					jnl_put_jrt_pfin(csa);
+					jnl_write_pini(csa);
+					jnl_write_pfin(csa);
 				}
 				jnl_write_eof_rec(csa, &eof_record);
 			} else
@@ -152,9 +151,16 @@ void	jnl_file_close(gd_region *reg, boolean_t clean, boolean_t in_jnl_switch)
 				ERR_TEXT, 2, RTS_ERROR_TEXT("Error with journal flush during jnl_file_close"),
 				jpc->status);
 		}
-		assert(jb->dskaddr == jb->freeaddr);
-		UNIX_ONLY(jnl_fsync(reg, jb->dskaddr);)
-		UNIX_ONLY(assert(jb->freeaddr == jb->fsync_dskaddr);)
+#		ifdef DEBUG
+		if (!gtm_white_box_test_case_enabled || (WBTEST_JNL_FILE_LOST_DSKADDR != gtm_white_box_test_case_number))
+		{
+			assert(jb->rsrv_freeaddr == jb->freeaddr);
+			assert(jb->dskaddr == jb->freeaddr);
+		}
+#		endif
+		jnl_fsync(reg, jb->dskaddr);
+		assert((jb->freeaddr == jb->fsync_dskaddr)
+			|| (gtm_white_box_test_case_enabled && (WBTEST_JNL_FILE_LOST_DSKADDR == gtm_white_box_test_case_number)));
 		read_write_size = ROUND_UP2(REAL_JNL_HDR_LEN, jnl_fs_block_size);
 		assert((unsigned char *)header + read_write_size <= ARRAYTOP(hdr_base));
 		DO_FILE_READ(jpc->channel, 0, header, read_write_size, jpc->status, jpc->status2);
@@ -188,18 +194,16 @@ void	jnl_file_close(gd_region *reg, boolean_t clean, boolean_t in_jnl_switch)
 				assert(FALSE);
 				rts_error_csa(CSA_ARG(csa) VARLSTCNT(5) ERR_JNLWRERR, 2, JNL_LEN_STR(csd), jpc->status);
 			}
-			UNIX_ONLY(
-				GTM_JNL_FSYNC(csa, jpc->channel, rc);
-				if (-1 == rc)
-				{
-					save_errno = errno;
-					send_msg_csa(CSA_ARG(csa) VARLSTCNT(9) ERR_JNLFSYNCERR, 2, JNL_LEN_STR(csd),
-						ERR_TEXT, 2, RTS_ERROR_TEXT("Error with fsync during jnl_file_close"), save_errno);
-					assert(FALSE);
-					rts_error_csa(CSA_ARG(csa) VARLSTCNT(9) ERR_JNLFSYNCERR, 2, JNL_LEN_STR(csd),
-						ERR_TEXT, 2, RTS_ERROR_TEXT("Error with fsync during jnl_file_close"), save_errno);
-				}
-			)
+			GTM_JNL_FSYNC(csa, jpc->channel, rc);
+			if (-1 == rc)
+			{
+				save_errno = errno;
+				send_msg_csa(CSA_ARG(csa) VARLSTCNT(9) ERR_JNLFSYNCERR, 2, JNL_LEN_STR(csd),
+					ERR_TEXT, 2, RTS_ERROR_TEXT("Error with fsync during jnl_file_close"), save_errno);
+				assert(FALSE);
+				rts_error_csa(CSA_ARG(csa) VARLSTCNT(9) ERR_JNLFSYNCERR, 2, JNL_LEN_STR(csd),
+					ERR_TEXT, 2, RTS_ERROR_TEXT("Error with fsync during jnl_file_close"), save_errno);
+			}
 		}
 		/* jnl_file_id should be nullified only after the jnl file header has been written to disk.
 		 * Nullifying the jnl_file_id signals that the jnl file has been switched. The replication source server
diff --git a/sr_port/jnl_file_lost.c b/sr_port/jnl_file_lost.c
old mode 100755
new mode 100644
index d10126e..8511aa4
--- a/sr_port/jnl_file_lost.c
+++ b/sr_port/jnl_file_lost.c
@@ -57,7 +57,7 @@ uint4 jnl_file_lost(jnl_private_control *jpc, uint4 jnl_stat)
 		/* no break */
 	}
 	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
diff --git a/sr_port/jnl_file_open_common.c b/sr_port/jnl_file_open_common.c
old mode 100755
new mode 100644
index e3d1656..187e122
--- a/sr_port/jnl_file_open_common.c
+++ b/sr_port/jnl_file_open_common.c
@@ -85,7 +85,7 @@ uint4 jnl_file_open_common(gd_region *reg, off_jnl_t os_file_size, char *buff)
 	unsigned char		*eof_rec_buffer;
 	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;
+	uint4			end_of_data, jnl_fs_block_size, read_write_size, read_size;
 	int4			status;
 	gtm_uint64_t		header_virtual_size;
 
@@ -127,15 +127,16 @@ uint4 jnl_file_open_common(gd_region *reg, off_jnl_t os_file_size, char *buff)
 		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.
+	end_of_data = header->end_of_data;
+	adjust = end_of_data & (jnl_fs_block_size - 1);
+	/* Read the journal JRT_EOF at end_of_data offset.
 	 * Make sure the buffer being read to is big enough and that as part of the read,
 	 * we never touch touch the journal file header territory.
 	 */
 	read_size = ROUND_UP2((EOF_RECLEN + adjust), jnl_fs_block_size);
 	assert(eof_rec_buffer + read_size <= ARRAYTOP(eof_rec));
-	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);
+	assert(end_of_data - adjust >= JNL_HDR_LEN);
+	DO_FILE_READ(jpc->channel, end_of_data - adjust, eof_rec_buffer, read_size, jpc->status, jpc->status2);
 	if (SS_NORMAL != jpc->status)
 		return ERR_JNLRDERR; /* Has one !AD parameter, the journal file, which jnl_send_oper() provides */
 	if (header->prev_recov_end_of_data)
@@ -147,7 +148,7 @@ uint4 jnl_file_open_common(gd_region *reg, off_jnl_t os_file_size, char *buff)
 	if (!is_gdid_file_identical(&FILE_ID(reg), (char *)header->data_file_name, header->data_file_name_length))
 	{
 		rts_error_csa(CSA_ARG(csa) VARLSTCNT(7) ERR_JNLOPNERR, 4, JNL_LEN_STR(csd), DB_LEN_STR(reg), ERR_FILEIDMATCH);
-		assert(FALSE);	/* we dont expect the rts_error in the line above to return */
+		assert(FALSE);	/* we don't expect the rts_error in the line above to return */
 		return ERR_JNLOPNERR;
 	}
 	memcpy(&eof_record, (unsigned char *)eof_rec_buffer + adjust, EOF_RECLEN);
@@ -210,7 +211,8 @@ uint4 jnl_file_open_common(gd_region *reg, off_jnl_t os_file_size, char *buff)
 											+ JNL_SHARE_SIZE(csd)));
 	assert((sm_uc_ptr_t)jb == ((sm_uc_ptr_t)csa->nl + NODE_LOCAL_SPACE(csd) + JNL_NAME_EXP_SIZE));
 	jb->last_eof_written = header->last_eof_written;
-	jb->freeaddr = jb->dskaddr = jb->fsync_dskaddr = header->end_of_data;
+	jb->freeaddr = jb->dskaddr = jb->fsync_dskaddr = end_of_data;
+	SET_JBP_RSRV_FREEADDR(jb, end_of_data);	/* sets both jb->rsrv_freeaddr & jb->rsrv_free */
 	jb->post_epoch_freeaddr = jb->end_of_data_at_open = jb->freeaddr;
 	jb->fs_block_size = jnl_fs_block_size;
 	/* The following is to make sure that the data in jnl_buffer is aligned with the data in the
@@ -218,7 +220,7 @@ uint4 jnl_file_open_common(gd_region *reg, off_jnl_t os_file_size, char *buff)
 	 * alignment with respect to jb->size implies alignment with jnl_fs_block_size.
 	 */
 	assert(0 == (jb->size % jnl_fs_block_size));
-	jb->free = jb->dsk = header->end_of_data % jb->size;
+	jb->free = jb->dsk = end_of_data % jb->size;
 	SET_LATCH_GLOBAL(&jb->fsync_in_prog_latch, LOCK_AVAILABLE);
 	SET_LATCH_GLOBAL(&jb->io_in_prog_latch, LOCK_AVAILABLE);
 	assert(0 == (jnl_fs_block_size % DISK_BLOCK_SIZE));
@@ -235,8 +237,17 @@ uint4 jnl_file_open_common(gd_region *reg, off_jnl_t os_file_size, char *buff)
 	jb->before_images = header->before_images;
 	jb->epoch_tn = eof_record.prefix.tn;
 	csd->jnl_checksum = header->checksum;
-	assert(4 == SIZEOF(header->alignsize));	/* so we can use the 32bit version of ceil_log2 */
-	jb->log2_of_alignsize = ceil_log2_32bit(header->alignsize);
+	assert(4 == SIZEOF(header->alignsize));
+	assert(((gtm_uint64_t)JNL_MAX_ALIGNSIZE * 512) < (gtm_uint64_t)MAXUINT4); /* ensure 4-byte "alignsize" will not overflow */
+	jb->alignsize = header->alignsize;
+	/* Use "gtm_uint64_t" typecast below to avoid 4G overflow issues with the ROUND_UP2 */
+	jb->next_align_addr = (uint4)(ROUND_UP2(((gtm_uint64_t)jb->freeaddr + MIN_ALIGN_RECLEN), header->alignsize)
+													- MIN_ALIGN_RECLEN);
+	SET_LATCH_GLOBAL(&jb->phase2_commit_latch, LOCK_AVAILABLE);
+	jb->phase2_commit_index1 = jb->phase2_commit_index2 = 0;
+	/* The below 2 lines are relied upon by "mutex_salvage" */
+	jb->phase2_commit_array[JNL_PHASE2_COMMIT_ARRAY_SIZE - 1].start_freeaddr = jb->end_of_data_at_open;
+	jb->phase2_commit_array[JNL_PHASE2_COMMIT_ARRAY_SIZE - 1].tot_jrec_len = 0;
 	assert(header->autoswitchlimit == csd->autoswitchlimit);
 	assert(header->jnl_alq == csd->jnl_alq);
 	assert(header->jnl_deq == csd->jnl_deq);
diff --git a/sr_port/jnl_flush.c b/sr_port/jnl_flush.c
old mode 100755
new mode 100644
index aa25090..2749ff1
--- a/sr_port/jnl_flush.c
+++ b/sr_port/jnl_flush.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,9 +21,7 @@
 #include "iosp.h"
 #include "jnl.h"
 #include "wbox_test_init.h"
-#ifdef UNIX
 #include "gtm_threadgbl.h"
-#endif
 
 GBLREF uint4 process_id;
 
@@ -33,11 +32,11 @@ uint4	jnl_flush(gd_region *reg)
 	jnl_private_control	*jpc;
 	jnl_buffer_ptr_t	jb;
 	uint4			status;
-#ifdef UNIX
+#	ifdef DEBUG
 	DCL_THREADGBL_ACCESS;
 
 	SETUP_THREADGBL_ACCESS;
-#endif
+#	endif
 	if (!reg || !reg->open)
 		return SS_NORMAL;
 	csa = &FILE_INFO(reg)->s_addrs;
@@ -47,17 +46,24 @@ uint4	jnl_flush(gd_region *reg)
 		return SS_NORMAL;
 	jb = jpc->jnl_buff;
 	jb->blocked = process_id;
-	if (jb->freeaddr != jb->dskaddr)
+	assert(jb->rsrv_freeaddr >= jb->freeaddr);
+	assert((jb->rsrv_freeaddr >= jb->dskaddr)
+		|| (gtm_white_box_test_case_enabled && (WBTEST_JNL_FILE_LOST_DSKADDR == gtm_white_box_test_case_number)));
+	if (jb->rsrv_freeaddr != jb->dskaddr)
 	{
-		status = jnl_write_attempt(jpc, jb->freeaddr);
+		status = jnl_write_attempt(jpc, jb->rsrv_freeaddr);
 		if (SS_NORMAL == status)
 		{
+			assert((jb->rsrv_freeaddr == jb->freeaddr)
+				|| (gtm_white_box_test_case_enabled
+					&& (WBTEST_JNL_FILE_LOST_DSKADDR == gtm_white_box_test_case_number)));
 			cnl = csa->nl;
 			INCR_GVSTATS_COUNTER(csa, cnl, n_jnl_flush, 1);
 		}
 	} else
 		status = SS_NORMAL;
-	assert(((SS_NORMAL == status) && (jb->dskaddr == jb->freeaddr)) UNIX_ONLY(|| TREF(gtm_test_fake_enospc))
+	assert(((SS_NORMAL == status) && (jb->dskaddr == jb->rsrv_freeaddr) && (jb->freeaddr == jb->rsrv_freeaddr))
+		|| TREF(gtm_test_fake_enospc)
 		|| (gtm_white_box_test_case_enabled && (WBTEST_JNL_FILE_LOST_DSKADDR == gtm_white_box_test_case_number)));
 	jb->blocked = 0;
 	return status;
diff --git a/sr_port/jnl_format.c b/sr_port/jnl_format.c
index 47704aa..1348457 100644
--- a/sr_port/jnl_format.c
+++ b/sr_port/jnl_format.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	*
@@ -42,7 +42,7 @@
  * update_num values for the ZTWORMHOLE and its corresponding SET or KILL record. So we should decrement the
  * update_num before returning from this function in the hope that the next time jnl_format is called for the SET
  * or KILL, update_num will be incremented thereby using the exact same value that was used for the ZTWORMHOLE record.
- * An exception is journal recovery forward phase in which case, we dont do any increments of jgbl.tp_ztp_jnl_upd_num
+ * An exception is journal recovery forward phase in which case, we don't do any increments of jgbl.tp_ztp_jnl_upd_num
  * so we should do no decrements either.
  */
 #define	ZTWORM_DECR_UPD_NUM	{ if (!jgbl.forw_phase_recovery) jgbl.tp_ztp_jnl_upd_num--; }
@@ -71,6 +71,9 @@ GBLREF	unsigned int		t_tries;
 GBLREF	int4			gtm_trigger_depth;
 GBLREF	int4			tstart_trigger_depth;
 #endif
+#ifdef DEBUG
+GBLREF	boolean_t		is_replicator;
+#endif
 
 /* Do NOT define first dimension of jnl_opcode array to be JA_MAX_TYPES. Instead let compiler fill in the value according
  * to the number of rows actually specified in the array. This way, if ever a new entry is added in jnl.h to jnl_action_code
@@ -121,6 +124,14 @@ jnl_format_buffer *jnl_format(jnl_action_code opcode, gv_key *key, mval *val, ui
 
 	SETUP_THREADGBL_ACCESS;
 #	endif
+	/* We are about to write a logical jnl record so caller better have set "is_replicator" for us to write to the
+	 * journal pool (if replication is turned on in this database). The only exceptions are
+	 *	a) forward phase of journal recovery which runs with replication turned off so "is_replicator" does not
+	 *		matter to it.
+	 *	b) MUPIP TRIGGER -UPGRADE which does an inline upgrade of the ^#t global with journaling but replication
+	 *		turned off.
+	 */
+	assert(is_replicator || jgbl.forw_phase_recovery || TREF(in_trigger_upgrade));
 	/* The below assert ensures that if ever jnl_format is interrupted by a signal, the interrupt handler never calls
 	 * jnl_format again. This is because jnl_format plays with global pointers and we would possibly end up in a bad
 	 * state if the interrupt handler calls jnl_format again.
diff --git a/sr_port/jnl_get_checksum.h b/sr_port/jnl_get_checksum.h
old mode 100755
new mode 100644
index d46edb2..4d0763f
--- a/sr_port/jnl_get_checksum.h
+++ b/sr_port/jnl_get_checksum.h
@@ -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	*
@@ -23,64 +23,64 @@ GBLREF uint4 csum_table[SLICE_BY][TABLE_SIZE];
 #ifdef  BIGENDIAN
 #define LOBYTE	0
 #define ADJUST_CHECKSUM(cursum, num4, newsum)										\
-{															\
+MBSTART {														\
 	uint4 tmpsum = csum_table[LOBYTE + 0][(cursum ^ num4) & BYTEMASK] ^ 						\
 			csum_table[LOBYTE + 1][((cursum ^ num4) >> (1 * BITS_PER_UCHAR)) & BYTEMASK] ^			\
 			csum_table[LOBYTE + 2][((cursum ^ num4) >> (2 * BITS_PER_UCHAR)) & BYTEMASK] ^ 			\
 			csum_table[LOBYTE + 3][((cursum ^ num4) >> (3 * BITS_PER_UCHAR)) & BYTEMASK]; 			\
 	newsum = tmpsum ? tmpsum : INIT_CHECKSUM_SEED;									\
-}
+} MBEND
 #else
 #define HIBYTE	3
 #define ADJUST_CHECKSUM(cursum, num4, newsum)										\
-{															\
+MBSTART {														\
 	uint4 tmpsum = csum_table[HIBYTE - 0][(cursum ^ num4) & BYTEMASK] ^ 						\
 			csum_table[HIBYTE - 1][((cursum ^ num4) >> (1 * BITS_PER_UCHAR)) & BYTEMASK] ^			\
 			csum_table[HIBYTE - 2][((cursum ^ num4) >> (2 * BITS_PER_UCHAR)) & BYTEMASK] ^ 			\
 			csum_table[HIBYTE - 3][((cursum ^ num4) >> (3 * BITS_PER_UCHAR)) & BYTEMASK]; 			\
 	newsum = tmpsum ? tmpsum : INIT_CHECKSUM_SEED;									\
-}
+} MBEND
 #endif
 
 #define ADJUST_CHECKSUM_TN(cursum, tn, newsum)										\
-{															\
+MBSTART {														\
 	uint4 tmpsum_tn;												\
 	ADJUST_CHECKSUM(cursum, *(uint4 *)tn, tmpsum_tn);								\
 	ADJUST_CHECKSUM(tmpsum_tn, *(uint4 *)((char *)tn + SIZEOF(uint4)), newsum);					\
-}
+} MBEND
 
 #define COMPUTE_COMMON_CHECKSUM(common_cksum, prefix)									\
-{															\
+MBSTART {														\
 	ADJUST_CHECKSUM_TN(INIT_CHECKSUM_SEED, &(prefix.tn), common_cksum);						\
 	ADJUST_CHECKSUM(common_cksum, prefix.pini_addr, common_cksum);							\
 	ADJUST_CHECKSUM(common_cksum, prefix.time, common_cksum);							\
-}
+} MBEND
 
 #define COMPUTE_PBLK_CHECKSUM(blk_checksum, pblk_rec, common_cksum, jrec_checksum)					\
-{															\
+MBSTART {														\
 	ADJUST_CHECKSUM(blk_checksum, (pblk_rec)->prefix.jrec_type, jrec_checksum);					\
 	ADJUST_CHECKSUM(jrec_checksum, (pblk_rec)->blknum, jrec_checksum);						\
 	ADJUST_CHECKSUM(jrec_checksum, (pblk_rec)->bsiz, jrec_checksum);						\
 	ADJUST_CHECKSUM(jrec_checksum, (pblk_rec)->ondsk_blkver, jrec_checksum);					\
 	ADJUST_CHECKSUM(jrec_checksum, common_cksum, jrec_checksum);							\
-}
+} MBEND
 
 #define COMPUTE_AIMG_CHECKSUM(blk_checksum, aimg_rec, common_cksum, jrec_checksum)					\
 					COMPUTE_PBLK_CHECKSUM(blk_checksum, aimg_rec, common_cksum, jrec_checksum);
 
 #define COMPUTE_LOGICAL_REC_CHECKSUM(jfb_checksum, jrec, common_cksum, jrec_checksum)					\
-{															\
+MBSTART {														\
 	ADJUST_CHECKSUM(jfb_checksum, (jrec)->prefix.jrec_type, jrec_checksum);						\
 	ADJUST_CHECKSUM(jrec_checksum, (jrec)->update_num, jrec_checksum);						\
 	ADJUST_CHECKSUM(jrec_checksum, (jrec)->token_seq.token, jrec_checksum);						\
 	ADJUST_CHECKSUM(jrec_checksum, (jrec)->strm_seqno, jrec_checksum);						\
 	ADJUST_CHECKSUM(jrec_checksum, (jrec)->num_participants, jrec_checksum);					\
 	ADJUST_CHECKSUM(jrec_checksum, common_cksum, jrec_checksum);							\
-}
+} MBEND
 
 /* This macro is to be used whenever we are computing the checksum of a block that has been acquired. */
 #define	JNL_GET_CHECKSUM_ACQUIRED_BLK(cse, csd, csa, old_blk, bsize)							\
-{															\
+MBSTART {														\
 	cache_rec_ptr_t	cr;												\
 	boolean_t	cr_is_null;											\
 															\
@@ -123,7 +123,7 @@ GBLREF uint4 csum_table[SLICE_BY][TABLE_SIZE];
 	 * necessary to avoid computing checksums if cr is NULL.							\
 	 */														\
 	cse->blk_checksum = !cr_is_null ? jnl_get_checksum((blk_hdr_ptr_t)old_blk, csa, (bsize)) : 0;			\
-}
+} MBEND
 
 #include "gdsblk.h"
 
diff --git a/sr_port/jnl_phase2_cleanup.c b/sr_port/jnl_phase2_cleanup.c
new file mode 100644
index 0000000..ae7a328
--- /dev/null
+++ b/sr_port/jnl_phase2_cleanup.c
@@ -0,0 +1,163 @@
+/****************************************************************
+ *								*
+ * 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 "gdsroot.h"
+#include "gtm_facility.h"
+#include "fileinfo.h"
+#include "gdsbt.h"
+#include "gdsfhead.h"
+#include "filestruct.h"
+#include "gdscc.h"
+#include "jnl.h"
+#include "memcoherency.h"
+#include "interlock.h"
+#include "is_proc_alive.h"
+#include "gdsbgtr.h"
+
+GBLREF	uint4		process_id;
+
+#define	PHASE2_COMMIT_ARRAY_ITERATE_UNTIL_WRITE_COMPLETE_FALSE(csa, phs2cmt, maxCmt)	\
+MBSTART {										\
+	assert(phs2cmt < maxCmt);							\
+	do										\
+	{										\
+		if (!phs2cmt->write_complete)						\
+			break;								\
+		phs2cmt++;								\
+		if (phs2cmt == maxCmt)							\
+			break;								\
+	} while (TRUE);									\
+} MBEND
+
+/* The below code is very similar to "repl_phase2_cleanup" */
+void	jnl_phase2_cleanup(sgmnt_addrs *csa, jnl_buffer_ptr_t jbp)
+{
+	uint4			currFreeaddr, newFreeaddr, stuckPid;
+	int			index1, index2;
+	jbuf_phase2_in_prog_t	*phs2cmt, *deadCmt, *begCmt, *maxCmt, *topCmt;
+	boolean_t		was_latch_owner;
+	DEBUG_ONLY(uint4	jbp_freeaddr1;)
+
+	/* It is possible we already own the latch in case we are in timer-interrupt or process-exit code hence the below check */
+	was_latch_owner = GLOBAL_LATCH_HELD_BY_US(&jbp->phase2_commit_latch);
+	if (!was_latch_owner)
+	{	/* Return value of "grab_latch" does not need to be checked because we pass GRAB_LATCH_INDEFINITE_WAIT as timeout */
+		grab_latch(&jbp->phase2_commit_latch, GRAB_LATCH_INDEFINITE_WAIT);
+	}
+	index1 = jbp->phase2_commit_index1;
+	ASSERT_JNL_PHASE2_COMMIT_INDEX_IS_VALID(index1, JNL_PHASE2_COMMIT_ARRAY_SIZE);
+	index2 = jbp->phase2_commit_index2;
+	SHM_READ_MEMORY_BARRIER;	/* see corresponding SHM_WRITE_MEMORY_BARRIER in UPDATE_JBP_RSRV_FREEADDR macro */
+	ASSERT_JNL_PHASE2_COMMIT_INDEX_IS_VALID(index2, JNL_PHASE2_COMMIT_ARRAY_SIZE);
+	if (index1 != index2)
+	{
+		DEBUG_ONLY(jbp_freeaddr1 = jbp->freeaddr); /* note down to help with assert failure in SET_JBP_FREEADDR below */
+		phs2cmt = &jbp->phase2_commit_array[index1];
+		if (!phs2cmt->write_complete && csa->now_crit)
+		{	/* "jnl_phase2_write" not complete in earliest phase2 entry. Since that is blocking us in crit,
+			 * check if the pid is alive. If not, cleanup. If you find the first blocking pid is dead, check
+			 * the next few pids too until an alive pid or phase2-complete entry shows up.
+			 */
+			deadCmt = phs2cmt;
+			assert((deadCmt->start_freeaddr <= jbp->freeaddr)
+				&& ((deadCmt->start_freeaddr + deadCmt->tot_jrec_len) > jbp->freeaddr));
+			if (index1 < index2)
+				maxCmt = &jbp->phase2_commit_array[index2];
+			else
+				maxCmt = &jbp->phase2_commit_array[JNL_PHASE2_COMMIT_ARRAY_SIZE];
+			assert(deadCmt < maxCmt);
+			do
+			{
+				if (deadCmt->write_complete)
+					break;
+				stuckPid = deadCmt->process_id;
+				/* Note that we can reach here with stuckPid == process_id. An example call graph follows
+				 *	t_end -> jnl_write_phase2 -> jnl_write_pblk -> jnl_write -> jnl_write_attempt
+				 *									-> jnl_phase2_cleanup
+				 * Therefore "break" in that case.
+				 */
+				if (stuckPid == process_id)
+					break;
+				BG_TRACE_PRO_ANY(csa, jnlbuff_phs2cmt_isprcalv);
+				if (is_proc_alive(stuckPid, 0))
+					break;
+				jnl_phase2_salvage(csa, jbp, deadCmt);
+				assert(deadCmt->write_complete);
+			} while (++deadCmt < maxCmt);
+			/* If "(deadCmt == maxCmt) && (index < index2)", we do not wrap around and search for dead pids in
+			 * the beginning of the array. Instead the next call to "jnl_phase2_cleanup" will take care of
+			 * cleaning that section IF there are any deadCmt entries.
+			 */
+		}
+		if (phs2cmt->write_complete)
+		{	/* There is at least one phase2 that is complete and can be cleaned up.
+			 * Note that jbp->freeaddr will mostly be equal to phs2cmt->start_freeaddr but in rare cases
+			 * it can be greater. This is possible for example if a TP transaction has total jnl records
+			 * written that is greater than the jnlbuffer size. In that case, jb->freeaddr is updated as
+			 * each jnlbuffer size is filled even though all jnl records of the transaction are not yet written.
+			 */
+			assert(jbp->freeaddr >= phs2cmt->start_freeaddr);
+			begCmt = &jbp->phase2_commit_array[0];
+			if (index1 < index2)
+			{	/* Easier case. No wrapping needed. */
+				maxCmt = &jbp->phase2_commit_array[index2];
+				assert(begCmt < maxCmt);
+				PHASE2_COMMIT_ARRAY_ITERATE_UNTIL_WRITE_COMPLETE_FALSE(csa, phs2cmt, maxCmt);
+				index1 = phs2cmt - begCmt;
+			} else
+			{
+				maxCmt = topCmt = &jbp->phase2_commit_array[JNL_PHASE2_COMMIT_ARRAY_SIZE];
+				PHASE2_COMMIT_ARRAY_ITERATE_UNTIL_WRITE_COMPLETE_FALSE(csa, phs2cmt, maxCmt);
+				if (phs2cmt == maxCmt)
+				{	/* Wrap around and search again */
+					if (index2)
+					{
+						phs2cmt = begCmt;
+						maxCmt = &jbp->phase2_commit_array[index2];
+						PHASE2_COMMIT_ARRAY_ITERATE_UNTIL_WRITE_COMPLETE_FALSE(csa, phs2cmt, maxCmt);
+					}
+					index1 = ((phs2cmt == maxCmt) ? index2 : (phs2cmt - begCmt));
+				} else
+					index1 = phs2cmt - begCmt;
+			}
+			if (phs2cmt < maxCmt)
+				newFreeaddr = phs2cmt->start_freeaddr;
+			else
+			{
+				assert(phs2cmt == maxCmt);
+				if (phs2cmt == begCmt)
+				{	/* i.e. phs2cmt == begCmt == maxCmt. That is, begCmt and maxCmt are equal.
+					 * Because of the "assert(begCmt < maxCmt)" assert in the "if (index1 < index2)" block
+					 * above, we are guaranteed, we did not go down that code-block. In the else block,
+					 * we did initialize topCmt so we can safely use that here.
+					 */
+					phs2cmt = topCmt;
+				}
+				phs2cmt--;
+				newFreeaddr = phs2cmt->start_freeaddr + phs2cmt->tot_jrec_len;
+			}
+			assert(!csa->now_crit || (index1 == index2)
+					|| (newFreeaddr == jbp->phase2_commit_array[index1].start_freeaddr));
+			SET_JBP_FREEADDR(jbp, newFreeaddr);
+			ASSERT_JNL_PHASE2_COMMIT_INDEX_IS_VALID(index1, JNL_PHASE2_COMMIT_ARRAY_SIZE);
+			SHM_WRITE_MEMORY_BARRIER;	/* Update phase2_commit_index1 after memory barrier since
+							 * jnl_write_attempt relies on jbp->freeaddr & jbp->free being
+							 * reliable once phase2_commit_index1 is updated.
+							 */
+			jbp->phase2_commit_index1 = index1;
+		}
+	}
+	if (!was_latch_owner)
+		rel_latch(&jbp->phase2_commit_latch);
+}
diff --git a/sr_port/jnl_phase2_salvage.c b/sr_port/jnl_phase2_salvage.c
new file mode 100644
index 0000000..e428a9f
--- /dev/null
+++ b/sr_port/jnl_phase2_salvage.c
@@ -0,0 +1,182 @@
+/****************************************************************
+ *								*
+ * 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 "gdsroot.h"
+#include "gtm_facility.h"
+#include "fileinfo.h"
+#include "gdsbt.h"
+#include "gdsfhead.h"
+#include "filestruct.h"
+#include "gdscc.h"
+#include "jnl.h"
+#include "jnl_get_checksum.h"
+#include "jnl_write.h"
+#include "send_msg.h"
+#ifdef DEBUG
+#include "is_proc_alive.h"
+#endif
+
+error_def(ERR_JNLBUFFPHS2SALVAGE);
+
+/* The below code is very similar to "repl_phase2_salvage" */
+/* This function is invoked when we find a process that had reserved space in the journal buffers for its journal records
+ * died before it finished its transaction commit in phase2 (outside crit). Since many other reservations could have happened
+ * after that and those could correspond to live processes, we now have a situation where there is a hole/gap in the journal
+ * file. The below function patches those holes by filling them with JRT_NULL/JRT_INCTN/JRT_ALIGN records to indicate some
+ * transaction happened. This keeps the jnl_seqno/curr_tn contiguity necessary for journal recovery, replication etc.
+ * The actual transaction's journal records are lost permanently but that is okay since the process had not touched the
+ * database for that commit (it would have started phase2 of db commit only after all phase2 jnl records were written to
+ * the journal buffer and got shot before that finished).
+ */
+void	jnl_phase2_salvage(sgmnt_addrs *csa, jnl_buffer_ptr_t jbp, jbuf_phase2_in_prog_t *deadCmt)
+{
+	boolean_t		write_null_record;
+	uint4			next_align_addr, start_freeaddr, end_freeaddr, save_phase2_freeaddr;
+	uint4			alignsize, pini_addr, rlen, tot_jrec_len;
+	struct_jrec_null	null_rec;
+	struct_jrec_inctn	inctn_rec;
+	jnl_record		*jrec;
+	jnl_private_control	*jpc;
+
+	assert(!is_proc_alive(deadCmt->process_id, 0));
+	if (!deadCmt->in_phase2)
+	{	/* A process in "jnl_write" got killed after it did the UPDATE_JBP_RSRV_FREEADDR call but before it did
+		 * the JNL_PHASE2_WRITE_COMPLETE call. The corresponding journal record was already written to the journal
+		 * buffer before the UPDATE_JBP_RSRV_FREEADDR call so all that is needed is to signal the phase2 as complete.
+		 * We cannot call the JNL_PHASE2_WRITE_COMPLETE macro (which does this signaling) directly as it will fail asserts.
+		 * Hence do its equivalent before returning right away.
+		 */
+		deadCmt->write_complete = TRUE;
+		return;
+	}
+	/* This commit entry was added by UPDATE_JRS_RSRV_FREEADDR in t_end/tp_tend. And so we are guaranteed that the journal
+	 * records added are not PFIN or EOF which have sizes of 0x20 and 0x28 respectively. This means the minimum jnl rec len
+	 * of this transaction is guaranteed to be 0x30 which is the length of a JRT_NULL record. And so it is possible for us
+	 * to replace this transaction's journal records with a NULL record (if replication is turned on) OR with an INCTN
+	 * journal record (if replication is turned OFF). And pad the rest of the space with JRT_ALIGN records as needed.
+	 *
+	 * Below is an explanation of why we can always replace an existing transaction's journal records with a sequence of
+	 * JRT_NULL/JRT_INCTN and one or more JRT_ALIGN records.
+	 *
+	 * The minimum size of a JRT_SET/JRT_KILL etc. (any logical update record) is 0x40. So the minimum size of the total
+	 * journal record size of the transaction is at least 0x40.
+	 * (a) If replicating, we can then replace this with a JRT_NULL record (size = 0x30) + JRT_ALIGN (size = 0x10, which is
+	 *	the minimum align record size and so 0-byte padding). If the transaction journal record size is > 0x40, we can
+	 *	add enough padding in the JRT_ALIGN and add a few more of JRT_ALIGN records as required if the transaction
+	 *	spans multiple align boundaries). In this case, the JRT_ALIGN is overloaded to also act as a filler journal record.
+	 * (b) If not replicating, we can then replace this with a JRT_INCTN record (size = 0x28) + JRT_ALIGN (size = 0x18, where
+	 *	the align record has 8-byte of padding). If > 0x40, then add more padding just like case (a) above.
+	 * It is possible the transaction is not a logical one (e.g. inctn due to file extension, 2nd phase of kill, reorg etc.).
+	 *	In that case, the transaction journal size would be just a JRT_INCTN (0x28) but in that case we should be
+	 *	able to replace it with another JRT_INCTN instead.
+	 * This is asserted below and in "UPDATE_JBP_RSRV_FREEADDR" macro.
+	 */
+	tot_jrec_len = deadCmt->tot_jrec_len;
+	assert((!deadCmt->replication && (INCTN_RECLEN == tot_jrec_len))
+		|| (deadCmt->replication && (NULL_RECLEN == tot_jrec_len))
+		|| ((tot_jrec_len >= (NULL_RECLEN + MIN_ALIGN_RECLEN)) && (tot_jrec_len >= (INCTN_RECLEN + MIN_ALIGN_RECLEN))));
+	start_freeaddr = deadCmt->start_freeaddr;
+	send_msg_csa(CSA_ARG(csa) VARLSTCNT(9) ERR_JNLBUFFPHS2SALVAGE, 7, deadCmt->process_id, DB_LEN_STR(csa->region),
+						&deadCmt->curr_tn, &deadCmt->jnl_seqno, start_freeaddr, tot_jrec_len);
+	alignsize = jbp->alignsize;
+	/* Use "gtm_uint64_t" typecast below to avoid 4G overflow issues with the ROUND_UP2 */
+	next_align_addr = (uint4)(ROUND_UP2((gtm_uint64_t)start_freeaddr, alignsize) - MIN_ALIGN_RECLEN);
+	assert(start_freeaddr <= next_align_addr);
+	jpc = csa->jnl;
+	/* Temporarily adjust jpc->phase2_freeaddr to reflect the state of the dead pid so we write jnl records where it
+	 * would have written in the jnl buffer or jnl file.
+	 */
+	save_phase2_freeaddr = jpc->phase2_freeaddr;
+	assert(jpc->phase2_free == jpc->phase2_freeaddr % jbp->size);
+	assert(!jpc->in_jnl_phase2_salvage);
+	jpc->in_jnl_phase2_salvage = TRUE;
+	SET_JPC_PHASE2_FREEADDR(jpc, jbp, start_freeaddr);	/* needed by "jnl_write_align_rec" etc. calls below */
+	end_freeaddr = start_freeaddr + tot_jrec_len;
+	write_null_record = REPL_ALLOWED(csa) && deadCmt->replication;	/* see comment in jnl.h (jbuf_phase2_in_prog_t.replication)
+									 * for why it is necessary to decide JRT_NULL vs JRT_INCTN.
+									 */
+	assert(!write_null_record || deadCmt->jnl_seqno);
+	rlen = write_null_record ? NULL_RECLEN : INCTN_RECLEN;
+	pini_addr = deadCmt->pini_addr;
+	if (!pini_addr)
+		pini_addr = JNL_FILE_FIRST_RECORD;
+	if ((start_freeaddr + rlen) > next_align_addr)
+	{	/* Write an ALIGN record first */
+		jnl_write_align_rec(csa, next_align_addr - start_freeaddr, deadCmt->jrec_time);
+		DEBUG_ONLY(start_freeaddr = jpc->phase2_freeaddr;)
+		assert(0 == (start_freeaddr % alignsize));
+		assert(start_freeaddr == (next_align_addr + MIN_ALIGN_RECLEN));
+		next_align_addr += alignsize;
+		assert(start_freeaddr < next_align_addr);
+		assert(start_freeaddr <= end_freeaddr);
+	}
+	assert(start_freeaddr + rlen <= end_freeaddr);
+	if (write_null_record)
+	{	/* Write JRT_NULL record */
+		assert(NULL_RECLEN == rlen);
+		null_rec.prefix.jrec_type = JRT_NULL;
+		null_rec.prefix.forwptr = NULL_RECLEN;
+		null_rec.prefix.pini_addr = pini_addr;
+		null_rec.prefix.time = deadCmt->jrec_time;
+		null_rec.prefix.checksum = INIT_CHECKSUM_SEED;
+		null_rec.prefix.tn = deadCmt->curr_tn;
+		assert(deadCmt->jnl_seqno);
+		null_rec.jnl_seqno = deadCmt->jnl_seqno;
+		null_rec.strm_seqno = deadCmt->strm_seqno;
+		null_rec.filler = 0;
+		null_rec.suffix.backptr = NULL_RECLEN;
+		null_rec.suffix.suffix_code = JNL_REC_SUFFIX_CODE;
+		jrec = (jnl_record *)&null_rec;
+		null_rec.prefix.checksum = compute_checksum(INIT_CHECKSUM_SEED, (unsigned char *)jrec, NULL_RECLEN);
+	} else
+	{	/* Write JRT_INCTN record */
+		inctn_rec.prefix.jrec_type = JRT_INCTN;
+		inctn_rec.prefix.forwptr = INCTN_RECLEN;
+		inctn_rec.prefix.pini_addr = pini_addr;
+		inctn_rec.prefix.time = deadCmt->jrec_time;
+		inctn_rec.prefix.checksum = INIT_CHECKSUM_SEED;
+		inctn_rec.prefix.tn = deadCmt->curr_tn;
+		inctn_rec.detail.blknum_struct.opcode = inctn_jnlphase2salvage;
+		inctn_rec.detail.blknum_struct.filler_uint4 = 0;
+		inctn_rec.detail.blknum_struct.filler_short = 0;
+		inctn_rec.detail.blknum_struct.suffix.backptr = INCTN_RECLEN;
+		inctn_rec.detail.blknum_struct.suffix.suffix_code = JNL_REC_SUFFIX_CODE;
+		jrec = (jnl_record *)&inctn_rec;
+		inctn_rec.prefix.checksum = compute_checksum(INIT_CHECKSUM_SEED, (unsigned char *)jrec, INCTN_RECLEN);
+		deadCmt->jnl_seqno = 0;	/* for the send_msg_csa call below */
+	}
+	jnl_write(jpc, jrec->prefix.jrec_type, jrec, NULL);
+	assert(start_freeaddr + rlen == jpc->phase2_freeaddr);
+	while (next_align_addr < end_freeaddr)
+	{	/* Write one or more JRT_ALIGN records to fill up one "alignsize" space. Note that one JRT_ALIGN record
+		 * size cannot exceed jbp->max_jrec_len which could be way less than the current "alignsize" and hence
+		 * the call to "jnl_write_multi_align_rec" instead of "jnl_write_align_rec" directly.
+		 */
+		jnl_write_multi_align_rec(csa, next_align_addr - jpc->phase2_freeaddr, deadCmt->jrec_time);
+		assert(0 == (jpc->phase2_freeaddr % alignsize));
+		assert(jpc->phase2_freeaddr == (next_align_addr + MIN_ALIGN_RECLEN));
+		next_align_addr += alignsize;
+		assert(start_freeaddr <= end_freeaddr);
+	}
+	if (end_freeaddr != jpc->phase2_freeaddr)
+	{
+		assert((end_freeaddr - jpc->phase2_freeaddr) >= MIN_ALIGN_RECLEN);
+		/* Write one last set of JRT_ALIGN record(s) */
+		jnl_write_multi_align_rec(csa, end_freeaddr - jpc->phase2_freeaddr - MIN_ALIGN_RECLEN, deadCmt->jrec_time);
+		assert(jpc->phase2_freeaddr == end_freeaddr);
+	}
+	jpc->in_jnl_phase2_salvage = FALSE;
+	SET_JPC_PHASE2_FREEADDR(jpc, jbp, save_phase2_freeaddr);	/* End simulation of dead pid jnl writing */
+	deadCmt->write_complete = TRUE;	/* signal dead pid's jnl write is now complete */
+}
diff --git a/sr_port/jnl_pool_write.c b/sr_port/jnl_pool_write.c
new file mode 100644
index 0000000..65511a4
--- /dev/null
+++ b/sr_port/jnl_pool_write.c
@@ -0,0 +1,163 @@
+/****************************************************************
+ *								*
+ * Copyright (c) 2007-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_inet.h"
+
+#include <stddef.h> /* for offsetof() macro */
+
+#include "gdsroot.h"
+#include "gtm_facility.h"
+#include "fileinfo.h"
+#include "gdsbt.h"
+#include "gdsblk.h"
+#include "gdsfhead.h"
+#include "filestruct.h"
+#include "ccp.h"
+#include "iosp.h"
+#include "jnl.h"
+#include "repl_msg.h"
+#include "gtmsource.h"
+#include "min_max.h"
+#include "sleep_cnt.h"
+#include "jnl_write.h"
+#include "copy.h"
+#include "sleep.h"
+
+GBLREF	jnlpool_addrs		jnlpool;
+GBLREF	jnlpool_ctl_ptr_t	jnlpool_ctl;
+GBLREF	jnl_gbls_t		jgbl;
+GBLREF	boolean_t		is_replicator;
+
+/* This function writes the journal records ONLY TO the journal pool.
+ *
+ * csa 	   : sgmnt_addrs corresponding to region
+ * rectype : Record type
+ * jnl_rec : This contains fixed part of a variable size record or the complete fixed size records.
+ * jfb     : For SET/KILL/ZKILL records entire record is formatted in this.
+ */
+void	jnl_pool_write(sgmnt_addrs *csa, enum jnl_record_type rectype, jnl_record *jnl_rec, jnl_format_buffer *jfb)
+{
+	boolean_t		pool_overflow;
+	int			max_iters, num_iters, num_participants;
+	uint4			dstlen, rlen;
+	uint4			jnlpool_size, tot_jrec_len;
+	uchar_ptr_t		jnlrecptr;
+	jnlpool_ctl_ptr_t	jctl;
+	jpl_rsrv_struct_t	*jrs;
+	uint4			write, write_total;
+	qw_off_t		cur_write_addr, end_write_addr;
+	gtm_int64_t		wait_write_addr;	/* needed signed because of subtraction happening below */
+
+	assert(is_replicator);
+	assert(NULL != jnl_rec);
+	assert(IS_VALID_RECTYPES_RANGE(rectype) && IS_REPLICATED(rectype));
+	assert(JNL_ENABLED(csa) || REPL_WAS_ENABLED(csa));
+	jctl = jnlpool.jnlpool_ctl;
+	assert(jctl == jnlpool_ctl);
+	assert(NULL != jctl); /* ensure we haven't yet detached from the jnlpool */
+	jrs = &jnlpool.jrs;
+	jnlpool_size = jctl->jnlpool_size;
+	tot_jrec_len = jrs->tot_jrec_len;
+	DEBUG_ONLY(jgbl.cu_jnl_index++;)
+	if (JRT_TCOM == rectype)
+	{	/* If this is a TCOM record, check if this is a multi-region TP transaction. In that case, tp_tend would call
+		 * "jnl_pool_write" with a sequence say TSET1, TCOM1, TSET2, TCOM2 (where 1 implies REG1, 2 implies REG2).
+		 * But we cannot write this sequence into the journal pool as replication ("repl_sort_tr_buff" etc.) relies on
+		 * all TCOMs coming at the end, i.e. the desired order is TSET1, TSET2, TCOM1, TCOM2. So adjust that by noting
+		 * down if this TCOM is not the last one and if so skip writing it to the jnlpool and write it only when it is.
+		 * Thankfully it is okay to write N copies of the last TCOM record to correspond to each of the N regions since
+		 * replication does not care about region-specific information in the TCOM record (e.g. checksum, pini_addr etc.).
+		 * All replication cares about is the time, seqno etc. which is all common across all the regions.
+		 */
+		num_participants = jnl_rec->jrec_tcom.num_participants;
+		assert(jrs->num_tcoms < num_participants);
+		if (++jrs->num_tcoms != num_participants)
+			return;
+		max_iters = num_participants;	/* write one TCOM record per region in a loop */
+	} else
+		max_iters = 1;
+	rlen = jnl_rec->prefix.forwptr;
+	assert(0 == rlen % JNL_REC_START_BNDRY);
+	assert((rlen + SIZEOF(jnldata_hdr_struct)) <= tot_jrec_len);
+	pool_overflow = (tot_jrec_len > jnlpool_size);
+	write_total = jrs->write_total;
+	cur_write_addr = jrs->cur_write_addr;
+	for (num_iters = 0; num_iters < max_iters; num_iters++)
+	{
+		write_total += rlen;
+		if (write_total > tot_jrec_len)
+		{	/* "tot_jrec_len" (computed in phase1) becomes lesser than "write_total" (computed in phase2).
+			 * There is not enough reserved space in the jnlpool to write the transaction's journal records.
+			 * Skip writing any more records in the reserved space. A later call to JPL_PHASE2_WRITE_COMPLETE
+			 * will know this happened by checking jrs->write_total and will take appropriate action.
+			 * But continue "write_total" accumulation (used at end to set jrs->write_total) hence
+			 * the "continue" below instead of a "break".
+			 */
+			assert(FALSE);
+			continue;
+		}
+		assert(cur_write_addr >= jctl->write_addr);
+		end_write_addr = cur_write_addr + rlen;
+		assert(end_write_addr <= jctl->rsrv_write_addr);
+		/* If we cannot fit in this whole transaction in the journal pool, source server will anyways read this
+		 * transaction from the journal files. So skip the memcpy onto the jnlpool in the interest of time.
+		 */
+		if (!pool_overflow)
+		{
+			assert(!jrs->memcpy_skipped);
+			/* Wait for jctl->write_addr to be high so we can go ahead with write
+			 * without overflowing/underflowing the pool.
+			 */
+			wait_write_addr = (gtm_int64_t)end_write_addr - jnlpool_size;
+			while ((gtm_int64_t)jctl->write_addr < wait_write_addr)
+			{
+				JPL_TRACE_PRO(jctl, jnl_pool_write_sleep);
+				SLEEP_USEC(1, FALSE);
+				/* TODO: Need to handle case of too-many "repl_phase2_cleanup" (and hence "is_proc_alive")
+				 * calls by concurrent processes at same time. If we see a lot of the "jnl_pool_write_sleep"
+				 * counter value then this will become a priority. For now we expect that counter to be ~ 0.
+				 */
+				repl_phase2_cleanup(&jnlpool);
+			}
+			/* If the database is encrypted, then at this point jfb->buff will contain encrypted
+			 * data which we don't want to to push into the jnlpool. Instead, we make use of the
+			 * alternate alt_buff which is guaranteed to contain the original unencrypted data.
+			 */
+			if (jrt_fixed_size[rectype])
+				jnlrecptr = (uchar_ptr_t)jnl_rec;
+			else if (IS_SET_KILL_ZKILL_ZTWORM_LGTRIG_ZTRIG(rectype) && USES_ANY_KEY(csa->hdr))
+				jnlrecptr = (uchar_ptr_t)jfb->alt_buff;
+			else
+				jnlrecptr = (uchar_ptr_t)jfb->buff;
+			write = cur_write_addr % jnlpool_size;
+			dstlen = jnlpool_size - write;
+			assert(rlen < jnlpool_size);	/* Because of "if (tot_jrec_len <= jnlpool_size)" above */
+			/* Inspite of the above assert, do a "rlen < jnlpool_size" check below in pro to be safe */
+			if (rlen <= dstlen)		/* dstlen & srclen >= rlen  (most frequent case) */
+				memcpy(jnlpool.jnldata_base + write, jnlrecptr, rlen);
+			else if (rlen < jnlpool_size)	/* dstlen < rlen <= jnlpool_size */
+			{
+				memcpy(jnlpool.jnldata_base + write, jnlrecptr, dstlen);
+				memcpy(jnlpool.jnldata_base, jnlrecptr + dstlen, rlen - dstlen);
+			}
+		} else
+			jrs->memcpy_skipped = TRUE;
+		cur_write_addr = end_write_addr;
+	}
+	assert(end_write_addr > jrs->cur_write_addr);
+	jrs->cur_write_addr = end_write_addr;
+	jrs->write_total = write_total;
+	return;
+}
diff --git a/sr_port/jnl_send_oper.c b/sr_port/jnl_send_oper.c
index 592cc8e..0150d1e 100755
--- a/sr_port/jnl_send_oper.c
+++ b/sr_port/jnl_send_oper.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,16 +89,14 @@ void jnl_send_oper(jnl_private_control *jpc, uint4 status)
 	now_writer = jb->io_in_prog_latch.u.parts.latch_pid;
 	fsync_in_prog = jb->fsync_in_prog_latch.u.parts.latch_pid ? TRUE : FALSE;
 	fsync_pid     = jb->fsync_in_prog_latch.u.parts.latch_pid;
-	/* note: the alignment of the parameters below is modelled on the alignment defined for JNLBUFINFO in merrors.msg */
 	if (ok_to_log)
 	{
-		send_msg_csa(CSA_ARG(csa) VARLSTCNT(18) ERR_JNLBUFINFO, 16, process_id,
-				jb->dsk,      jb->free,     jb->bytcnt,  io_in_prog,  fsync_in_prog,
-				jb->dskaddr,  jb->freeaddr, jb->qiocnt,  now_writer,  fsync_pid,
-				jb->filesize, jb->cycle,    jb->errcnt,  jb->wrtsize, jb->fsync_dskaddr);
-		send_msg_csa(CSA_ARG(csa) VARLSTCNT(10) ERR_JNLPVTINFO, 8, process_id,
-				jpc->cycle,     jpc->fd_mismatch, jpc->channel,    jpc->sync_io,
-				jpc->pini_addr, jpc->qio_active,  jpc->old_channel);
+		send_msg_csa(CSA_ARG(csa) VARLSTCNT(23) ERR_JNLBUFINFO, 21, process_id,
+			jb->dsk, jb->free, jb->bytcnt, io_in_prog, fsync_in_prog, jb->dskaddr, jb->freeaddr, jb->qiocnt,
+			now_writer, fsync_pid, jb->filesize, jb->cycle, jb->errcnt, jb->wrtsize, jb->fsync_dskaddr,
+			jb->rsrv_free, jb->rsrv_freeaddr, jb->phase2_commit_index1, jb->phase2_commit_index2, jb->next_align_addr);
+		send_msg_csa(CSA_ARG(csa) VARLSTCNT(10) ERR_JNLPVTINFO, 8, process_id, jpc->cycle, jpc->fd_mismatch,
+			jpc->channel, jpc->sync_io, jpc->pini_addr, jpc->qio_active, jpc->old_channel);
 	}
 	caller_id_flag = TRUE;
 }
diff --git a/sr_port/jnl_set_cur_prior.c b/sr_port/jnl_set_cur_prior.c
index 01e0d4a..7b51e62 100644
--- a/sr_port/jnl_set_cur_prior.c
+++ b/sr_port/jnl_set_cur_prior.c
@@ -19,6 +19,7 @@
 #include "jnl.h"
 #include "gtmio.h"
 #include "anticipatory_freeze.h"
+#include "is_file_identical.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.
@@ -57,7 +58,11 @@ void jnl_set_fd_prior(int jnl_fd, sgmnt_addrs* csa, sgmnt_data* csd, jnl_file_he
 		}
 	} else
 		jfh_checked = jfh;
-	if (NULL != jfh_checked)
+	/* Only do an update if we successfully read the journal header and the database file in the journal header matches
+	 * the current database file. A mismatch may occur when working with a database backup on the same machine as the
+	 * original database, as the backup will still point to the original journal file.
+	 */
+	if ((NULL != jfh_checked) && is_file_identical((char *)csa->region->dyn.addr->fname, (char *)jfh_checked->data_file_name))
 	{
 		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);
diff --git a/sr_port/jnl_typedef.h b/sr_port/jnl_typedef.h
index 3c7da35..7f28019 100755
--- a/sr_port/jnl_typedef.h
+++ b/sr_port/jnl_typedef.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	*
@@ -77,7 +78,6 @@ LITREF	boolean_t	jrt_is_replicated[JRT_RECTYPES];
 								&& !IS_LGTRIG(rectype) && !IS_ZTRIG(rectype))
 #endif
 
-#define GET_REC_FENCE_TYPE(rectype)		(!IS_FENCED(rectype)) ? NOFENCE : (IS_TP(rectype)) ? TPFENCE : ZTPFENCE
 #define REC_HAS_TOKEN_SEQ(rectype)		(IS_SET_KILL_ZKILL_ZTWORM_LGTRIG_ZTRIG(rectype) || IS_COM(rectype)	\
 							|| (JRT_EPOCH == (rectype)) || (JRT_EOF == (rectype))		\
 							|| (JRT_NULL == (rectype)))
diff --git a/sr_port/jnl_write.c b/sr_port/jnl_write.c
old mode 100755
new mode 100644
index 91884fb..b31b38c
--- a/sr_port/jnl_write.c
+++ b/sr_port/jnl_write.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	*
@@ -27,61 +27,48 @@
 #include "ccp.h"
 #include "iosp.h"
 #include "jnl.h"
-#include "repl_msg.h"
+#include "repl_msg.h"		/* needed by gtmsource.h */
 #include "gtmsource.h"
 #include "min_max.h"
 #include "sleep_cnt.h"
 #include "jnl_write.h"
 #include "copy.h"
 #include "jnl_get_checksum.h"
-#include "memcoherency.h"
 #include "is_proc_alive.h"
 #include "wbox_test_init.h"
 #include "gtmimagename.h"
+#include "memcoherency.h"
+#include "interlock.h"
+#include "gdsbgtr.h"
+#ifdef DEBUG
+#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"
+#endif
 
 GBLREF	uint4			process_id;
-GBLREF	sm_uc_ptr_t		jnldata_base;
-GBLREF	jnlpool_addrs		jnlpool;
-GBLREF	jnlpool_ctl_ptr_t	jnlpool_ctl;
-GBLREF	jnl_gbls_t		jgbl;
 GBLREF	boolean_t		is_src_server;
 GBLREF	boolean_t		in_jnl_file_autoswitch;
-GBLREF	boolean_t		is_replicator;
+GBLREF	uint4			dollar_tlevel;
+GBLREF	inctn_opcode_t		inctn_opcode;
+GBLREF	jnl_gbls_t		jgbl;
 
 #ifdef DEBUG
+#define	MAX_JNL_WRITE_RECURSION_DEPTH	3
 STATICDEF	int		jnl_write_recursion_depth;
-
-#define	MAX_JNL_WRITE_RECURSION_DEPTH	2
-
 #endif
 
 error_def(ERR_JNLEXTEND);
 error_def(ERR_JNLWRTNOWWRTR);
 error_def(ERR_JNLWRTDEFER);
 
-#ifdef DEBUG
-/* The fancy ordering of operators/operands in the JNL_SPACE_AVAILABLE calculation is to avoid overflows. */
-#define	JNL_SPACE_AVAILABLE(jb, lcl_dskaddr, lcl_freeaddr, lcl_size, jnl_wrt_start_mask)	\
-(												\
-	assert(((jb)->dskaddr <= lcl_freeaddr)							\
-		|| (gtm_white_box_test_case_enabled						\
-			&& (WBTEST_JNL_FILE_LOST_DSKADDR == gtm_white_box_test_case_number))),	\
-	/* the following assert is an || to take care of 4G value overflows or 0 underflows */	\
-	assert((lcl_freeaddr <= lcl_size) || ((jb)->dskaddr >= lcl_freeaddr - lcl_size)		\
-		|| (gtm_white_box_test_case_enabled						\
-			&& (WBTEST_JNL_FILE_LOST_DSKADDR == gtm_white_box_test_case_number))),	\
-	(lcl_size - (lcl_freeaddr - ((lcl_dskaddr = (jb)->dskaddr) & jnl_wrt_start_mask)))	\
-)
-#else
-#define	JNL_SPACE_AVAILABLE(jb, dummy, lcl_freeaddr, lcl_size, jnl_wrt_start_mask)		\
-	(lcl_size - (lcl_freeaddr - ((jb)->dskaddr & jnl_wrt_start_mask)))
-#endif
-
-
 #define	JNL_PUTSTR(lcl_free, lcl_buff, src, len, lcl_size)			\
 {										\
 	uint4	size_before_wrap;						\
 										\
+	assert(len <= lcl_size);						\
 	size_before_wrap = lcl_size - lcl_free;					\
 	if (len <= size_before_wrap)						\
 	{									\
@@ -97,208 +84,114 @@ error_def(ERR_JNLWRTDEFER);
 	}									\
 }
 
-/* Note: DO_JNL_WRITE_ATTEMPT_IF_NEEDED and DO_JNL_FILE_EXTEND_IF_NEEDED are macros (instead of functions) for performance
- * reasons since they are invoked for the fast path (no-align-record) always and for the ALIGN record once in a while.
- */
-#define	DO_JNL_WRITE_ATTEMPT_IF_NEEDED(JPC, JB, LCL_DSKADDR, LCL_FREEADDR, LCL_SIZE,					\
-						JNL_WRT_START_MASK, REC_LEN, JNL_WRT_START_MODULUS)			\
-{															\
-	GBLREF	uint4	process_id;											\
-															\
-	assert((!JB->blocked) || (FALSE == is_proc_alive(JB->blocked, 0))						\
-		VMS_ONLY(|| ((JB->blocked == process_id) && lib$ast_in_prog())));					\
-	JB->blocked = process_id;											\
-	/* We should differentiate between a full and an empty journal buffer, hence the pessimism reflected		\
-	 * in the <= check below. Hence also the -1 in LCL_FREEADDR - (LCL_SIZE - REC_LEN - 1).* This means		\
-	 * that although we have space we might still be invoking jnl_write_attempt (very unlikely).			\
-	 */														\
-	if (JNL_SPACE_AVAILABLE(JB, LCL_DSKADDR, LCL_FREEADDR, LCL_SIZE, JNL_WRT_START_MASK) <= REC_LEN)		\
-	{	/* The fancy ordering of operators/operands in the calculation done below is to avoid overflows. */	\
-		if (SS_NORMAL != jnl_write_attempt(JPC,									\
-				ROUND_UP2(LCL_FREEADDR - (LCL_SIZE - REC_LEN- 1), JNL_WRT_START_MODULUS)))		\
-		{													\
-			assert(NOJNL == JPC->channel); /* jnl file lost */						\
-			DEBUG_ONLY(jnl_write_recursion_depth--);							\
-			return; /* let the caller handle the error */							\
-		}													\
-	}														\
-	JB->blocked = 0;												\
-}
-
-int jnl_write_extend_if_needed(int4 jrec_len, jnl_buffer_ptr_t jb, uint4 lcl_freeaddr, sgmnt_addrs *csa,
-					enum jnl_record_type rectype, blk_hdr_ptr_t blk_ptr, jnl_format_buffer *jfb,
-					gd_region *reg, jnl_private_control *jpc, jnl_record *jnl_rec,
-					jnlpool_write_ctx_t *jplctx);
-
-#define	DO_JNL_FILE_EXTEND_IF_NEEDED(JREC_LEN, JB, LCL_FREEADDR, CSA, RECTYPE, BLK_PTR, JFB, REG, JPC, JNL_REC, JPLCTX)		\
-MBSTART {														\
-	if (0 != jnl_write_extend_if_needed(JREC_LEN, JB, LCL_FREEADDR, CSA, RECTYPE, BLK_PTR, JFB,			\
-						REG, JPC, JNL_REC, JPLCTX))							\
-		return;	/* return from calling routine */								\
-} MBEND
-
-int jnl_write_extend_if_needed(int4 jrec_len, jnl_buffer_ptr_t jb, uint4 lcl_freeaddr, sgmnt_addrs *csa,
-					enum jnl_record_type rectype, blk_hdr_ptr_t blk_ptr, jnl_format_buffer *jfb,
-					gd_region *reg, jnl_private_control *jpc, jnl_record *jnl_rec,
-					jnlpool_write_ctx_t *jplctx)
-{
-	int4			jrec_len_padded;
-	int4			blocks_needed;
-	boolean_t		do_extend;
-
-	/* Before writing a journal record, check if we have some padding space
-	 * to close the journal file in case we are on the verge of an autoswitch.
-	 * If we are about to autoswitch the journal file at this point, dont
-	 * do the padding check since the padding space has already been checked
-	 * in jnl_write calls before this autoswitch invocation. We can safely
-	 * write the input record without worrying about autoswitch limit overflow.
-	 */
-	jrec_len_padded = jrec_len;
-	if (!in_jnl_file_autoswitch)
-		jrec_len_padded = jrec_len + JNL_FILE_TAIL_PRESERVE;
-	blocks_needed = DISK_BLOCKS_SUM(lcl_freeaddr, jrec_len_padded);
-	do_extend = jb->last_eof_written || (jb->filesize < blocks_needed);
-	if (do_extend)
-	{	/* not enough room in jnl file, extend it */
-		/* We should never reach here if we are called from t_end/tp_tend. We check that by using the fact that
-		 * early_tn is different from curr_tn in the t_end/tp_tend case. The only exception is wcs_recover which
-		 * also sets these to be different in case of writing an INCTN record. For this case though it is okay to
-		 * extend/autoswitch the file. So allow that.
-		 */
-		if (!jb->last_eof_written)
-		{
-			assertpro((csa->ti->early_tn == csa->ti->curr_tn) || (JRT_INCTN == rectype));
-			assert(!IS_REPLICATED(rectype)); /* all replicated jnl records should have gone through t_end/tp_tend */
-			assert(jrt_fixed_size[rectype]); /* this is used later in re-computing checksums */
-		}
-		assert(NULL == blk_ptr);	/* as otherwise it is a PBLK or AIMG record which is of variable record
-						 * length that conflicts with the immediately above assert.
-						 */
-		assert(NULL == jfb);		/* as otherwise it is a logical record with formatted journal records which
-						 * is of variable record length (conflicts with the jrt_fixed_size assert).
-						 */
-		assertpro(!in_jnl_file_autoswitch);	/* avoid recursion of jnl_file_extend */
-		if (SS_NORMAL != jnl_flush(reg))
-		{
-			assert(NOJNL == jpc->channel); /* jnl file lost */
-			DEBUG_ONLY(jnl_write_recursion_depth--);
-			return 1; /* let the caller handle the error */
-		}
-		assert(lcl_freeaddr == jb->dskaddr);
-		if (EXIT_ERR == jnl_file_extend(jpc, jrec_len))
-		{
-			DEBUG_ONLY(jnl_write_recursion_depth--);
-			return 1;
-		}
-		assert(!jb->last_eof_written);
-		if (0 == jpc->pini_addr)
-		{	/* This can happen only if jnl got switched in jnl_file_extend above.
-			 * Write a PINI record in the new journal file and then continue writing the input record.
-			 * Basically we need to redo the processing in jnl_write because a lot of the local variables
-			 * have changed state (e.g. JB->freeaddr etc.). So we instead call jnl_write()
-			 * recursively and then return immediately.
-			 */
-			jnl_put_jrt_pini(csa);
-			assertpro(jpc->pini_addr);	/* should have been set in "jnl_put_jrt_pini" */
-			if (JRT_PINI != rectype)
-			{
-				jnl_rec->prefix.pini_addr = jpc->pini_addr;
-				/* Checksum needs to be recomputed since prefix.pini_addr is changed in above statement */
-				jnl_rec->prefix.checksum = INIT_CHECKSUM_SEED;
-				jnl_rec->prefix.checksum = compute_checksum(INIT_CHECKSUM_SEED, (unsigned char *)jnl_rec,
-													jnl_rec->prefix.forwptr);
-				jnl_write(jpc, rectype, jnl_rec, NULL, NULL, jplctx);
-			}
-			DEBUG_ONLY(jnl_write_recursion_depth--);
-			return 1;
-		}
-	}
-	return 0;
-}
-
 /* jpc 	   : Journal private control
  * rectype : Record type
  * jnl_rec : This contains fixed part of a variable size record or the complete fixed size records.
- * blk_ptr : For JRT_PBLK and JRT_AIMG this has the block image
- * jfb     : For SET/KILL/ZKILL/ZTWORM/LGTRIG/ZTRIG records entire record is formatted in this.
- * 	     For JRT_PBLK and JRT_AIMG it contains partial records
+ * parm1   : For JRT_PBLK and JRT_AIMG this has the block image (blk_ptr)
+ *         : For SET/KILL/ZKILL/ZTWORM/LGTRIG/ZTRIG records it contains the journal-format-buffer (jfb)
  */
-void	jnl_write(jnl_private_control *jpc, enum jnl_record_type rectype, jnl_record *jnl_rec, blk_hdr_ptr_t blk_ptr,
-	jnl_format_buffer *jfb, jnlpool_write_ctx_t *jplctx)
+void	jnl_write(jnl_private_control *jpc, enum jnl_record_type rectype, jnl_record *jnl_rec, void *parm1)
 {
-	uint4			align_rec_len, rlen, rlen_with_align, dstlen, lcl_size, lcl_free, lcl_orig_free;
+	uint4			align_filler_len, rlen, lcl_size, lcl_free, lcl_orig_free, next_align_addr;
 	jnl_buffer_ptr_t	jb;
 	sgmnt_addrs		*csa;
 	sgmnt_data_ptr_t	csd;
 	node_local_ptr_t	cnl;
-	struct_jrec_align	align_rec;
-	uint4 			status;
+	struct_jrec_align	*jrec_align;
 	jrec_suffix		suffix;
-	boolean_t		nowrap, is_replicated;
+	boolean_t		nowrap, in_phase2, is_align;
 	struct_jrec_blk		*jrec_blk;
-	uint4			checksum, jnlpool_size, lcl_freeaddr;
+	uint4			checksum, lcl_freeaddr, new_freeaddr, start_freeaddr;
+	gtm_int64_t		min_dskaddr;
 	sm_uc_ptr_t		lcl_buff;
 	gd_region		*reg;
-	uchar_ptr_t		jnlrecptr;
-	int			jnl_wrt_start_modulus, jnl_wrt_start_mask;
+	int			commit_index, index2;
 	uint4			jnl_fs_block_size, aligned_lcl_free, padding_size;
-	uint4			tmp_csum1, tmp_csum2;
+	blk_hdr_ptr_t		blk_ptr;
+	jnl_format_buffer	*jfb;
+	jbuf_phase2_in_prog_t	*phs2cmt;
+	boolean_t		was_latch_owner;
 #	ifdef DEBUG
-	uint4			lcl_dskaddr, mumps_node_sz;
+	uint4			tmp_csum1, tmp_csum2;
+	uint4			mumps_node_sz;
 	char			*mumps_node_ptr;
+	struct_jrec_align	*align_rec;
+	uint4			end_freeaddr;
 #	endif
 
-	assert(jnl_write_recursion_depth++ < MAX_JNL_WRITE_RECURSION_DEPTH);
+	assert(MAX_JNL_WRITE_RECURSION_DEPTH > jnl_write_recursion_depth++);
 	reg = jpc->region;
 	csa = &FILE_INFO(reg)->s_addrs;
-	csd = csa->hdr;
-	is_replicated = jrt_is_replicated[rectype];
-	/* Ensure that no replicated journal record is written by this routine if REPL-WAS_ENABLED(csa) is TRUE */
-	assert((JNL_ENABLED(csa) && !REPL_WAS_ENABLED(csa)) || !is_replicated);
-	/* Assert that the only journal records that the source server ever writes are PINI/PFIN/EPOCH/EOF
-	 * which it does at the very end when the database is about to be shut down
-	 */
-	assert(!is_src_server || (JRT_EOF == rectype) || (JRT_PINI == rectype) || (JRT_EPOCH == rectype) || (JRT_PFIN == rectype));
-	assert(csa->now_crit  ||  (csd->clustered  &&  csa->nl->ccp_state == CCST_CLOSED));
-	assert(rectype > JRT_BAD  &&  rectype < JRT_RECTYPES && JRT_ALIGN != rectype);
 	jb = jpc->jnl_buff;
-	/* Before taking a copy of jb->freeaddr, determine if both free and freeaddr are in sync. If not fix that first. */
-	if (jb->free_update_pid)
+	in_phase2 = (IN_PHASE2_JNL_COMMIT(csa) || jpc->in_jnl_phase2_salvage);
+	lcl_freeaddr = JB_FREEADDR_APPROPRIATE(in_phase2, jpc, jb);
+	assert(NULL != jnl_rec);
+	rlen = jnl_rec->prefix.forwptr;
+	assert(((gtm_uint64_t)lcl_freeaddr + rlen) < MAXUINT4);	/* so the below + can be done without gtm_uint64_t typecast */
+	new_freeaddr = lcl_freeaddr + rlen;
+	is_align = (JRT_ALIGN == rectype);
+	if (!in_phase2 && !is_align)
 	{
-		FIX_NONZERO_FREE_UPDATE_PID(csa, jb);
+		next_align_addr = jb->next_align_addr;
+		assert(lcl_freeaddr <= next_align_addr);
+		if (new_freeaddr > next_align_addr)
+		{	/* If we have to write an ALIGN record here before writing a PINI record, thankfully there is no issue.
+			 * This is because an ALIGN record does not have a pini_addr (if it did then we would have used
+			 * JNL_FILE_FIRST_RECORD, the pini_addr field of the first PINI journal record in the journal file).
+			 */
+			jb->next_align_addr += jb->alignsize;
+			assert(jb->next_align_addr < MAXUINT4);
+			assert(new_freeaddr < jb->next_align_addr);
+			jnl_write_align_rec(csa, next_align_addr - lcl_freeaddr, jnl_rec->prefix.time);
+			lcl_freeaddr = jb->rsrv_freeaddr; /* can safely examine this because "in_phase2" is 0 at this point */
+			new_freeaddr = lcl_freeaddr + rlen;
+			/* Now that we have written an ALIGN record, move on to write the requested "rectype" which is guaranteed
+			 * to not be an ALIGN record (since "is_align" is FALSE).
+			 */
+			if (JRT_PINI == rectype)
+			{
+				jnl_rec->prefix.pini_addr = lcl_freeaddr;
+				/* Checksum needs to be recomputed since prefix.pini_addr is changed in above statement */
+				jnl_rec->prefix.checksum = INIT_CHECKSUM_SEED;
+				jnl_rec->prefix.checksum = compute_checksum(INIT_CHECKSUM_SEED,
+								(unsigned char *)&jnl_rec->jrec_pini, SIZEOF(struct_jrec_pini));
+			}
+		}
 	}
-	lcl_freeaddr = jb->freeaddr;
-	lcl_free = jb->free;
+	csd = csa->hdr;
+#	ifdef DEBUG
+	/* Ensure that journaling is turned ON in this database file if we are about to write a journal record AND that
+	 * no replicated journal record is written by this routine if replication is in WAS_ON state.
+	 * The only exception for journaling being turned OFF is if we are in phase2 (outside crit) and had reserved
+	 * space during phase1 but journaling got turned OFF in between phase1 and phase2. In that case JNL_ENABLED(csa)
+	 * would still be TRUE and it is okay to continue writing the journal records since we are writing in the
+	 * reserved space only (no need to flush etc. for the most part). The only exception is if we need to invoke
+	 * "jnl_write_attempt" below and that invokes "jnl_file_lost". In that case, jpc->channel would be set to NOJNL
+	 * and we return right away. "jnl_write_phase2" has an assert which takes this scenario into account.
+	 */
+	assert((JNL_ENABLED(csd) && (!REPL_WAS_ENABLED(csd) || !jrt_is_replicated[rectype])) || (in_phase2 && JNL_ENABLED(csa)));
+	/* Assert that the only journal records that the source server ever writes are PINI/PFIN/EPOCH/EOF
+	 * which it does at the very end when the database is about to be shut down. The only exception is
+	 * an ALIGN record which is an indirectly written record and a NULL record which it could write on behalf
+	 * of another GT.M process (in "jnl_phase2_salvage"). So account for that too.
+	 */
+	assert(!is_src_server || (JRT_EOF == rectype) || (JRT_PINI == rectype)
+			|| (JRT_EPOCH == rectype) || (JRT_PFIN == rectype) || (JRT_ALIGN == rectype) || (JRT_NULL == rectype));
+	assert(csa->now_crit || in_phase2 || (csd->clustered  &&  (csa->nl->ccp_state == CCST_CLOSED)));
+	assert(IS_VALID_RECTYPES_RANGE(rectype));
+#	endif
+	lcl_free = JB_FREE_APPROPRIATE(in_phase2, jpc, jb);
 	lcl_size = jb->size;
 	lcl_buff = &jb->buff[jb->buff_off];
-	DBG_CHECK_JNL_BUFF_FREEADDR(jb);
 	++jb->reccnt[rectype];
-	assert(NULL != jnl_rec);
-	rlen = jnl_rec->prefix.forwptr;
 	/* Do high-level check on rlen */
 	assert(rlen <= jb->max_jrec_len);
 	/* Do fine-grained checks on rlen */
 	GTMTRIG_ONLY(assert(!IS_ZTWORM(rectype) || (MAX_ZTWORM_JREC_LEN >= rlen));)		/* ZTWORMHOLE */
 	GTMTRIG_ONLY(assert(!IS_LGTRIG(rectype) || (MAX_LGTRIG_JREC_LEN >= rlen));)		/* LGTRIG */
 	assert(!IS_SET_KILL_ZKILL_ZTRIG(rectype) || (JNL_MAX_SET_KILL_RECLEN(csd) >= rlen));	/* SET, KILL, ZKILL, ZTRIG */
-	assert((NULL == blk_ptr) || (JNL_MAX_PBLK_RECLEN(csd) >= rlen));			/* PBLK and AIMG */
 	jb->bytcnt += rlen;
 	assert (0 == rlen % JNL_REC_START_BNDRY);
-	rlen_with_align = rlen + MIN_ALIGN_RECLEN;
-	assert(0 == rlen_with_align % JNL_REC_START_BNDRY);
-	assert(rlen_with_align < (1 << jb->log2_of_alignsize));
-	if ((lcl_freeaddr >> jb->log2_of_alignsize) == ((lcl_freeaddr + rlen_with_align - 1) >> jb->log2_of_alignsize))
-		rlen_with_align = rlen;
-	else
-	{
-		align_rec.align_str.length = ROUND_UP2(lcl_freeaddr, ((uint4)1 << jb->log2_of_alignsize))
-			- lcl_freeaddr - (uint4)MIN_ALIGN_RECLEN;
-		align_rec_len = MIN_ALIGN_RECLEN + align_rec.align_str.length;
-		assert (0 == align_rec_len % JNL_REC_START_BNDRY);
-		rlen_with_align = rlen + align_rec_len;
-	}
-	jnl_wrt_start_mask = JNL_WRT_START_MASK(jb);
-	jnl_wrt_start_modulus = JNL_WRT_START_MODULUS(jb);
 	cnl = csa->nl;
 	/* If we are currently extending the journal file and writing the closing part of journal records,
 	 * it better be the records that we expect. This is because we will skip the padding check for these
@@ -306,133 +199,136 @@ void	jnl_write(jnl_private_control *jpc, enum jnl_record_type rectype, jnl_recor
 	 */
 	assert(!in_jnl_file_autoswitch
 		|| (JRT_PINI == rectype) || (JRT_PFIN == rectype) || (JRT_EPOCH == rectype)
-		|| (JRT_INCTN == rectype) || (JRT_EOF == rectype));
-	if (rlen_with_align != rlen)
-	{
-		DO_JNL_WRITE_ATTEMPT_IF_NEEDED(jpc, jb, lcl_dskaddr, lcl_freeaddr, lcl_size,
-						jnl_wrt_start_mask, align_rec_len, jnl_wrt_start_modulus);
-		DO_JNL_FILE_EXTEND_IF_NEEDED(align_rec_len, jb, lcl_freeaddr, csa, rectype, blk_ptr, jfb, reg, jpc, jnl_rec,
-						jplctx);
-		align_rec.prefix.jrec_type = JRT_ALIGN;
-		assert(align_rec_len <= jb->max_jrec_len);
-		align_rec.prefix.forwptr = suffix.backptr = align_rec_len;
-		align_rec.prefix.time = jnl_rec->prefix.time;
-		align_rec.prefix.tn = jnl_rec->prefix.tn;
-		/* we have to write an ALIGN record here before writing the PINI record but we do not have a non-zero
-		 * pini_addr for the ALIGN since we have not yet written the PINI. we use the pini_addr field of the
-		 * first PINI journal record in the journal file which is nothing but JNL_FILE_FIRST_RECORD.
-		 */
-		align_rec.prefix.pini_addr = (JRT_PINI == rectype) ? JNL_FILE_FIRST_RECORD : jnl_rec->prefix.pini_addr;
-		align_rec.prefix.checksum = INIT_CHECKSUM_SEED;
-		suffix.suffix_code = JNL_REC_SUFFIX_CODE;
-		align_rec.prefix.checksum = compute_checksum(INIT_CHECKSUM_SEED, (unsigned char *)&align_rec, SIZEOF(jrec_prefix));
-		ADJUST_CHECKSUM(align_rec.prefix.checksum, lcl_freeaddr, align_rec.prefix.checksum);
-		ADJUST_CHECKSUM(align_rec.prefix.checksum, csd->jnl_checksum, align_rec.prefix.checksum);
-		assert(lcl_free < lcl_size);
-		if (lcl_size >= (lcl_free + align_rec_len))
-		{	/* before the string for zeroes */
-			memcpy(lcl_buff + lcl_free, (uchar_ptr_t)&align_rec, FIXED_ALIGN_RECLEN);
-			lcl_free += (int4)(FIXED_ALIGN_RECLEN + align_rec.align_str.length); /* zeroing is not necessary */
-		} else
-		{
-			JNL_PUTSTR(lcl_free, lcl_buff, (uchar_ptr_t)&align_rec, (int4)FIXED_ALIGN_RECLEN, lcl_size);
-			if (lcl_size >= (lcl_free + align_rec.align_str.length + SIZEOF(jrec_suffix)))
-				lcl_free += align_rec.align_str.length;	/* zeroing is not necessary */
-			else
-			{
-				if (lcl_size >= (lcl_free + align_rec.align_str.length))
-				{
-					lcl_free += align_rec.align_str.length;	/* zeroing is not necessary */
-					if (lcl_size == lcl_free)
-						lcl_free = 0;
-				} else
-					lcl_free = lcl_free + align_rec.align_str.length - lcl_size;
-			}
-		}
-		/* Now copy suffix */
-		assert(0 == (UINTPTR_T)(&lcl_buff[0] + lcl_free) % SIZEOF(jrec_suffix));
-		*(jrec_suffix *)(lcl_buff + lcl_free) = *(jrec_suffix *)&suffix;
-		lcl_free += SIZEOF(jrec_suffix);
-		if (lcl_size == lcl_free)
-			lcl_free = 0;
-		jpc->new_freeaddr = lcl_freeaddr + align_rec_len;
-		INCR_GVSTATS_COUNTER(csa, cnl, n_jrec_other, 1);
-		INCR_GVSTATS_COUNTER(csa, cnl, n_jbuff_bytes, align_rec_len);
-		SET_JNLBUFF_PREV_JREC_TIME(jb, align_rec.prefix.time, DO_GBL_JREC_TIME_CHECK_TRUE);
-			/* Keep jb->prev_jrec_time up to date */
-		jpc->temp_free = lcl_free; /* set jpc->temp_free BEFORE setting free_update_pid (secshr_db_clnup relies on this) */
-		assert(lcl_free == jpc->new_freeaddr % lcl_size);
-		/* Note that freeaddr should be updated ahead of free since jnl_output_sp.c does computation of wrtsize
-		 * based on free and asserts follow later there which use freeaddr.
-		 */
-		jb->free_update_pid = process_id;
-		lcl_freeaddr = jpc->new_freeaddr;
-		jb->freeaddr = lcl_freeaddr;
-		/* Write memory barrier here to enforce the fact that freeaddr *must* be seen to be updated before
-		   free is updated. It is less important if free is stale so we do not require a 2nd barrier for that
-		   and will let the lock release (crit lock required since clustering not currently supported) do the
-		   2nd memory barrier for us. This barrier takes care of this process's responsibility to broadcast
-		   cache changes. It is up to readers to also specify a read memory barrier if necessary to receive
-		   this broadcast.
-		*/
-		SHM_WRITE_MEMORY_BARRIER;
-		jb->free = lcl_free;
-		jb->free_update_pid = 0;
-		DBG_CHECK_JNL_BUFF_FREEADDR(jb);
-		if (JRT_PINI == rectype)
-		{
-			jnl_rec->prefix.pini_addr = lcl_freeaddr;
-			/* Checksum needs to be recomputed since prefix.pini_addr is changed in above statement */
-			jnl_rec->prefix.checksum = INIT_CHECKSUM_SEED;
-			jnl_rec->prefix.checksum = compute_checksum(INIT_CHECKSUM_SEED,
-								(unsigned char *)&jnl_rec->jrec_pini, SIZEOF(struct_jrec_pini));
-		}
-	}
-	checksum = jnl_rec->prefix.checksum;
+		|| (JRT_INCTN == rectype) || (JRT_EOF == rectype) || (JRT_ALIGN == rectype));
+	checksum = GET_JREC_CHECKSUM(jnl_rec, rectype);
 	assert(checksum);
 #	ifdef DEBUG
-	/* Ensure that the checksum computed earlier in jnl_format or jnl_write_pblk or jnl_write_aimg_rec or fixed-sized records
-	 * matches with the block's content.
+	/* Ensure that the checksum computed earlier in jnl_format or jnl_write_pblk or jnl_write_aimg_rec
+	 * or fixed-sized records matches with the block's content.
 	 */
+	blk_ptr = NULL;
+	jfb = NULL;
 	if ((JRT_PBLK == rectype) || (JRT_AIMG == rectype))
 	{
+		blk_ptr = (blk_hdr_ptr_t)parm1;
+		assert(JNL_MAX_PBLK_RECLEN(csd) >= rlen);			/* PBLK and AIMG */
 		COMPUTE_COMMON_CHECKSUM(tmp_csum2, jnl_rec->prefix);
 		tmp_csum1 = jnl_get_checksum(blk_ptr, NULL, jnl_rec->jrec_pblk.bsiz);
 		COMPUTE_PBLK_CHECKSUM(tmp_csum1, &jnl_rec->jrec_pblk, tmp_csum2, tmp_csum1);
-		assert(checksum == tmp_csum1);
 	} else if (IS_SET_KILL_ZKILL_ZTWORM_LGTRIG_ZTRIG(rectype))
 	{
+		jfb = (jnl_format_buffer *)parm1;
 		COMPUTE_COMMON_CHECKSUM(tmp_csum2, jnl_rec->prefix);
 		mumps_node_ptr = jfb->buff + FIXED_UPD_RECLEN;
 		mumps_node_sz = jfb->record_size - (FIXED_UPD_RECLEN + JREC_SUFFIX_SIZE);
 		tmp_csum1 = compute_checksum(INIT_CHECKSUM_SEED, (unsigned char *)mumps_node_ptr, mumps_node_sz);
 		COMPUTE_LOGICAL_REC_CHECKSUM(tmp_csum1, &jnl_rec->jrec_set_kill, tmp_csum2, tmp_csum1);
-		assert(checksum == tmp_csum1);
-	} else if (jrt_fixed_size[rectype] || JRT_ALIGN == rectype)
+	} else if (jrt_fixed_size[rectype])
 	{
 		jnl_rec->prefix.checksum = INIT_CHECKSUM_SEED;
-		switch (rectype)
-		{
-		case JRT_ALIGN:
-			tmp_csum1 = compute_checksum(INIT_CHECKSUM_SEED,
-								(unsigned char *)&jnl_rec->jrec_align, SIZEOF(jrec_prefix));
-			break;
-		default:
-			if(JRT_TRIPLE != rectype && JRT_HISTREC != rectype)
-				tmp_csum1 = compute_checksum(INIT_CHECKSUM_SEED,
-								(unsigned char *)&jnl_rec->jrec_set_kill, jnl_rec->prefix.forwptr);
-			break;
-		}
-		assert(checksum == tmp_csum1);
+		assert(JRT_TRIPLE != rectype);
+		assert(JRT_HISTREC != rectype);
+		tmp_csum1 = compute_checksum(INIT_CHECKSUM_SEED, (unsigned char *)jnl_rec, jnl_rec->prefix.forwptr);
 		jnl_rec->prefix.checksum = checksum;
-	}
+	} else if (is_align)
+	{	/* Note: "struct_jrec_align" has a different layout (e.g. "checksum" at different offset etc.) than all
+		 * other jnl records. So handle this specially.
+		 */
+		align_rec = (struct_jrec_align *)jnl_rec;
+		align_rec->checksum = INIT_CHECKSUM_SEED;
+		tmp_csum1 = compute_checksum(INIT_CHECKSUM_SEED, (unsigned char *)jnl_rec, FIXED_ALIGN_RECLEN);
+		align_rec->checksum = checksum;
+	} else
+		assert(FALSE);
+	/* It is possible "jnl_file_lost" was invoked by us during phase2 of commit in which case jpc->pini_addr would have
+	 * been reset to 0 and so the checksums might not match. Allow for that in the below assert.
+	 */
+	assert((checksum == tmp_csum1) || ((!JNL_ENABLED(csd)) && (JNL_ENABLED(csa))));
 #	endif
 	ADJUST_CHECKSUM(checksum, lcl_freeaddr, checksum);
 	ADJUST_CHECKSUM(checksum, csd->jnl_checksum, checksum);
-	jnl_rec->prefix.checksum = checksum;
-	DO_JNL_WRITE_ATTEMPT_IF_NEEDED(jpc, jb, lcl_dskaddr, lcl_freeaddr, lcl_size,
-					jnl_wrt_start_mask, rlen, jnl_wrt_start_modulus);
-	DO_JNL_FILE_EXTEND_IF_NEEDED(rlen, jb, lcl_freeaddr, csa, rectype, blk_ptr, jfb, reg, jpc, jnl_rec, jplctx);
+	SET_JREC_CHECKSUM(jnl_rec, rectype, checksum);
+	if (!in_phase2)
+	{
+		assert((!jb->blocked) || (FALSE == is_proc_alive(jb->blocked, 0)));
+		jb->blocked = process_id;
+	}
+	jnl_fs_block_size = jb->fs_block_size;
+	min_dskaddr = (gtm_int64_t)new_freeaddr - lcl_size + jnl_fs_block_size;	/* gtm_int64_t used as result can be negative */
+	/* If jb->dskaddr >= min_dskaddr, we are guaranteed we can write "rlen" bytes at "lcl_freeaddr" without
+	 * overflowing the journal buffer and/or overwriting the filesystem-aligned block before "jb->dskaddr" in jnl buffer.
+	 * The check is not exact in the sense we might invoke "jnl_write_attempt" even if it is not necessary but it is
+	 * very rare and this avoids us from always having to use a ROUND_UP2 or "& ~(jb->fs_block_size - 1)" operation.
+	 */
+	if ((gtm_int64_t)jb->dskaddr < min_dskaddr)
+	{
+		if (csa->now_crit && in_phase2 && ((gtm_int64_t)jb->freeaddr < min_dskaddr))
+		{	/* Holding crit AND phase2. Find corresponding phase2 commit entry in jb.
+			 * Check if that commit entry writes journal records more than journal buffer size.
+			 * If so, we need to adjust jb->freeaddr in the middle of the transaction thereby
+			 * "jnl_write_attempt" can flush partial transaction data and make space for the remaining data.
+			 */
+			index2 = jb->phase2_commit_index2;
+			assert(jb->phase2_commit_index1 != index2);
+			ASSERT_JNL_PHASE2_COMMIT_INDEX_IS_VALID(index2, JNL_PHASE2_COMMIT_ARRAY_SIZE);
+			DECR_PHASE2_COMMIT_INDEX(index2, JNL_PHASE2_COMMIT_ARRAY_SIZE);
+			phs2cmt = &jb->phase2_commit_array[index2];
+			assert(phs2cmt->process_id == process_id);
+			assert(!phs2cmt->write_complete);
+			start_freeaddr = phs2cmt->start_freeaddr;
+			/* If min_dskaddr < start_freeaddr, all we need is to flush out any phase2 commits before the
+			 * current one so we can directly go to do a "jnl_write_attempt(min_dskaddr)" below which
+			 * automatically takes care of that. Otherwise, we need to flush all prior phase2 commits
+			 * first (i.e. "jnl_write_attempt(start_freeaddr)") and then adjust jb->freeaddr based on
+			 * the ongoing/current phase2 commit as it fills up the journal buffer with jnl records.
+			 */
+			if (min_dskaddr >= start_freeaddr)
+			{
+				assert(dollar_tlevel);
+				assert(phs2cmt->tot_jrec_len > (lcl_size - jnl_fs_block_size));
+				DEBUG_ONLY(end_freeaddr = start_freeaddr + phs2cmt->tot_jrec_len);
+				assert(end_freeaddr >= new_freeaddr);
+				if ((jb->freeaddr < start_freeaddr) && (SS_NORMAL != jnl_write_attempt(jpc, start_freeaddr)))
+				{
+					assert(NOJNL == jpc->channel); /* jnl file lost */
+					DEBUG_ONLY(jnl_write_recursion_depth--);
+					return; /* let the caller handle the error */
+				}
+				assert(jb->freeaddr >= start_freeaddr);
+				/* It is possible we already own the latch in case we are in timer-interrupt
+				 * or process-exit code hence the below check.
+				 */
+				was_latch_owner = GLOBAL_LATCH_HELD_BY_US(&jb->phase2_commit_latch);
+				if (!was_latch_owner)
+				{	/* Return value of "grab_latch" does not need to be checked
+					 * because we pass GRAB_LATCH_INDEFINITE_WAIT as timeout.
+					 */
+					grab_latch(&jb->phase2_commit_latch, GRAB_LATCH_INDEFINITE_WAIT);
+				}
+				SET_JBP_FREEADDR(jb, lcl_freeaddr);
+				if (!was_latch_owner)
+					rel_latch(&jb->phase2_commit_latch);
+			}
+		}
+		if (SS_NORMAL != jnl_write_attempt(jpc, min_dskaddr))
+		{
+			assert(NOJNL == jpc->channel); /* jnl file lost */
+			DEBUG_ONLY(jnl_write_recursion_depth--);
+			return; /* let the caller handle the error */
+		}
+	}
+	/* If we are in "phase2", the call to "jnl_write_reserve" would have done the needed "jnl_file_extend" calls in phase1
+	 * so no need to do "jnl_write_extend_if_needed" if "in_phase2" is TRUE.
+	 */
+	if (!in_phase2)
+	{
+		jb->blocked = 0;
+		if (0 != jnl_write_extend_if_needed(rlen, jb, lcl_freeaddr, csa, rectype, blk_ptr, jfb, reg, jpc, jnl_rec))
+		{
+			DEBUG_ONLY(jnl_write_recursion_depth--);
+			return; /* let the caller handle the error */
+		}
+	}
 	lcl_orig_free = lcl_free;
 	nowrap = (lcl_size >= (lcl_free + rlen));
 	assert(jrt_fixed_size[JRT_EOF]);
@@ -454,61 +350,104 @@ void	jnl_write(jnl_private_control *jpc, enum jnl_record_type rectype, jnl_recor
 		 */
 		if (JRT_EOF == rectype)
 		{
-			jnl_fs_block_size = jb->fs_block_size;
+			assert(!in_phase2);
 			aligned_lcl_free = ROUND_UP2(lcl_free, jnl_fs_block_size);
 			padding_size = aligned_lcl_free - lcl_free;
 			if (padding_size)
 				memset(lcl_buff + lcl_free, 0, padding_size);
 		}
-		/* Note: Cannot easily use ? : syntax below as INCR_GVSTATS_COUNTER macro
-		 * is not an arithmetic expression but a sequence of statements.
-		 */
 		if (JRT_EPOCH != rectype)
 			INCR_GVSTATS_COUNTER(csa, cnl, n_jrec_other, 1);
 		/* else for EPOCH, the increment of JRE or JRI is done after "jnl_write_epoch_rec" in caller */
 	} else
 	{
-		if (NULL != blk_ptr)	/* PBLK and AIMG */
+		switch(rectype)
 		{
-			assert(FIXED_BLK_RECLEN == FIXED_PBLK_RECLEN);
-			assert(FIXED_BLK_RECLEN == FIXED_AIMG_RECLEN);
-			jrec_blk = (struct_jrec_blk *)jnl_rec;
-			if (nowrap)
-			{	/* write fixed part of record before the actual gds block image */
-				memcpy(lcl_buff + lcl_free, (uchar_ptr_t)jnl_rec, FIXED_BLK_RECLEN);
-				lcl_free += (int4)FIXED_BLK_RECLEN;
-				/* write actual block */
-				memcpy(lcl_buff + lcl_free, (uchar_ptr_t)blk_ptr, jrec_blk->bsiz);
-				lcl_free += jrec_blk->bsiz;
-				/* Now write trailing characters for 8-bye alignment and then suffix */
-				memcpy(lcl_buff + lcl_free, (uchar_ptr_t)jfb->buff, jfb->record_size);
-				lcl_free += jfb->record_size;
-   				assert(lcl_free <= lcl_size);
+			case JRT_PBLK:
+			case JRT_AIMG:
+				blk_ptr = (blk_hdr_ptr_t)parm1;
+				assert(NULL != blk_ptr);	/* PBLK and AIMG */
+				assert(FIXED_BLK_RECLEN == FIXED_PBLK_RECLEN);
+				assert(FIXED_BLK_RECLEN == FIXED_AIMG_RECLEN);
+				jrec_blk = (struct_jrec_blk *)jnl_rec;
+				suffix.backptr = rlen;
+				suffix.suffix_code = JNL_REC_SUFFIX_CODE;
+				if (nowrap)
+				{	/* write fixed part of record before the actual gds block image */
+					memcpy(lcl_buff + lcl_free, (uchar_ptr_t)jnl_rec, FIXED_BLK_RECLEN);
+					lcl_free += (int4)FIXED_BLK_RECLEN;
+					/* write actual block */
+					memcpy(lcl_buff + lcl_free, (uchar_ptr_t)blk_ptr, jrec_blk->bsiz);
+					lcl_free += jrec_blk->bsiz;
+				} else
+				{	/* write fixed part of record before the actual gds block image */
+					JNL_PUTSTR(lcl_free, lcl_buff, (uchar_ptr_t)jnl_rec, (int4)FIXED_BLK_RECLEN, lcl_size);
+					/* write actual block */
+					JNL_PUTSTR(lcl_free, lcl_buff, (uchar_ptr_t)blk_ptr, jrec_blk->bsiz, lcl_size);
+				}
+				/* Skip over a few characters for 8-bye alignment and then write suffix */
+				assert(lcl_free <= lcl_size);
+				lcl_free = ROUND_UP2(lcl_free + JREC_SUFFIX_SIZE, JNL_REC_START_BNDRY);
+				if (lcl_free > lcl_size)
+				{
+					assert(lcl_free == (lcl_size + JNL_REC_START_BNDRY));
+					lcl_free = JNL_REC_START_BNDRY;
+				}
+				*((jrec_suffix *)(lcl_buff + lcl_free - JREC_SUFFIX_SIZE)) = suffix;
+				assert(lcl_free <= lcl_size);
 				if (lcl_size == lcl_free)
 					lcl_free = 0;
-			} else
-			{	/* write fixed part of record before the actual gds block image */
-				JNL_PUTSTR(lcl_free, lcl_buff, (uchar_ptr_t)jnl_rec, (int4)FIXED_BLK_RECLEN, lcl_size);
-				/* write actual block */
-				JNL_PUTSTR(lcl_free, lcl_buff, (uchar_ptr_t)blk_ptr, jrec_blk->bsiz, lcl_size);
-				/* Now write trailing characters for 8-bye alignment and then suffix */
-				JNL_PUTSTR(lcl_free, lcl_buff, (uchar_ptr_t)jfb->buff, jfb->record_size, lcl_size);
-			}
-			INCR_GVSTATS_COUNTER(csa, cnl, n_jrec_pblk, 1);
-		} else
-		{	/* SET, KILL, ZKILL for TP, ZTP, non-TP */
-			assert(IS_TP(rectype) || IS_ZTP(rectype) || (0 == ((struct_jrec_upd *)jfb->buff)->update_num));
-			assert((!IS_TP(rectype) && !IS_ZTP(rectype)) || (0 != ((struct_jrec_upd *)jfb->buff)->update_num));
-			assert(((jrec_prefix *)jfb->buff)->forwptr == jfb->record_size);
-			if (nowrap)
-			{
-				memcpy(lcl_buff + lcl_free, (uchar_ptr_t)jfb->buff, rlen);
-				lcl_free += rlen;
+				INCR_GVSTATS_COUNTER(csa, cnl, n_jrec_pblk, 1);
+				break;
+			case JRT_ALIGN:
+				assert(lcl_free < lcl_size);
+				jrec_align = &jnl_rec->jrec_align;
+				align_filler_len = rlen - MIN_ALIGN_RECLEN;	/* Note: this filler section is not zeroed */
+				if (nowrap)
+				{
+					memcpy(lcl_buff + lcl_free, (uchar_ptr_t)jrec_align, FIXED_ALIGN_RECLEN);
+					lcl_free += (int4)(FIXED_ALIGN_RECLEN + align_filler_len);
+				} else
+				{
+					JNL_PUTSTR(lcl_free, lcl_buff, (uchar_ptr_t)jrec_align, (int4)FIXED_ALIGN_RECLEN, lcl_size);
+					/* Note: JNL_PUTSTR can wrap-adjust "lcl_free" while writing FIXED_ALIGN_RECLEN bytes.
+					 * In that case, we should not wrap-adjust it (i.e. "- lcl_size").
+					 * Hence the "if" check below.
+					 */
+					lcl_free += align_filler_len;
+					if (lcl_size <= lcl_free)
+					{
+						lcl_free -= lcl_size;
+						assert(lcl_free < lcl_size);
+					}
+				}
+				/* Now copy suffix */
+				assert(0 == (UINTPTR_T)(&lcl_buff[0] + lcl_free) % SIZEOF(jrec_suffix));
+				suffix.backptr = rlen;
+				suffix.suffix_code = JNL_REC_SUFFIX_CODE;
+				*(jrec_suffix *)(lcl_buff + lcl_free) = suffix;
+				lcl_free += SIZEOF(jrec_suffix);
 				if (lcl_size == lcl_free)
 					lcl_free = 0;
-			} else
-				JNL_PUTSTR(lcl_free, lcl_buff, (uchar_ptr_t)jfb->buff, rlen, lcl_size);
-			INCR_GVSTATS_COUNTER(csa, cnl, n_jrec_logical, 1);
+				INCR_GVSTATS_COUNTER(csa, cnl, n_jrec_other, 1);
+				break;
+			default:
+				/* SET, KILL, ZKILL for TP, ZTP, non-TP */
+				jfb = (jnl_format_buffer *)parm1;
+				assert(NULL != jfb);
+				assert(IS_TP(rectype) || IS_ZTP(rectype) || (0 == ((struct_jrec_upd *)jfb->buff)->update_num));
+				assert((!IS_TP(rectype) && !IS_ZTP(rectype)) || (0 != ((struct_jrec_upd *)jfb->buff)->update_num));
+				assert(((jrec_prefix *)jfb->buff)->forwptr == jfb->record_size);
+				if (nowrap)
+				{
+					memcpy(lcl_buff + lcl_free, (uchar_ptr_t)jfb->buff, rlen);
+					lcl_free += rlen;
+					if (lcl_size == lcl_free)
+						lcl_free = 0;
+				} else
+					JNL_PUTSTR(lcl_free, lcl_buff, (uchar_ptr_t)jfb->buff, rlen, lcl_size);
+				INCR_GVSTATS_COUNTER(csa, cnl, n_jrec_logical, 1);
+				break;
 		}
 	}
 	assert((lcl_free - lcl_orig_free + lcl_size) % lcl_size == rlen);
@@ -516,69 +455,22 @@ void	jnl_write(jnl_private_control *jpc, enum jnl_record_type rectype, jnl_recor
 	assert(lcl_orig_free < lcl_free  ||  lcl_free < jb->dsk);
 	assert((lcl_freeaddr >= jb->dskaddr)
 		|| (gtm_white_box_test_case_enabled && (WBTEST_JNL_FILE_LOST_DSKADDR == gtm_white_box_test_case_number)));
-	jpc->new_freeaddr = lcl_freeaddr + rlen;
+	jpc->new_freeaddr = new_freeaddr;
 	INCR_GVSTATS_COUNTER(csa, cnl, n_jbuff_bytes, rlen);
 	assert(lcl_free == jpc->new_freeaddr % lcl_size);
-	if (REPL_ENABLED(csa) && is_replicated && is_replicator)
+	if (!in_phase2)
 	{
-		assert(NULL != jplctx);
-		assert(NULL != jnlpool.jnlpool_ctl && NULL != jnlpool_ctl); /* ensure we haven't yet detached from the jnlpool */
-		assert((&FILE_INFO(jnlpool.jnlpool_dummy_reg)->s_addrs)->now_crit);	/* ensure we have the jnl pool lock */
-		DEBUG_ONLY(jgbl.cu_jnl_index++;)
-
-		/* If the database is encrypted, then at this point jfb->buff will contain encrypted
-		 * data which we don't want to to push into the jnlpool. Instead, we make use of the
-		 * alternate alt_buff which is guaranteed to contain the original unencrypted data.
-		 */
-		if (jrt_fixed_size[rectype])
-			jnlrecptr = (uchar_ptr_t)jnl_rec;
-		else if (IS_SET_KILL_ZKILL_ZTWORM_LGTRIG_ZTRIG(rectype) && USES_ANY_KEY(csd))
-			jnlrecptr = (uchar_ptr_t)jfb->alt_buff;
-		else
-			jnlrecptr = (uchar_ptr_t)jfb->buff;
-		jnlpool_size = jnlpool_ctl->jnlpool_size;
-		dstlen = jnlpool_size - jplctx->write;
-		if (rlen <= dstlen)		/* dstlen >= rlen  (most frequent case) */
-			memcpy(jnldata_base + jplctx->write, jnlrecptr, rlen);
-		else if (rlen <= jnlpool_size)	/* dstlen < rlen <= jnlpool_size */
-		{
-			memcpy(jnldata_base + jplctx->write, jnlrecptr, dstlen);
-			memcpy(jnldata_base, jnlrecptr + dstlen, rlen - dstlen);
-		} else				/* dstlen <= jnlpool_size < rlen */
-		{	/* Copy just the last "jnlpool_size" bytes of the journal record (which could be arbitrarily large)
-			 * onto the journal pool. Adjust pointers as appropriate. Note that this transaction can never be
-			 * read from the journal pool (because it does not completely fit in) but we still need to maintain
-			 * contiguity of jnl-seqnos in the journal pool. Note we could probably copy 0s in the journal pool
-			 * instead of the last "jnlpool_size" bytes and still things should work as well but we copy valid
-			 * data just in case it helps in debug situations.
-			 */
-			jnlrecptr = jnlrecptr + rlen - jnlpool_size;
-			memcpy(jnldata_base + jplctx->write, jnlrecptr, dstlen);
-			memcpy(jnldata_base, jnlrecptr + dstlen, jnlpool_size - dstlen);
-		}
-		jplctx->write += rlen;
-		jplctx->write_total += rlen;
-		if (jplctx->write >= jnlpool_size)
-			jplctx->write %= jnlpool_size;
+		assert(jnl_rec->prefix.time == jgbl.gbl_jrec_time); /* since latter is used in UPDATE_JBP_RSRV_FREEADDR */
+		SET_JNLBUFF_PREV_JREC_TIME(jb, jnl_rec->prefix.time, DO_GBL_JREC_TIME_CHECK_TRUE);
+			/* Keep jb->prev_jrec_time up to date */
+		jpc->curr_tn = csa->ti->curr_tn;	/* needed below by UPDATE_JBP_RSRV_FREEADDR */
+		UPDATE_JBP_RSRV_FREEADDR(csa, jpc, jb, NULL, rlen, commit_index, FALSE, 0, 0, FALSE); /* sets "commit_index" */
+		assert(jb->phase2_commit_array[commit_index].curr_tn == jpc->curr_tn);
+		JNL_PHASE2_WRITE_COMPLETE(csa, jb, commit_index, jpc->new_freeaddr);
+	} else
+	{
+		jpc->phase2_freeaddr = jpc->new_freeaddr;
+		jpc->phase2_free = lcl_free;
 	}
-	SET_JNLBUFF_PREV_JREC_TIME(jb, jnl_rec->prefix.time, DO_GBL_JREC_TIME_CHECK_TRUE); /* Keep jb->prev_jrec_time up to date */
-	jpc->temp_free = lcl_free; /* set jpc->temp_free BEFORE setting free_update_pid (secshr_db_clnup relies on this) */
-	/* Note that freeaddr should be updated ahead of free since jnl_output_sp.c does computation of wrtsize
-	 * based on free and asserts follow later there which use freeaddr.
-	 */
-	jb->free_update_pid = process_id;
-	lcl_freeaddr = jpc->new_freeaddr;
-	jb->freeaddr = lcl_freeaddr;
-	/* Write memory barrier here to enforce the fact that freeaddr *must* be seen to be updated before
-	   free is updated. It is less important if free is stale so we do not require a 2nd barrier for that
-	   and will let the lock release (crit lock required since clustering not currently supported) do the
-	   2nd memory barrier for us. This barrier takes care of this process's responsibility to broadcast
-	   cache changes. It is up to readers to also specify a read memory barrier if necessary to receive
-	   this broadcast.
-	*/
-	SHM_WRITE_MEMORY_BARRIER;
-	jb->free = lcl_free;
-	jb->free_update_pid = 0;
-	DBG_CHECK_JNL_BUFF_FREEADDR(jb);
 	DEBUG_ONLY(jnl_write_recursion_depth--);
 }
diff --git a/sr_port/jnl_write.h b/sr_port/jnl_write.h
old mode 100755
new mode 100644
index b502fcc..8ab98f6
--- a/sr_port/jnl_write.h
+++ b/sr_port/jnl_write.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	*
@@ -14,7 +14,10 @@
 #define __JNL_WRITE_H__
 
 /* We do not put this in jnl.h, because it needs all including jnl.h must include gdsblk.h */
-void	jnl_write(jnl_private_control *jpc, enum jnl_record_type rectype, jnl_record *jnl_rec, blk_hdr_ptr_t blk_ptr,
-			jnl_format_buffer *jfb, jnlpool_write_ctx_t *jplctx);
+void	jnl_write(jnl_private_control *jpc, enum jnl_record_type rectype, jnl_record *jnl_rec, void *parm1);
+
+int jnl_write_extend_if_needed(int4 jrec_len, jnl_buffer_ptr_t jb, uint4 lcl_freeaddr, sgmnt_addrs *csa,
+					enum jnl_record_type rectype, blk_hdr_ptr_t blk_ptr, jnl_format_buffer *jfb,
+					gd_region *reg, jnl_private_control *jpc, jnl_record *jnl_rec);
 
 #endif
diff --git a/sr_port/jnl_write_aimg_rec.c b/sr_port/jnl_write_aimg_rec.c
old mode 100755
new mode 100644
index 0dae43a..fea04ba
--- a/sr_port/jnl_write_aimg_rec.c
+++ b/sr_port/jnl_write_aimg_rec.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	*
@@ -37,47 +37,38 @@ GBLREF	mstr			pvt_crypt_buf;
 
 void jnl_write_aimg_rec(sgmnt_addrs *csa, cw_set_element *cse, uint4 com_csum)
 {
-	struct_jrec_blk		aimg_record;
-	int			tmp_jrec_size, jrec_size, zero_len;
-	jnl_format_buffer 	blk_trailer;	/* partial record after the aimg block */
-	char			local_buff[JNL_REC_START_BNDRY + JREC_SUFFIX_SIZE];
-	jrec_suffix		*suffix;
 	blk_hdr_ptr_t		buffer, save_buffer;
+	boolean_t		in_phase2;
+	boolean_t		use_new_key;
+	char			*in, *out;
+	gd_segment		*seg;
+	int			in_len, gtmcrypt_errno;
+	int			tmp_jrec_size;
 	jnl_private_control	*jpc;
 	sgmnt_data_ptr_t	csd;
+	struct_jrec_blk		aimg_record;
 	uint4			cursum;
-	char			*in, *out;
-	int			in_len, gtmcrypt_errno;
-	gd_segment		*seg;
-	boolean_t		use_new_key;
 
 	csd = csa->hdr;
-	assert(csa->now_crit);
 	jpc = csa->jnl;
 	assert(0 != jpc->pini_addr);
 	aimg_record.prefix.jrec_type = JRT_AIMG;
 	aimg_record.prefix.pini_addr = (0 == jpc->pini_addr) ? JNL_HDR_LEN : jpc->pini_addr;
-	aimg_record.prefix.tn = csa->ti->curr_tn;
+	in_phase2 = IN_PHASE2_JNL_COMMIT(csa);
+	aimg_record.prefix.tn = JB_CURR_TN_APPROPRIATE(in_phase2, jpc, csa);
 	/* At this point jgbl.gbl_jrec_time should be set by the caller */
 	assert(jgbl.gbl_jrec_time);
 	aimg_record.prefix.time = jgbl.gbl_jrec_time;
 	aimg_record.prefix.checksum = INIT_CHECKSUM_SEED;
 	aimg_record.blknum = cse->blk;
-	/* in case we have a bad block-size, we dont want to write an AIMG larger than the GDS block size (maximum block size) */
+	/* in case we have a bad block-size, we don't want to write an AIMG larger than the GDS block size (maximum block size) */
 	buffer = (blk_hdr_ptr_t)cse->new_buff;
 	assert(buffer->bsiz <= csd->blk_size);
 	assert(buffer->bsiz >= SIZEOF(blk_hdr));
 	aimg_record.bsiz = MIN(csd->blk_size, buffer->bsiz);
 	aimg_record.ondsk_blkver = cse->ondsk_blkver;
 	tmp_jrec_size = (int)FIXED_AIMG_RECLEN + aimg_record.bsiz + JREC_SUFFIX_SIZE;
-	jrec_size = ROUND_UP2(tmp_jrec_size, JNL_REC_START_BNDRY);
-	zero_len = jrec_size - tmp_jrec_size;
-	blk_trailer.buff = local_buff + (JNL_REC_START_BNDRY - zero_len);
-	memset(blk_trailer.buff, 0, zero_len);
-	blk_trailer.record_size = zero_len + JREC_SUFFIX_SIZE;
-	suffix = (jrec_suffix *)&local_buff[JNL_REC_START_BNDRY];
-	aimg_record.prefix.forwptr = suffix->backptr = jrec_size;
-	suffix->suffix_code = JNL_REC_SUFFIX_CODE;
+	aimg_record.prefix.forwptr = ROUND_UP2(tmp_jrec_size, JNL_REC_START_BNDRY);
 	assert(SIZEOF(uint4) == SIZEOF(jrec_suffix));
 	save_buffer = buffer;
 	in_len = aimg_record.bsiz - SIZEOF(*buffer);
@@ -102,6 +93,5 @@ void jnl_write_aimg_rec(sgmnt_addrs *csa, cw_set_element *cse, uint4 com_csum)
 	}
 	cursum = jnl_get_checksum(buffer, NULL, aimg_record.bsiz);
 	COMPUTE_AIMG_CHECKSUM(cursum, &aimg_record, com_csum, aimg_record.prefix.checksum);
-	jnl_write(jpc, JRT_AIMG, (jnl_record *)&aimg_record, buffer, &blk_trailer, NULL);
-	buffer = save_buffer;
+	jnl_write(jpc, JRT_AIMG, (jnl_record *)&aimg_record, buffer);
 }
diff --git a/sr_port/jnl_write_align_rec.c b/sr_port/jnl_write_align_rec.c
new file mode 100644
index 0000000..7eae3bc
--- /dev/null
+++ b/sr_port/jnl_write_align_rec.c
@@ -0,0 +1,50 @@
+/****************************************************************
+ *								*
+ * 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_string.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 "jnl_write.h"
+#include "jnl_get_checksum.h"
+
+void	jnl_write_align_rec(sgmnt_addrs *csa, uint4 align_filler_len, jnl_tm_t time)
+{
+	struct_jrec_align	align_rec;
+	jnl_private_control	*jpc;
+	uint4			align_rec_len;
+
+	/* The below assert is the reason why we have a GET_JREC_CHECKSUM macro */
+	assert(OFFSETOF(struct_jrec_align, checksum) != OFFSETOF(jrec_prefix, checksum));
+	assert(OFFSETOF(struct_jrec_align, checksum) == OFFSETOF(jrec_prefix, pini_addr));
+	assert(SIZEOF(align_rec.checksum) == SIZEOF(((jrec_prefix *)NULL)->checksum));
+	assert(OFFSETOF(struct_jrec_align, time) == OFFSETOF(jrec_prefix, time));
+	assert(SIZEOF(align_rec.time) == SIZEOF(((jrec_prefix *)NULL)->time));
+	align_rec_len = MIN_ALIGN_RECLEN + align_filler_len;
+	jpc = csa->jnl;
+	assert(align_rec_len <= jpc->jnl_buff->max_jrec_len);
+	assert(0 == (align_rec_len % JNL_REC_START_BNDRY));
+	align_rec.jrec_type = JRT_ALIGN;
+	align_rec.forwptr = align_rec_len;
+	align_rec.time = time;
+	align_rec.checksum = INIT_CHECKSUM_SEED;
+	align_rec.checksum = compute_checksum(INIT_CHECKSUM_SEED, (unsigned char *)&align_rec, FIXED_ALIGN_RECLEN);
+	jnl_write(jpc, JRT_ALIGN, (jnl_record *)&align_rec, NULL);
+}
diff --git a/sr_port/jnl_write_attempt.c b/sr_port/jnl_write_attempt.c
old mode 100755
new mode 100644
index bf4488f..9bcd652
--- a/sr_port/jnl_write_attempt.c
+++ b/sr_port/jnl_write_attempt.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	*
@@ -39,6 +39,9 @@
 #include "io.h"                 /* needed by gtmsecshr.h */
 #include "gtmsecshr.h"          /* for continue_proc */
 #include "gtm_c_stack_trace.h"
+#include "sleep.h"
+
+#define	ITERATIONS_100K	100000
 
 GBLREF	jnlpool_addrs	jnlpool;
 GBLREF	uint4		process_id;
@@ -63,6 +66,8 @@ static uint4 jnl_sub_write_attempt(jnl_private_control *jpc, unsigned int *lcnt,
 	/**** Note static/local */
 	static uint4		loop_image_count, writer;	/* assumes calls from one loop at a time */
 	uint4			new_dskaddr, new_dsk;
+	uint4			dskaddr, freeaddr, free, rsrv_freeaddr;
+	uint4			phase2_commit_index1;
 	static uint4		stuck_cnt = 0;
 
 	/* Some callers of jnl_sub_write_attempt (jnl_flush->jnl_write_attempt, jnl_write->jnl_write_attempt) are in
@@ -75,7 +80,7 @@ static uint4 jnl_sub_write_attempt(jnl_private_control *jpc, unsigned int *lcnt,
 	status = ERR_JNLWRTDEFER;
 	csa = &FILE_INFO(jpc->region)->s_addrs;
 	was_crit = csa->now_crit;
-	exact_check = was_crit && (threshold == jb->freeaddr);	/* see comment in jnl_write_attempt() for why this is needed */
+	exact_check = was_crit && (threshold == jb->rsrv_freeaddr); /* see comment in jnl_write_attempt() for why this is needed */
 	while (exact_check ? (jb->dskaddr != threshold) : (jb->dskaddr < threshold))
 	{
 		if (jb->io_in_prog_latch.u.parts.latch_pid == process_id)
@@ -88,10 +93,8 @@ static uint4 jnl_sub_write_attempt(jnl_private_control *jpc, unsigned int *lcnt,
 		if (!jb->io_in_prog_latch.u.parts.latch_pid)
 			status = jnl_qio_start(jpc);
 		if (SS_NORMAL == status)
-		{
 			break;
-		}
-		assert(ERR_JNLWRTNOWWRTR != status);	/* dont have asynchronous jnl writes in Unix */
+		assert(ERR_JNLWRTNOWWRTR != status);	/* don't have asynchronous jnl writes in Unix */
 		if ((ERR_JNLWRTNOWWRTR != status) && (ERR_JNLWRTDEFER != status))
 			return status;
 		if ((writer != CURRENT_JNL_IO_WRITER(jb)) || (1 == *lcnt))
@@ -136,13 +139,30 @@ static uint4 jnl_sub_write_attempt(jnl_private_control *jpc, unsigned int *lcnt,
 		}
 		break;
 	}
-	if ((threshold > jb->freeaddr)
-		|| (csa->now_crit && ((jb->dskaddr > jb->freeaddr) || (jb->free != (jb->freeaddr % jb->size)))))
-	{	/* threshold > jb->freeaddr => somebody decremented jb->freeaddr after we computed threshold, or jnl was switched
-		 * jb->dsk != jb->freeaddr % jb->size => out of design condition
-		 * jb->dskaddr > jb->freeaddr => out of design condition, or jnl was switched
+	/* Note: If phase2 jnl commits are still in progress outside of crit, we cannot accurately compare "jb->free" vs
+	 * "jb->freeaddr" (because a phase2 commit could be updating them as part of the UPDATE_JBP_RSRV_FREEADDR macro).
+	 * "jb->phase2_commit_index1 == jb->phase2_commit_index2" indicates no phase2 commits are in progress.
+	 * In that case, go ahead with the free/freeaddr check.
+	 */
+	rsrv_freeaddr = jb->rsrv_freeaddr;
+	dskaddr = jb->dskaddr;
+	phase2_commit_index1 = jb->phase2_commit_index1;
+	SHM_READ_MEMORY_BARRIER;	/* See "jnl_phase2_cleanup" for comment & corresponding SHM_WRITE_MEMORY_BARRIER */
+	freeaddr = jb->freeaddr;
+	free = jb->free;
+	if ((threshold > rsrv_freeaddr)
+		|| (csa->now_crit
+			&& ((dskaddr > freeaddr)
+				|| ((phase2_commit_index1 == jb->phase2_commit_index2) && ((free != (freeaddr % jb->size)))))))
+	{	/* threshold > jb->rsrv_freeaddr => somebody decremented jb->freeaddr after we computed threshold,
+		 *	OR jnl was switched (in which case we should not be holding crit)
+		 * jb->free != jb->freeaddr % jb->size => out of design condition
+		 * jb->dskaddr > jb->freeaddr => out of design condition, or jnl was switched (again we should not be in crit)
 		 */
 		status = ERR_JNLCNTRL;
+		assert((dskaddr > freeaddr) && gtm_white_box_test_case_enabled
+				&& (WBTEST_JNL_FILE_LOST_DSKADDR == gtm_white_box_test_case_number)
+			|| (JNL_FILE_SWITCHED(jpc) && !was_crit));
 	}
 	return status;
 }
@@ -150,6 +170,7 @@ static uint4 jnl_sub_write_attempt(jnl_private_control *jpc, unsigned int *lcnt,
 uint4 jnl_write_attempt(jnl_private_control *jpc, uint4 threshold)
 {
 	jnl_buffer_ptr_t	jb;
+	uint4			prev_freeaddr;
 	unsigned int		lcnt, prev_lcnt, cnt;
 	sgmnt_addrs		*csa;
 	unsigned int		status;
@@ -161,17 +182,17 @@ uint4 jnl_write_attempt(jnl_private_control *jpc, uint4 threshold)
 	csa = &FILE_INFO(jpc->region)->s_addrs;
 	was_crit = csa->now_crit;
 
-	/* If holding crit and input threshold matches jb->freeaddr, then we need to wait in the loop as long as dskaddr
+	/* If holding crit and input threshold matches jb->rsrv_freeaddr, then we need to wait in the loop as long as dskaddr
 	 * is not EQUAL to threshold. This is because if dskaddr is lesser than threshold we need to wait. If ever it
-	 * becomes greater than threshold, it is an out-of-design situation (since dskaddr has effectively become > freeaddr)
+	 * becomes greater than threshold, it is an out-of-design situation (since dskaddr has effectively become > rsrv_freeaddr)
 	 * and so we need to trigger "jnl_file_lost" which is done in "jnl_sub_write_attempt" so it is important to invoke
 	 * that routine (in the for loop below). Hence the need to do an exact match instead of a < match. If not holding
-	 * crit or input threshold does not match jb->freeaddr, then dskaddr becoming GREATER than threshold is a valid
+	 * crit or input threshold does not match jb->rsrv_freeaddr, then dskaddr becoming GREATER than threshold is a valid
 	 * condition so we should do a (dskaddr < threshold), not a (dskaddr != threshold) check in that case.
 	 */
-	exact_check = was_crit && (threshold == jb->freeaddr);
-	assert(!was_crit || threshold <= jb->freeaddr);
-	/* Check that we either own crit on the current region or we DONT own crit on ANY region. This is relied upon by
+	exact_check = was_crit && (threshold == jb->rsrv_freeaddr);
+	assert(!was_crit || threshold <= jb->rsrv_freeaddr);
+	/* Check that we either own crit on the current region or we don't own crit on ANY region. This is relied upon by
 	 * the grab_crit calls (done in jnl_write_attempt and jnl_sub_write_attempt) to ensure no deadlocks are possible.
 	 */
 	assert(was_crit || (0 == have_crit(CRIT_HAVE_ANY_REG)));
@@ -179,6 +200,36 @@ uint4 jnl_write_attempt(jnl_private_control *jpc, uint4 threshold)
 		(was_crit || (NOJNL != jpc->channel)) && (exact_check ? jb->dskaddr != threshold : jb->dskaddr < threshold);
 		lcnt++, prev_lcnt = lcnt, cnt++)
 	{
+		prev_freeaddr = jb->freeaddr;
+		if (prev_freeaddr < threshold)
+		{
+			JNL_PHASE2_CLEANUP_IF_POSSIBLE(csa, jb); /* phase2 commits in progress. Clean them up if possible */
+			if (prev_freeaddr == jb->freeaddr)
+			{	/* No cleanup happened implies process in phase2 commit is still alive.
+				 * Give it some time to finish its job. Not sleeping here could result in a spinloop
+				 * below (due to the "continue" below under the "SS_NORMAL == status" if check).
+				 */
+				BG_TRACE_PRO_ANY(csa, jnl_phase2_cleanup_if_possible);
+				SLEEP_USEC(1, FALSE);
+				if (!was_crit && (0 == (lcnt % ITERATIONS_100K)))
+				{	/* We do not have crit and have slept a while (100K iterations of 1-micro-second each
+					 * == a total of ~ 100 milli-seconds). See if crit can be obtained that way the
+					 * JNL_PHASE2_CLEANUP_IF_POSSIBLE macro will attempt "jnl_phase2_salvage" if needed.
+					 * An example scenario where this is needed is if a process is in "gds_rundown"->"jnl_wait"
+					 * and does not hold crit but has written journal records after those written by another
+					 * process which was kill -9ed in phase2 of its jnl commit. Not doing this check would
+					 * cause the process in gds_rundown to be indefinitely stuck in "jnl_wait".
+					 */
+					if (grab_crit_immediate(jpc->region, OK_FOR_WCS_RECOVER_TRUE))
+					{
+						JNL_PHASE2_CLEANUP_IF_POSSIBLE(csa, jb); /* phase2 commits in progress.
+											  * Clean them up if possible.
+											  */
+						rel_crit(jpc->region);
+					}
+				}
+			}
+		}
 		status = jnl_sub_write_attempt(jpc, &lcnt, threshold);
 		if (JNL_FILE_SWITCHED(jpc))
 		{	/* If we are holding crit, the journal file switch could happen in the form of journaling getting
@@ -209,28 +260,22 @@ uint4 jnl_write_attempt(jnl_private_control *jpc, uint4 threshold)
 				grab_crit(jpc->region);	/* jnl_write_attempt has an assert about have_crit that this relies on */
 			}
 			jnlfile_lost = FALSE;
-			if (jb->free_update_pid)
-			{
-				FIX_NONZERO_FREE_UPDATE_PID(csa, jb);
-			} else
-			{
-				assert((gtm_white_box_test_case_enabled
-					&& (WBTEST_JNL_FILE_LOST_DSKADDR == gtm_white_box_test_case_number))
-				       || TREF(gtm_test_fake_enospc) || WBTEST_ENABLED(WBTEST_RECOVER_ENOSPC));
-				if (JNL_ENABLED(csa->hdr))
-				{	/* We ignore the return value of jnl_file_lost() since we always want to report the journal
-					 * error, whatever its error handling method is.  Also, an operator log will be sent by some
-					 * callers (t_end()) only if an error is returned here, and the operator log is wanted in
-					 * those cases.
-					 */
-					jnl_file_lost(jpc, status);
-					jnlfile_lost = TRUE;
-				}
-				/* Else journaling got closed concurrently by another process by invoking "jnl_file_lost"
-				 * just before we got crit. Do not invoke "jnl_file_lost" again on the same journal file.
-				 * Instead continue and next iteration will detect the journal file has switched and terminate.
+			assert((gtm_white_box_test_case_enabled
+				&& (WBTEST_JNL_FILE_LOST_DSKADDR == gtm_white_box_test_case_number))
+			       || TREF(gtm_test_fake_enospc) || WBTEST_ENABLED(WBTEST_RECOVER_ENOSPC));
+			if (JNL_ENABLED(csa->hdr))
+			{	/* We ignore the return value of jnl_file_lost() since we always want to report the journal
+				 * error, whatever its error handling method is.  Also, an operator log will be sent by some
+				 * callers (t_end()) only if an error is returned here, and the operator log is wanted in
+				 * those cases.
 				 */
+				jnl_file_lost(jpc, status);
+				jnlfile_lost = TRUE;
 			}
+			/* Else journaling got closed concurrently by another process by invoking "jnl_file_lost"
+			 * just before we got crit. Do not invoke "jnl_file_lost" again on the same journal file.
+			 * Instead continue and next iteration will detect the journal file has switched and terminate.
+			 */
 			if (!was_crit)
 				rel_crit(jpc->region);
 			if (!jnlfile_lost)
diff --git a/sr_port/jnl_write_eof_rec.c b/sr_port/jnl_write_eof_rec.c
old mode 100755
new mode 100644
index d249a55..750558c
--- a/sr_port/jnl_write_eof_rec.c
+++ b/sr_port/jnl_write_eof_rec.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	*
@@ -35,10 +35,11 @@ void	jnl_write_eof_rec(sgmnt_addrs *csa, struct_jrec_eof *eof_record)
 {
 	jnl_private_control	*jpc;
 
-	assert(csa->now_crit);
+	assert(!IN_PHASE2_JNL_COMMIT(csa));
 	jpc = csa->jnl;
 	assert((0 != jpc->pini_addr)
-		|| ((off_t)jpc->jnl_buff->freeaddr > ((off_t)DISK_BLOCK_SIZE * jpc->jnl_buff->filesize) - JNL_FILE_TAIL_PRESERVE));
+		|| ((off_t)jpc->jnl_buff->rsrv_freeaddr
+				> ((off_t)DISK_BLOCK_SIZE * jpc->jnl_buff->filesize) - JNL_FILE_TAIL_PRESERVE));
 	eof_record->prefix.jrec_type = JRT_EOF;
 	eof_record->prefix.forwptr = eof_record->suffix.backptr = EOF_RECLEN;
 	eof_record->suffix.suffix_code = JNL_REC_SUFFIX_CODE;
@@ -71,5 +72,5 @@ void	jnl_write_eof_rec(sgmnt_addrs *csa, struct_jrec_eof *eof_record)
 		QWASSIGN(eof_record->jnl_seqno, jgbl.mur_jrec_seqno);
 	eof_record->filler = 0;
 	eof_record->prefix.checksum = compute_checksum(INIT_CHECKSUM_SEED, (unsigned char *)eof_record, SIZEOF(struct_jrec_eof));
-	jnl_write(jpc, JRT_EOF, (jnl_record *)eof_record, NULL, NULL, NULL);
+	jnl_write(jpc, JRT_EOF, (jnl_record *)eof_record, NULL);
 }
diff --git a/sr_port/jnl_write_epoch_rec.c b/sr_port/jnl_write_epoch_rec.c
old mode 100755
new mode 100644
index 0161566..053a4cd
--- a/sr_port/jnl_write_epoch_rec.c
+++ b/sr_port/jnl_write_epoch_rec.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,17 +12,9 @@
 
 #include "mdef.h"
 
-#if defined(UNIX)
 #include "gtm_fcntl.h"
 #include "gtm_unistd.h"
 #include "eintr_wrappers.h"
-#elif defined(VMS)
-#include <descrip.h> /* Required for gtmsource.h */
-#include <rms.h>
-#include <iodef.h>
-#include <efndef.h>
-#include "iosb_disk.h"
-#endif
 #include "gtm_inet.h"
 
 #include "gtm_time.h"
@@ -45,10 +37,7 @@
 GBLREF 	jnl_gbls_t		jgbl;
 GBLREF  jnlpool_ctl_ptr_t	jnlpool_ctl;
 GBLREF	seq_num			seq_num_zero;
-
-#ifdef UNIX
 GBLREF	int4			strm_index;
-#endif
 
 error_def	(ERR_PREMATEOF);
 
@@ -60,13 +49,10 @@ void	jnl_write_epoch_rec(sgmnt_addrs *csa)
 	jnl_file_header		*header;
 	unsigned char		hdr_base[REAL_JNL_HDR_LEN + MAX_IO_BLOCK_SIZE];
 	sgmnt_data_ptr_t	csd;
-#if defined(VMS)
-	io_status_block_disk	iosb;
-#endif
 	uint4			jnl_fs_block_size, read_write_size;
 	int			idx;
 
-	assert(csa->now_crit);
+	assert(!IN_PHASE2_JNL_COMMIT(csa));
 	jpc = csa->jnl;
 	jb = jpc->jnl_buff;
 	assert((csa->ti->early_tn == csa->ti->curr_tn) || (csa->ti->early_tn == csa->ti->curr_tn + 1));
@@ -93,7 +79,7 @@ void	jnl_write_epoch_rec(sgmnt_addrs *csa)
 	ASSERT_JNL_SEQNO_FILEHDR_JNLPOOL(csd, jnlpool_ctl);	/* debug-only sanity check between seqno of filehdr and jnlpool */
 	if (jgbl.forw_phase_recovery)
 	{	/* Set jnl-seqno of epoch record from the current seqno that rollback is playing. Note that in case of -recover
-		 * we dont actually care what seqnos get assigned to the epoch record so we go ahead and set it to the same
+		 * we don't actually care what seqnos get assigned to the epoch record so we go ahead and set it to the same
 		 * fields even though those might be 0 or not.
 		 */
 		epoch_record.jnl_seqno = jgbl.mur_jrec_seqno;
@@ -128,24 +114,21 @@ void	jnl_write_epoch_rec(sgmnt_addrs *csa)
 			header->eov_tn = jb->eov_tn;
 			header->eov_timestamp = jb->eov_timestamp;
 			header->end_seqno = jb->end_seqno;
-#			ifdef UNIX
 			/* Keep header->strm_end_seqno[] uptodate as well if applicable */
 			if (INVALID_SUPPL_STRM != strm_index)
 			{
 				for (idx = 0; idx < MAX_SUPPL_STRMS; idx++)
 					header->strm_end_seqno[idx] = jb->strm_end_seqno[idx];
 			}
-#			endif
 			JNL_DO_FILE_WRITE(csa, csd->jnl_file_name,
 				jpc->channel, 0, header, read_write_size, jpc->status, jpc->status2);
 			/* for abnormal status do not do anything. journal file header will have previous end_of_data */
 		}
 	}
-	jb->end_of_data = jb->freeaddr;
+	jb->end_of_data = jb->rsrv_freeaddr;
 	jb->eov_tn = csa->ti->curr_tn;
 	jb->eov_timestamp = jgbl.gbl_jrec_time;
 	jb->end_seqno = epoch_record.jnl_seqno;
-#	ifdef UNIX
 	/* Keep header->strm_end_seqno[] uptodate as well if applicable */
 	if (INVALID_SUPPL_STRM != strm_index)
 	{
@@ -163,10 +146,9 @@ void	jnl_write_epoch_rec(sgmnt_addrs *csa)
 		for (idx = 0; idx < MAX_SUPPL_STRMS; idx++)
 			jb->strm_end_seqno[idx] = csd->strm_reg_seqno[idx];
 	}
-#	endif
 	epoch_record.filler = 0;
 	epoch_record.prefix.checksum = compute_checksum(INIT_CHECKSUM_SEED,
 								(unsigned char *)&epoch_record, SIZEOF(struct_jrec_epoch));
-	jnl_write(jpc, JRT_EPOCH, (jnl_record *)&epoch_record, NULL, NULL, NULL);
-	jb->post_epoch_freeaddr = jb->freeaddr;
+	jnl_write(jpc, JRT_EPOCH, (jnl_record *)&epoch_record, NULL);
+	jb->post_epoch_freeaddr = jb->rsrv_freeaddr;
 }
diff --git a/sr_port/jnl_write_extend_if_needed.c b/sr_port/jnl_write_extend_if_needed.c
new file mode 100644
index 0000000..0d321f6
--- /dev/null
+++ b/sr_port/jnl_write_extend_if_needed.c
@@ -0,0 +1,100 @@
+/****************************************************************
+ *								*
+ * 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 "gdsroot.h"
+#include "gtm_facility.h"
+#include "gdsbt.h"
+#include "gdsblk.h"
+#include "gdsfhead.h"
+#include "filestruct.h"
+#include "jnl.h"
+#include "jnl_write.h"
+#include "jnl_get_checksum.h"
+
+GBLREF	boolean_t		in_jnl_file_autoswitch;
+
+/* Success : returns 0
+ * Failure : returns -1
+ */
+int jnl_write_extend_if_needed(int4 jrec_len, jnl_buffer_ptr_t jb, uint4 lcl_freeaddr, sgmnt_addrs *csa,
+					enum jnl_record_type rectype, blk_hdr_ptr_t blk_ptr, jnl_format_buffer *jfb,
+					gd_region *reg, jnl_private_control *jpc, jnl_record *jnl_rec)
+{
+	int4			jrec_len_padded;
+	int4			blocks_needed;
+	boolean_t		do_extend;
+
+	/* Before writing a journal record, check if we have some padding space to close the journal file in case we
+	 * are on the verge of an autoswitch. If we are about to autoswitch the journal file at this point, don't do
+	 * the padding check since the padding space has already been checked in jnl_write calls before this autoswitch
+	 * invocation. We can safely write the input record without worrying about autoswitch limit overflow.
+	 */
+	jrec_len_padded = jrec_len;
+	if (!in_jnl_file_autoswitch)
+		jrec_len_padded = jrec_len + JNL_FILE_TAIL_PRESERVE;
+	blocks_needed = DISK_BLOCKS_SUM(lcl_freeaddr, jrec_len_padded);
+	do_extend = jb->last_eof_written || (jb->filesize < blocks_needed);
+	if (do_extend)
+	{	/* not enough room in jnl file, extend it */
+		/* We should never reach here if we are called from t_end/tp_tend. We check that by using the fact that
+		 * early_tn is different from curr_tn in the t_end/tp_tend case. The only exception is wcs_recover which
+		 * also sets these to be different in case of writing an INCTN record. For this case though it is okay to
+		 * extend/autoswitch the file. So allow that.
+		 */
+		if (!jb->last_eof_written)
+		{
+			assertpro((csa->ti->early_tn == csa->ti->curr_tn) || (JRT_INCTN == rectype));
+			assert(!IS_REPLICATED(rectype)); /* all replicated jnl records should have gone through t_end/tp_tend */
+			assert(jrt_fixed_size[rectype]); /* this is used later in re-computing checksums */
+		}
+		assert(NULL == blk_ptr);	/* as otherwise it is a PBLK or AIMG record which is of variable record
+						 * length that conflicts with the immediately above assert.
+						 */
+		assert(NULL == jfb);		/* as otherwise it is a logical record with formatted journal records which
+						 * is of variable record length (conflicts with the jrt_fixed_size assert).
+						 */
+		assertpro(!in_jnl_file_autoswitch);	/* avoid recursion of jnl_file_extend */
+		if (SS_NORMAL != jnl_flush(reg))
+		{
+			assert(NOJNL == jpc->channel); /* jnl file lost */
+			return -1; /* let the caller handle the error */
+		}
+		assert(lcl_freeaddr == jb->dskaddr);
+		if (EXIT_ERR == jnl_file_extend(jpc, jrec_len))
+			return -1; /* let the caller handle the error */
+		assert(!jb->last_eof_written);
+		if (0 == jpc->pini_addr)
+		{	/* This can happen only if jnl got switched in jnl_file_extend above.
+			 * Write a PINI record in the new journal file and then continue writing the input record.
+			 * Basically we need to redo the processing in jnl_write because a lot of the local variables
+			 * have changed state (e.g. JB->freeaddr etc.). So we instead call "jnl_write"
+			 * recursively and then return immediately.
+			 */
+			jnl_write_pini(csa);
+			assertpro(jpc->pini_addr);	/* should have been set in "jnl_write_pini" */
+			if (JRT_PINI != rectype)
+			{
+				assert(JRT_ALIGN != rectype); /* need this assert so it is safe to do "prefix.pini_addr" below */
+				jnl_rec->prefix.pini_addr = jpc->pini_addr;
+				/* Checksum needs to be recomputed since prefix.pini_addr is changed in above statement */
+				jnl_rec->prefix.checksum = INIT_CHECKSUM_SEED;
+				jnl_rec->prefix.checksum = compute_checksum(INIT_CHECKSUM_SEED, (unsigned char *)jnl_rec,
+													jnl_rec->prefix.forwptr);
+				jnl_write(jpc, rectype, jnl_rec, NULL);
+			}
+			return -1; /* let the caller handle the error */
+		}
+	}
+	return 0;
+}
diff --git a/sr_port/jnl_write_inctn_rec.c b/sr_port/jnl_write_inctn_rec.c
old mode 100755
new mode 100644
index 886b166..e2b1d5a
--- a/sr_port/jnl_write_inctn_rec.c
+++ b/sr_port/jnl_write_inctn_rec.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,9 +12,6 @@
 
 #include "mdef.h"
 
-#ifdef VMS
-#include <descrip.h> /* Required for gtmsource.h */
-#endif
 #include "gtm_inet.h"
 
 #include "gtm_time.h"
@@ -40,12 +37,11 @@ void	jnl_write_inctn_rec(sgmnt_addrs	*csa)
 {
 	struct_jrec_inctn	inctn_record;
 	jnl_private_control	*jpc;
+	boolean_t		in_phase2;
 	DEBUG_ONLY(int		inctn_detail_size;)
 
-	assert(csa->now_crit);
 	jpc = csa->jnl;
 	assert(0 != jpc->pini_addr);
-	assert((csa->ti->early_tn == csa->ti->curr_tn) || (csa->ti->early_tn == csa->ti->curr_tn + 1));
 	inctn_record.prefix.jrec_type = JRT_INCTN;
 	inctn_record.prefix.forwptr = INCTN_RECLEN;
 	assert(&inctn_detail.blknum_struct.suffix == &inctn_detail.blks2upgrd_struct.suffix);
@@ -58,7 +54,9 @@ void	jnl_write_inctn_rec(sgmnt_addrs	*csa)
 	/* At this point jgbl.gbl_jrec_time should be set by the caller */
 	assert(jgbl.gbl_jrec_time);
 	inctn_record.prefix.time = jgbl.gbl_jrec_time;
-	inctn_record.prefix.tn = csa->ti->curr_tn;
+	in_phase2 = IN_PHASE2_JNL_COMMIT(csa);
+	assert(in_phase2 || (csa->ti->early_tn == csa->ti->curr_tn) || (csa->ti->early_tn == csa->ti->curr_tn + 1));
+	inctn_record.prefix.tn = JB_CURR_TN_APPROPRIATE(in_phase2, jpc, csa);
 	inctn_record.prefix.checksum = INIT_CHECKSUM_SEED;
 	assert((inctn_opcode_total > inctn_opcode) && (inctn_invalid_op < inctn_opcode));
 	/* Assert that the maximum inctn opcode # will fit in the "opcode" field in the inctn jnl record.
@@ -76,5 +74,5 @@ void	jnl_write_inctn_rec(sgmnt_addrs	*csa)
 	inctn_record.detail = inctn_detail;
 	inctn_record.prefix.checksum = compute_checksum(INIT_CHECKSUM_SEED,
 								(unsigned char *)&inctn_record, SIZEOF(struct_jrec_inctn));
-	jnl_write(jpc, JRT_INCTN, (jnl_record *)&inctn_record, NULL, NULL, NULL);
+	jnl_write(jpc, JRT_INCTN, (jnl_record *)&inctn_record, NULL);
 }
diff --git a/sr_port/jnl_write_logical.c b/sr_port/jnl_write_logical.c
old mode 100755
new mode 100644
index 34b57d8..9debf7f
--- a/sr_port/jnl_write_logical.c
+++ b/sr_port/jnl_write_logical.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,6 +34,7 @@
 #include "jnl_get_checksum.h"
 #ifdef DEBUG
 #include "jnl_typedef.h"
+#include "wbox_test_init.h"
 #endif
 
 GBLREF	jnl_fence_control	jnl_fence_ctl;
@@ -42,28 +43,31 @@ GBLREF 	jnl_gbls_t		jgbl;
 GBLREF	seq_num			seq_num_zero;
 
 /* This called for TP and non-TP, but not for ZTP */
-void	jnl_write_logical(sgmnt_addrs *csa, jnl_format_buffer *jfb, uint4 com_csum, jnlpool_write_ctx_t *jplctx)
+void	jnl_write_logical(sgmnt_addrs *csa, jnl_format_buffer *jfb, uint4 com_csum)
 {
 	struct_jrec_upd		*jrec;
 	struct_jrec_null	*jrec_null;
 	struct_jrec_upd		*jrec_alt;
 	jnl_private_control	*jpc;
+	boolean_t		in_phase2;
+
 	/* If REPL_WAS_ENABLED(csa) is TRUE, then we would not have gone through the code that initializes
 	 * jgbl.gbl_jrec_time or jpc->pini_addr. But in this case, we are not writing the journal record
 	 * to the journal buffer or journal file but write it only to the journal pool from where it gets
 	 * sent across to the update process that does not care about these fields so it is ok to leave them as is.
 	 */
 	jpc = csa->jnl;
-	assert((0 != jpc->pini_addr) || REPL_WAS_ENABLED(csa));
+	assert((0 != jpc->pini_addr) || REPL_WAS_ENABLED(csa)
+		|| (gtm_white_box_test_case_enabled && (WBTEST_JNL_FILE_LOST_DSKADDR == gtm_white_box_test_case_number)));
 	assert(jgbl.gbl_jrec_time || REPL_WAS_ENABLED(csa));
-	assert(csa->now_crit);
 	assert(IS_SET_KILL_ZKILL_ZTWORM_LGTRIG_ZTRIG(jfb->rectype) || (JRT_NULL == jfb->rectype));
 	assert(!IS_ZTP(jfb->rectype));
 	jrec = (struct_jrec_upd *)jfb->buff;
 	assert(OFFSETOF(struct_jrec_null, prefix) == OFFSETOF(struct_jrec_upd, prefix));
 	assert(SIZEOF(jrec_null->prefix) == SIZEOF(jrec->prefix));
 	jrec->prefix.pini_addr = (0 == jpc->pini_addr) ? JNL_HDR_LEN : jpc->pini_addr;
-	jrec->prefix.tn = csa->ti->curr_tn;
+	in_phase2 = IN_PHASE2_JNL_COMMIT(csa);
+	jrec->prefix.tn = JB_CURR_TN_APPROPRIATE(in_phase2, jpc, csa);
 	jrec->prefix.time = jgbl.gbl_jrec_time;
 	/* t_end/tp_tend/mur_output_record has already set token/jnl_seqno into jnl_fence_ctl.token */
 	assert((0 != jnl_fence_ctl.token) || (!dollar_tlevel && !jgbl.forw_phase_recovery && !REPL_ENABLED(csa))
@@ -75,10 +79,9 @@ void	jnl_write_logical(sgmnt_addrs *csa, jnl_format_buffer *jfb, uint4 com_csum,
 	assert(SIZEOF(jrec_null->strm_seqno) == SIZEOF(jrec->strm_seqno));
 	jrec->strm_seqno = jnl_fence_ctl.strm_seqno;
 	/* update checksum below */
-	if(JRT_NULL != jrec->prefix.jrec_type)
-	{
+	if (JRT_NULL != jrec->prefix.jrec_type)
 		COMPUTE_LOGICAL_REC_CHECKSUM(jfb->checksum, jrec, com_csum, jrec->prefix.checksum);
-	} else
+	else
 		jrec->prefix.checksum = compute_checksum(INIT_CHECKSUM_SEED, (unsigned char *)jrec, SIZEOF(struct_jrec_null));
 	if (REPL_ALLOWED(csa) && USES_ANY_KEY(csa->hdr))
 	{
@@ -88,5 +91,5 @@ void	jnl_write_logical(sgmnt_addrs *csa, jnl_format_buffer *jfb, uint4 com_csum,
 		jrec_alt->strm_seqno = jrec->strm_seqno;
 		jrec_alt->num_participants = jrec->num_participants;
 	}
-	JNL_WRITE_APPROPRIATE(csa, jpc, jfb->rectype, (jnl_record *)jrec, NULL, jfb, jplctx);
+	JNL_WRITE_APPROPRIATE(csa, jpc, jfb->rectype, (jnl_record *)jrec, jfb);
 }
diff --git a/sr_port/jnl_write_multi_align_rec.c b/sr_port/jnl_write_multi_align_rec.c
new file mode 100644
index 0000000..e4ca64c
--- /dev/null
+++ b/sr_port/jnl_write_multi_align_rec.c
@@ -0,0 +1,63 @@
+/****************************************************************
+ *								*
+ * 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 "gtm_facility.h"
+#include "fileinfo.h"
+#include "gdsbt.h"
+#include "gdsblk.h"
+#include "gdsfhead.h"
+#include "filestruct.h"
+#include "jnl.h"
+
+void	jnl_write_multi_align_rec(sgmnt_addrs *csa, uint4 align_filler_len, jnl_tm_t time)
+{
+	jnl_buffer_ptr_t	jbp;
+	uint4			alignsize, max_filler_len, max_jrec_len, orig_align_filler_len;
+	uint4			filler_len1, filler_len2;
+
+	jbp = csa->jnl->jnl_buff;
+	alignsize = jbp->alignsize;
+	max_jrec_len = jbp->max_jrec_len;
+	assert(max_jrec_len < alignsize);
+	max_filler_len = max_jrec_len - MIN_ALIGN_RECLEN;
+	DEBUG_ONLY(orig_align_filler_len = align_filler_len);
+	while (align_filler_len > max_jrec_len)
+	{
+		jnl_write_align_rec(csa, max_filler_len, time);	/* this will write an ALIGN record of size
+								 * MIN_ALIGN_RECLEN + max_filler_len == max_jrec_len.
+								 */
+		align_filler_len -= max_jrec_len;
+	}
+	/* At this point, "align_filler_len <= max_jrec_len" */
+	if (max_filler_len >= align_filler_len)
+	{	/* Simple case. Write one JRT_ALIGN and return */
+		jnl_write_align_rec(csa, align_filler_len, time);
+		return;
+	}
+	/* At this point, "max_filler_len < align_filler_len <= max_jrec_len". This is an edge case.
+	 * We need to write two ALIGN records to ensure that
+	 *	a) Record size of each of the two ALIGN records stays within "max_jrec_len" AND
+	 *	b) Total size of the two ALIGN records == align_filler_len + MIN_ALIGN_RECLEN;
+	 */
+	assert(MIN_ALIGN_RECLEN < max_filler_len);
+	filler_len1 = max_filler_len - MIN_ALIGN_RECLEN; /* align rec_size1 = filler_len1 + MIN_ALIGN_RECLEN == max_filler_len */
+	filler_len2 = align_filler_len - max_filler_len; /* align rec_size2 = filler_len2 + MIN_ALIGN_RECLEN */
+	/* rec_size1 + rec_size2 = max_filler_len + ((align_filler_len - max_filler_len) + MIN_ALIGN_RECLEN)
+	 *                       == align_filler_len + MIN_ALIGN_RECLEN
+	 */
+	jnl_write_align_rec(csa, filler_len1, time);
+	jnl_write_align_rec(csa, filler_len2, time);
+	return;
+}
diff --git a/sr_port/jnl_write_pblk.c b/sr_port/jnl_write_pblk.c
old mode 100755
new mode 100644
index c2d4c84..53f454a
--- a/sr_port/jnl_write_pblk.c
+++ b/sr_port/jnl_write_pblk.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,44 +34,64 @@
 GBLREF 	jnl_gbls_t		jgbl;
 GBLREF	boolean_t		dse_running;
 
-void	jnl_write_pblk(sgmnt_addrs *csa, cw_set_element *cse, blk_hdr_ptr_t buffer, uint4 com_csum)
+void	jnl_write_pblk(sgmnt_addrs *csa, cw_set_element *cse, uint4 com_csum)
 {
-	struct_jrec_blk		pblk_record;
-	int			tmp_jrec_size, jrec_size, zero_len;
-	jnl_format_buffer 	blk_trailer;
-	char			local_buff[JNL_REC_START_BNDRY + JREC_SUFFIX_SIZE];
-	jrec_suffix		*suffix;
+	blk_hdr_ptr_t		old_block;
+	int			tmp_jrec_size;
+	jnl_buffer_ptr_t	jbp;
 	jnl_private_control	*jpc;
+	sgmnt_data_ptr_t	csd;
+	struct_jrec_blk		pblk_record;
+	unsigned int		bsiz;
+#	ifdef DEBUG
+	blk_hdr_ptr_t		save_old_block;
+#	endif
 
-	assert(csa->now_crit);
+	csd = csa->hdr;
+	assert(IN_PHASE2_JNL_COMMIT(csa));
+	old_block = (blk_hdr_ptr_t)cse->old_block;
+	ASSERT_IS_WITHIN_SHM_BOUNDS((sm_uc_ptr_t)old_block, csa);
+	/* Assert that cr corresponding to old_block is pinned in shared memory */
+	DBG_ENSURE_OLD_BLOCK_IS_VALID(cse, (dba_mm == csd->acc_meth), csa, csd);
+	bsiz = old_block->bsiz;
+	bsiz = MIN(bsiz, csd->blk_size);	/* be safe in PRO */
+	if (!cse->blk_checksum)
+		cse->blk_checksum = jnl_get_checksum(old_block, csa, bsiz);
+	else
+		assert(cse->blk_checksum == jnl_get_checksum(old_block, csa, bsiz));
+	if (NEEDS_ANY_KEY(csd, old_block->tn))
+	{
+		DBG_ENSURE_PTR_IS_VALID_GLOBUFF(csa, csd, (sm_uc_ptr_t)old_block);
+		DEBUG_ONLY(save_old_block = old_block;)
+		old_block = (blk_hdr_ptr_t)GDS_ANY_ENCRYPTGLOBUF(old_block, csa);
+		/* Ensure that unencrypted block and its twin counterpart are in sync. */
+		assert(save_old_block->tn == old_block->tn);
+		assert(save_old_block->bsiz == old_block->bsiz);
+		assert(save_old_block->levl == old_block->levl);
+		DBG_ENSURE_PTR_IS_VALID_ENCTWINGLOBUFF(csa, csd, (sm_uc_ptr_t)old_block);
+	}
 	jpc = csa->jnl;
 	assert(0 != jpc->pini_addr);
 	pblk_record.prefix.jrec_type = JRT_PBLK;
 	pblk_record.prefix.pini_addr = (0 == jpc->pini_addr) ? JNL_HDR_LEN : jpc->pini_addr;
-	pblk_record.prefix.tn = csa->ti->curr_tn;
+	pblk_record.prefix.tn = JB_CURR_TN_APPROPRIATE(TRUE, jpc, csa);
 	/* At this point jgbl.gbl_jrec_time should be set by the caller */
 	assert(jgbl.gbl_jrec_time);
 	pblk_record.prefix.time = jgbl.gbl_jrec_time;
 	pblk_record.blknum = cse->blk;
-	/* in case we have a bad block-size, we dont want to write a PBLK larger than the GDS block size (maximum block size).
+	/* in case we have a bad block-size, we don't want to write a PBLK larger than the GDS block size (maximum block size).
 	 * in addition, check that checksum computed in t_end/tp_tend did take the adjusted bsiz into consideration.
 	 */
-	assert(buffer->bsiz <= csa->hdr->blk_size || dse_running);
-	pblk_record.bsiz = MIN(csa->hdr->blk_size, buffer->bsiz);
-	assert((pblk_record.bsiz == buffer->bsiz) ||
-	       (cse->blk_checksum == jnl_get_checksum(buffer, NULL, pblk_record.bsiz)));
+	assert(old_block->bsiz <= csd->blk_size || dse_running);
+	pblk_record.bsiz = bsiz;
+	assert((pblk_record.bsiz == old_block->bsiz) || (cse->blk_checksum == jnl_get_checksum(old_block, NULL, pblk_record.bsiz)));
 	assert(pblk_record.bsiz >= SIZEOF(blk_hdr) || dse_running);
 	pblk_record.ondsk_blkver = cse->ondsk_blkver;
 	tmp_jrec_size = (int)FIXED_PBLK_RECLEN + pblk_record.bsiz + JREC_SUFFIX_SIZE;
-	jrec_size = ROUND_UP2(tmp_jrec_size, JNL_REC_START_BNDRY);
-	zero_len = jrec_size - tmp_jrec_size;
-	blk_trailer.buff = local_buff + (JNL_REC_START_BNDRY - zero_len);
-	memset(blk_trailer.buff, 0, zero_len);
-	blk_trailer.record_size = zero_len + JREC_SUFFIX_SIZE;
-	suffix = (jrec_suffix *)&local_buff[JNL_REC_START_BNDRY];
-	pblk_record.prefix.forwptr = suffix->backptr = jrec_size;
+	pblk_record.prefix.forwptr = ROUND_UP2(tmp_jrec_size, JNL_REC_START_BNDRY);
 	COMPUTE_PBLK_CHECKSUM(cse->blk_checksum, &pblk_record, com_csum, pblk_record.prefix.checksum);
-	suffix->suffix_code = JNL_REC_SUFFIX_CODE;
 	assert(SIZEOF(uint4) == SIZEOF(jrec_suffix));
-	jnl_write(jpc, JRT_PBLK, (jnl_record *)&pblk_record, buffer, &blk_trailer, NULL);
+	jnl_write(jpc, JRT_PBLK, (jnl_record *)&pblk_record, old_block);
+	jbp = jpc->jnl_buff;
+	cse->jnl_freeaddr = JB_FREEADDR_APPROPRIATE(TRUE, jpc, jbp);
 }
diff --git a/sr_port/jnl_write_pblk.h b/sr_port/jnl_write_pblk.h
old mode 100755
new mode 100644
index 47d2e81..14b3b16
--- a/sr_port/jnl_write_pblk.h
+++ b/sr_port/jnl_write_pblk.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	*
@@ -13,7 +14,7 @@
 #define __JNL_WRITE_PBLK_H__
 
 /* We do not put this in jnl.h, because it needs all including jnl.h must include gdsblk.h */
-void jnl_write_pblk(sgmnt_addrs *csa, cw_set_element *cse, blk_hdr_ptr_t buffer, uint4 com_csum);
+void jnl_write_pblk(sgmnt_addrs *csa, cw_set_element *cse, uint4 com_csum);
 
 #endif
 
diff --git a/sr_port/jnl_put_jrt_pfin.c b/sr_port/jnl_write_pfin.c
old mode 100755
new mode 100644
similarity index 89%
rename from sr_port/jnl_put_jrt_pfin.c
rename to sr_port/jnl_write_pfin.c
index 1bb3a74..f38c23d
--- a/sr_port/jnl_put_jrt_pfin.c
+++ b/sr_port/jnl_write_pfin.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	*
@@ -26,12 +26,12 @@
 
 GBLREF 	jnl_gbls_t		jgbl;
 
-void	jnl_put_jrt_pfin(sgmnt_addrs *csa)
+void	jnl_write_pfin(sgmnt_addrs *csa)
 {
 	struct_jrec_pfin	pfin_record;
 	jnl_private_control	*jpc;
 
-	assert(csa->now_crit);
+	assert(!IN_PHASE2_JNL_COMMIT(csa));
 	jpc = csa->jnl;
 	assert((0 != jpc->pini_addr) ||
 			(gtm_white_box_test_case_enabled && (WBTEST_JNL_FILE_LOST_DSKADDR == gtm_white_box_test_case_number)));
@@ -46,5 +46,5 @@ void	jnl_put_jrt_pfin(sgmnt_addrs *csa)
 	pfin_record.prefix.checksum = INIT_CHECKSUM_SEED;
 	pfin_record.filler = 0;
 	pfin_record.prefix.checksum = compute_checksum(INIT_CHECKSUM_SEED, (unsigned char *)&pfin_record, SIZEOF(struct_jrec_pfin));
-	jnl_write(jpc, JRT_PFIN, (jnl_record *)&pfin_record, NULL, NULL, NULL);
+	jnl_write(jpc, JRT_PFIN, (jnl_record *)&pfin_record, NULL);
 }
diff --git a/sr_port/jnl_write_phase2.c b/sr_port/jnl_write_phase2.c
new file mode 100644
index 0000000..459955f
--- /dev/null
+++ b/sr_port/jnl_write_phase2.c
@@ -0,0 +1,179 @@
+/****************************************************************
+ *								*
+ * 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 "gdsroot.h"
+#include "gtm_facility.h"
+#include "fileinfo.h"
+#include "gdsbt.h"
+#include "gdsfhead.h"
+#include "filestruct.h"
+#include "gdscc.h"
+#include "jnl.h"
+#include "jnl_typedef.h"
+#include "jnl_get_checksum.h"
+#include "jnl_write_pblk.h"
+#include "jnl_write_aimg_rec.h"
+#include "jnl_write.h"
+
+GBLREF	jnl_gbls_t	jgbl;
+GBLREF	uint4		process_id;
+
+void	jnl_write_phase2(sgmnt_addrs *csa, jbuf_rsrv_struct_t *jrs)
+{
+	boolean_t		need_pini_adjustment;	/* TRUE => first ALIGN needs to set pini_addr of JNL_FILE_FIRST_RECORD */
+	cw_set_element		*cse;
+	enum jnl_record_type	rectype;
+	jnl_buffer_ptr_t	jbp;
+	jnl_format_buffer	*jfb;
+	jnl_private_control	*jpc;
+	struct_jrec_tcom	*tcom_record_ptr;
+	jrec_rsrv_elem_t	*first_jre, *jre, *jre_top;
+	uint4			common_csum, pini_addr, reclen, freeaddr, prev_freeaddr, start_freeaddr;
+	void			*param1;
+	jbuf_phase2_in_prog_t	*phs2cmt;
+	int			commit_index;
+	boolean_t		write_to_jnlbuff, write_to_jnlpool;
+
+	assert(JNL_ALLOWED(csa));
+	assert(NULL != jrs);
+	assert(jrs->tot_jrec_len);
+	jpc = csa->jnl;
+	common_csum = 0;
+	write_to_jnlbuff = JNL_ENABLED(csa);
+	assert(write_to_jnlbuff || REPL_ALLOWED(csa));
+	first_jre = jrs->jrs_array;
+	jre_top = first_jre + jrs->usedlen;
+	/* Note: In REPL_WAS_ALLOWED case, "write_to_jnlbuff" will be FALSE and so pini_addr etc. won't be initialized in
+	 * the logical jnl records we write to the jnlpool. But that is okay since the update process does not care about
+	 * these fields in the jnl record anyways. Also see similar comment in "jnl_write_logical"
+	 */
+	if (write_to_jnlbuff)
+	{
+		jbp = jpc->jnl_buff;
+		ADJUST_CHECKSUM_TN(INIT_CHECKSUM_SEED, &jpc->curr_tn, common_csum);
+		pini_addr = jpc->pini_addr;
+		need_pini_adjustment = FALSE;
+		commit_index = jrs->phase2_commit_index;
+		phs2cmt = &jbp->phase2_commit_array[commit_index];
+		start_freeaddr = phs2cmt->start_freeaddr;
+#		ifdef DEBUG
+		assert(start_freeaddr >= jbp->freeaddr);
+		assert(start_freeaddr < jbp->rsrv_freeaddr);
+		assert(process_id == phs2cmt->process_id);
+		assert(!phs2cmt->write_complete);
+		assert(jpc->phase2_freeaddr == start_freeaddr + phs2cmt->tot_jrec_len);
+#		endif
+		if (!pini_addr)
+		{	/* PINI record would have been written as the first in this transaction in that case.
+			 * Use the corresponding freeaddr as the pini_addr for the checksum computation.
+			 * There is an exception in that an ALIGN record might have been written before the PINI
+			 * record. Thankfully an ALIGN record does not have a pini_addr so no need to worry about that.
+			 */
+			rectype = first_jre->rectype;
+			pini_addr = start_freeaddr;
+			if (JRT_PINI != rectype)
+			{
+				assert(JRT_ALIGN == rectype);
+				assert(&first_jre[1] < jre_top);
+				assert(JRT_PINI == first_jre[1].rectype);
+				pini_addr += first_jre->reclen;
+				need_pini_adjustment = TRUE;
+			}
+		}
+		assert(pini_addr);
+		ADJUST_CHECKSUM(common_csum, pini_addr, common_csum);
+		ADJUST_CHECKSUM(common_csum, jgbl.gbl_jrec_time, common_csum);
+		SET_JPC_PHASE2_FREEADDR(jpc, jbp, start_freeaddr);	/* needed by "jnl_write_*" calls below */
+	}
+	for (jre = first_jre; jre < jre_top; jre++)
+	{
+#		ifdef DEBUG
+		if (write_to_jnlbuff)
+			prev_freeaddr = jpc->phase2_freeaddr;
+#		endif
+		rectype = jre->rectype;
+		reclen = jre->reclen;
+		param1 = jre->param1;
+		switch (rectype)
+		{
+		case JRT_ALIGN:
+			assert(write_to_jnlbuff);
+			assert((jre == first_jre) || jpc->pini_addr);
+			jnl_write_align_rec(csa, reclen - MIN_ALIGN_RECLEN, jgbl.gbl_jrec_time);
+			break;
+		case JRT_PINI:
+			assert(write_to_jnlbuff);
+			assert(PINI_RECLEN == reclen);
+			jnl_write_pini(csa);
+			break;
+		case JRT_PBLK:
+			assert(write_to_jnlbuff);
+			assert(reclen <= ROUND_UP2(FIXED_PBLK_RECLEN + JREC_SUFFIX_SIZE + csa->hdr->blk_size, JNL_REC_START_BNDRY));
+			cse = (cw_set_element *)param1;
+			jnl_write_pblk(csa, cse, common_csum);
+			break;
+		case JRT_AIMG:
+			assert(write_to_jnlbuff);
+			assert(reclen <= ROUND_UP2(FIXED_AIMG_RECLEN + JREC_SUFFIX_SIZE + csa->hdr->blk_size, JNL_REC_START_BNDRY));
+			cse = (cw_set_element *)param1;
+			jnl_write_aimg_rec(csa, cse, common_csum);
+			break;
+		case JRT_INCTN:
+			assert(write_to_jnlbuff);
+			assert(INCTN_RECLEN == reclen);
+			jnl_write_inctn_rec(csa);
+			break;
+		case JRT_TCOM:
+			assert(TCOM_RECLEN == reclen);
+			tcom_record_ptr = (struct_jrec_tcom *)param1;
+			/* Note: tcom_record_ptr->prefix.time, num_participants, token_seq.token and strm_seqno are already set
+			 * in tp_tend and is common across all participating TP regions.
+			 */
+			tcom_record_ptr->prefix.pini_addr = jpc->pini_addr;
+			tcom_record_ptr->prefix.tn = jpc->curr_tn;
+			tcom_record_ptr->prefix.checksum = INIT_CHECKSUM_SEED;
+			tcom_record_ptr->prefix.checksum = compute_checksum(INIT_CHECKSUM_SEED,
+								(unsigned char *)tcom_record_ptr, SIZEOF(struct_jrec_tcom));
+			JNL_WRITE_APPROPRIATE(csa, jpc, JRT_TCOM, (jnl_record *)tcom_record_ptr, NULL);
+			break;
+		default:
+			assert(IS_SET_KILL_ZKILL_ZTWORM_LGTRIG_ZTRIG(rectype) || (JRT_NULL == rectype));
+			jfb = param1;
+			assert(rectype == jfb->rectype);
+			assert(reclen == jfb->record_size);
+			if (!IS_ZTP(rectype))
+				jnl_write_logical(csa, jfb, common_csum);
+			else
+			{
+				assert(write_to_jnlbuff);
+				jnl_write_ztp_logical(csa, jfb, common_csum, 0);
+			}
+			break;
+		}
+		/* It is possible one of the "jnl_write_*" calls above encounters a "jnl_write_attempt -> jnl_file_lost"
+		 * scenario. In that case jpc->channel would be set to NOJNL. Take that into account in the assert below.
+		 * It is okay to finish the "for" loop and make more "jnl_write_*" calls instead of adding "if" checks
+		 * to address this rare scenario. It is just wasted effort in a rare case but should be a safe invocation.
+		 */
+		assert(!write_to_jnlbuff || (jpc->phase2_freeaddr == (prev_freeaddr + reclen)) || (NOJNL == jpc->channel));
+	}
+	if (write_to_jnlbuff)
+	{
+		DEBUG_ONLY(freeaddr = jpc->phase2_freeaddr;)
+		assert((freeaddr > jbp->freeaddr) || (csa->now_crit && (freeaddr == jbp->freeaddr)));
+		assert(freeaddr <= jbp->rsrv_freeaddr);
+		JNL_PHASE2_WRITE_COMPLETE(csa, jbp, commit_index, freeaddr);
+	}
+	jrs->tot_jrec_len = 0;	/* reset needed to prevent duplicate calls to "jnl_write_phase2" for same curr_tn */
+}
diff --git a/sr_port/jnl_put_jrt_pini.c b/sr_port/jnl_write_pini.c
old mode 100755
new mode 100644
similarity index 85%
rename from sr_port/jnl_put_jrt_pini.c
rename to sr_port/jnl_write_pini.c
index 487226b..b5dff11
--- a/sr_port/jnl_put_jrt_pini.c
+++ b/sr_port/jnl_write_pini.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,24 +38,25 @@ GBLREF	boolean_t		exit_handler_active;
 GBLREF	int			process_exiting;
 GBLREF	boolean_t		is_src_server;
 
-void	jnl_put_jrt_pini(sgmnt_addrs *csa)
+void	jnl_write_pini(sgmnt_addrs *csa)
 {
 	struct_jrec_pini	pini_record;
 	jnl_private_control	*jpc;
 	jnl_buffer_ptr_t	jbp;
 	struct pini_list	*mur_plst;
+	boolean_t		in_phase2;
 
-	assert(csa->now_crit);
 	jpc = csa->jnl;
 	jbp = jpc->jnl_buff;
 	assert(prc_vec);
-	assert((csa->ti->early_tn == csa->ti->curr_tn) || (csa->ti->early_tn == csa->ti->curr_tn + 1));
 	pini_record.prefix.jrec_type = JRT_PINI;
 	pini_record.prefix.forwptr = pini_record.suffix.backptr = PINI_RECLEN;
 	pini_record.suffix.suffix_code = JNL_REC_SUFFIX_CODE;
-	pini_record.prefix.pini_addr = jbp->freeaddr;
-	/* in case an ALIGN record is written before the PINI record in jnl_write(), pini_addr above is updated appropriately. */
-	pini_record.prefix.tn = csa->ti->curr_tn;
+	in_phase2 = IN_PHASE2_JNL_COMMIT(csa);
+	pini_record.prefix.pini_addr = JB_FREEADDR_APPROPRIATE(in_phase2, jpc, jbp);
+	/* in case an ALIGN record is written before the PINI record in "jnl_write", pini_addr above is updated appropriately. */
+	assert(in_phase2 || (csa->ti->early_tn == csa->ti->curr_tn) || (csa->ti->early_tn == csa->ti->curr_tn + 1));
+	pini_record.prefix.tn = JB_CURR_TN_APPROPRIATE(in_phase2, jpc, csa);
 	/* At this point jgbl.gbl_jrec_time should be set by the caller */
 	assert(jgbl.gbl_jrec_time);
 	pini_record.prefix.time = jgbl.gbl_jrec_time;
@@ -92,9 +93,9 @@ void	jnl_put_jrt_pini(sgmnt_addrs *csa)
 	memcpy((unsigned char*)&pini_record.process_vector[CURR_JPV], (unsigned char*)prc_vec, SIZEOF(jnl_process_vector));
 	pini_record.filler = 0;
 	pini_record.prefix.checksum = compute_checksum(INIT_CHECKSUM_SEED, (unsigned char *)&pini_record, SIZEOF(struct_jrec_pini));
-	jnl_write(jpc, JRT_PINI, (jnl_record *)&pini_record, NULL, NULL, NULL);
+	jnl_write(jpc, JRT_PINI, (jnl_record *)&pini_record, NULL);
 	/* Note : jpc->pini_addr should not be updated until PINI record is written [C9D08-002376] */
-	jpc->pini_addr = jbp->freeaddr - PINI_RECLEN;
+	jpc->pini_addr = JB_FREEADDR_APPROPRIATE(in_phase2, jpc, jbp) - PINI_RECLEN;
 	assert(jgbl.forw_phase_recovery || (NULL == mur_plst));
 	if (NULL != mur_plst)
 		mur_plst->new_pini_addr = jpc->pini_addr;/* note down for future forward play logical record processing */
diff --git a/sr_port/jnl_write_poolonly.c b/sr_port/jnl_write_poolonly.c
deleted file mode 100644
index 7ca7bd8..0000000
--- a/sr_port/jnl_write_poolonly.c
+++ /dev/null
@@ -1,122 +0,0 @@
-/****************************************************************
- *								*
- * 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	*
- *	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_inet.h"
-
-#include <stddef.h> /* for offsetof() macro */
-
-#include "gdsroot.h"
-#include "gtm_facility.h"
-#include "fileinfo.h"
-#include "gdsbt.h"
-#include "gdsblk.h"
-#include "gdsfhead.h"
-#include "filestruct.h"
-#include "ccp.h"
-#include "iosp.h"
-#include "jnl.h"
-#include "repl_msg.h"
-#include "gtmsource.h"
-#include "min_max.h"
-#include "sleep_cnt.h"
-#include "jnl_write.h"
-#include "copy.h"
-
-GBLREF	uint4			process_id;
-GBLREF	sm_uc_ptr_t		jnldata_base;
-GBLREF	jnlpool_addrs		jnlpool;
-GBLREF	jnlpool_ctl_ptr_t	jnlpool_ctl;
-GBLREF	jnl_gbls_t		jgbl;
-GBLREF	boolean_t		is_replicator;
-
-error_def(ERR_JNLWRTDEFER);
-error_def(ERR_JNLWRTNOWWRTR);
-
-/* This function does a subset of what "jnl_write" does. While "jnl_write" writes the journal record to the journal buffer,
- * journal file and journal pool, this function writes the journal records ONLY TO the journal pool. This function should
- * be invoked only if replication state is WAS_ON (repl_was_open) and journaling state is jnl_closed.
- *
- * jpc 	   : Journal private control
- * rectype : Record type
- * jnl_rec : This contains fixed part of a variable size record or the complete fixed size records.
- * jfb     : For SET/KILL/ZKILL records entire record is formatted in this.
- */
-void	jnl_write_poolonly(jnl_private_control *jpc, enum jnl_record_type rectype, jnl_record *jnl_rec, jnl_format_buffer *jfb,
-				jnlpool_write_ctx_t *jplctx)
-{
-	int4			align_rec_len, rlen, rlen_with_align, srclen, dstlen;
-	jnl_buffer_ptr_t	jb;
-	sgmnt_addrs		*csa;
-	struct_jrec_align	align_rec;
-	uint4 			status;
-	jrec_suffix		suffix;
-	boolean_t		nowrap;
-	struct_jrec_blk		*jrec_blk;
-	uint4			jnlpool_size;
-	uchar_ptr_t		jnlrecptr;
-	DEBUG_ONLY(uint4	lcl_dskaddr;)
-	uchar_ptr_t		tmp_buff;
-
-	if (!is_replicator)
-		return;
-	assert(NULL != jnl_rec);
-	assert(rectype > JRT_BAD  &&  rectype < JRT_RECTYPES && JRT_ALIGN != rectype);
-	assert(jrt_is_replicated[rectype]);
-	assert((NULL != jnlpool.jnlpool_ctl) && (NULL != jnlpool_ctl)); /* ensure we haven't yet detached from the jnlpool */
-	assert((&FILE_INFO(jnlpool.jnlpool_dummy_reg)->s_addrs)->now_crit);	/* ensure we have the jnl pool lock */
-	csa = &FILE_INFO(jpc->region)->s_addrs;
-	assert(!JNL_ENABLED(csa) && REPL_WAS_ENABLED(csa));
-	assert(csa->now_crit || (csa->hdr->clustered  &&  csa->nl->ccp_state == CCST_CLOSED));
-	jb = jpc->jnl_buff;
-	++jb->reccnt[rectype];
-	rlen = jnl_rec->prefix.forwptr;
-	assert(0 == rlen % JNL_REC_START_BNDRY);
-	jb->bytcnt += rlen;
-	DEBUG_ONLY(jgbl.cu_jnl_index++;)
-
-	/* If the database is encrypted, then at this point jfb->buff will contain encrypted
-	 * data which we don't want to to push into the jnlpool. Instead, we make use of the
-	 * alternate alt_buff which is guaranteed to contain the original unencrypted data.
-	 */
-	if (jrt_fixed_size[rectype])
-		jnlrecptr = (uchar_ptr_t)jnl_rec;
-	else if (IS_SET_KILL_ZKILL_ZTWORM_LGTRIG_ZTRIG(rectype) && USES_ANY_KEY(csa->hdr))
-		jnlrecptr = (uchar_ptr_t)jfb->alt_buff;
-	else
-		jnlrecptr = (uchar_ptr_t)jfb->buff;
-	jnlpool_size = jnlpool_ctl->jnlpool_size;
-	dstlen = jnlpool_size - jplctx->write;
-	if (rlen <= dstlen)		/* dstlen & srclen >= rlen  (most frequent case) */
-		memcpy(jnldata_base + jplctx->write, jnlrecptr, rlen);
-	else if (rlen <= jnlpool_size)	/* dstlen < rlen <= jnlpool_size */
-	{
-		memcpy(jnldata_base + jplctx->write, jnlrecptr, dstlen);
-		memcpy(jnldata_base, jnlrecptr + dstlen, rlen - dstlen);
-	} else				/* dstlen <= jnlpool_size < rlen */
-	{	/* Copy just the last "jnlpool_size" bytes of the journal record (which could be arbitrarily large)
-		 * onto the journal pool. Adjust pointers as appropriate. Note that this transaction can never be
-		 * read from the journal pool (because it does not completely fit in) but we still need to maintain
-		 * contiguity of jnl-seqnos in the journal pool. Note we could probably copy 0s in the journal pool
-		 * instead of the last "jnlpool_size" bytes and still things should work as well but we copy valid
-		 * data just in case it helps in debug situations.
-		 */
-		jnlrecptr = jnlrecptr + rlen - jnlpool_size;
-		memcpy(jnldata_base + jplctx->write, jnlrecptr, dstlen);
-		memcpy(jnldata_base, jnlrecptr + dstlen, jnlpool_size - dstlen);
-	}
-	jplctx->write += rlen;
-	jplctx->write_total += rlen;
-	if (jplctx->write >= jnlpool_size)
-		jplctx->write %= jnlpool_size;
-}
diff --git a/sr_port/jnl_write_reserve.c b/sr_port/jnl_write_reserve.c
new file mode 100644
index 0000000..096ab56
--- /dev/null
+++ b/sr_port/jnl_write_reserve.c
@@ -0,0 +1,118 @@
+/****************************************************************
+ *								*
+ * 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 "gdsroot.h"
+#include "gtm_facility.h"
+#include "fileinfo.h"
+#include "gdsbt.h"
+#include "gdsblk.h"
+#include "gdsfhead.h"
+#include "filestruct.h"
+#include "gdscc.h"
+#include "jnl.h"
+#include "jnl_typedef.h"
+#ifdef DEBUG
+#include "gdsbml.h"
+#endif
+
+#define	ADD_JREC_RSRV_ELEM(JPC, WRITE_TO_JNLBUFF, JRS, RECTYPE, RECLEN, PARAM1)				\
+{													\
+	jrec_rsrv_elem_t	*jre;									\
+	uint4			alloclen, usedlen;							\
+													\
+	alloclen = JRS->alloclen;									\
+	usedlen = JRS->usedlen;										\
+	assert(usedlen <= alloclen);									\
+	assert(usedlen || !JRS->tot_jrec_len);								\
+	assert(!usedlen || JRS->tot_jrec_len);								\
+	if (usedlen >= alloclen)									\
+	{	/* Allocated space is not enough. Expand by allocating twice as much			\
+		 * each time (to reduce # of expansion attempts).					\
+		 */											\
+		jre = JRS->jrs_array;									\
+		alloclen = (!alloclen ? INIT_NUM_JREC_RSRV_ELEMS : alloclen * 2);			\
+		JRS->jrs_array = (jrec_rsrv_elem_t *)malloc(alloclen * SIZEOF(jrec_rsrv_elem_t));	\
+		JRS->alloclen = alloclen;								\
+		if (NULL != jre)									\
+		{											\
+			memcpy(JRS->jrs_array, jre, usedlen * SIZEOF(jrec_rsrv_elem_t));		\
+			free(jre);									\
+		}											\
+	}												\
+	assert(usedlen < alloclen);									\
+	jre = &JRS->jrs_array[usedlen];									\
+	jre->rectype = RECTYPE;										\
+	jre->reclen = RECLEN;										\
+	jre->param1 = PARAM1;										\
+	usedlen++;											\
+	JRS->usedlen = usedlen;										\
+	JRS->tot_jrec_len += RECLEN;									\
+	assert(0 == (JRS->tot_jrec_len % JNL_REC_START_BNDRY));						\
+	if (WRITE_TO_JNLBUFF)										\
+		JPC->phase2_freeaddr += RECLEN;								\
+}
+
+/* This function reserves space in the journal buffer and the journal pool for the input journal record.
+ * This is called when we hold crit from t_end/tp_tend. Once the callers release crit, they will invoke
+ * the appropriate jnl_write_* function to copy the journal records from private buffers onto the reserved
+ * space in shared memory. This way we minimize holding crit while doing the journal record copy.
+ * If the database is in the WAS_ON state (REPL_WAS_ENABLED is TRUE), then the reservation happens only
+ * in the journal pool, not in the journal buffers.
+ */
+void	jnl_write_reserve(sgmnt_addrs *csa, jbuf_rsrv_struct_t *jbuf_rsrv_ptr,
+					enum jnl_record_type rectype, uint4 reclen, void *param1)
+{
+	boolean_t		write_to_jnlbuff;
+	jnl_buffer_ptr_t	jbp;
+	jnl_private_control	*jpc;
+	uint4			align_reclen, lcl_freeaddr;
+#	ifdef DEBUG
+	boolean_t		write_to_jnlpool;
+#	endif
+
+	assert((JRT_PINI == rectype) || (JRT_PBLK == rectype) || (JRT_AIMG == rectype) || (JRT_INCTN == rectype)
+		|| (JRT_TCOM == rectype) || IS_SET_KILL_ZKILL_ZTWORM_LGTRIG_ZTRIG(rectype) || (JRT_NULL == rectype));
+	assert(JNL_ALLOWED(csa));
+	assert(csa->now_crit);
+	assert(0 == (reclen % JNL_REC_START_BNDRY));
+	jpc = csa->jnl;
+	jbp = jpc->jnl_buff;
+	assert(JNL_WRITE_LOGICAL_RECS(csa));
+	write_to_jnlbuff = JNL_ENABLED(csa);
+	DEBUG_ONLY(write_to_jnlpool = REPL_ALLOWED(csa);)
+	assert(write_to_jnlbuff || write_to_jnlpool);
+	if (write_to_jnlbuff)
+	{
+		lcl_freeaddr = jpc->phase2_freeaddr;
+		if (lcl_freeaddr + reclen > jbp->next_align_addr)
+		{
+			assert(jbp->next_align_addr >= lcl_freeaddr);
+			align_reclen = (jbp->next_align_addr - lcl_freeaddr) + MIN_ALIGN_RECLEN;
+			assert(align_reclen < jbp->alignsize);
+			ADD_JREC_RSRV_ELEM(jpc, write_to_jnlbuff, jbuf_rsrv_ptr, JRT_ALIGN, align_reclen, param1);
+			jbp->next_align_addr += jbp->alignsize;
+		}
+	}
+	ADD_JREC_RSRV_ELEM(jpc, write_to_jnlbuff, jbuf_rsrv_ptr, rectype, reclen, param1);
+	/* Since this function reserves space for the input journal record in the current journal file, we expect
+	 * no journal file switches to happen while writing all journal records of the current transaction in this
+	 * region. If there was not enough space in the journal file, we expect t_end/tp_tend (callers of this function)
+	 * to have done a "jnl_file_extend" as appropriate and if extension/autoswitch failed (due to permissions etc.)
+	 * to have set jbp->last_eof_written to TRUE and transferred control to an error handler instead of proceeding
+	 * with the transaction commit. So assert this field is FALSE. The only exception is if we are in the WAS_ON
+	 * state in which case this function is invoked to only write journal records to the journal pool and not to
+	 * the journal file.
+	 */
+	assert(!jbp->last_eof_written || !write_to_jnlbuff);
+}
diff --git a/sr_port/jnl_write_trunc_rec.c b/sr_port/jnl_write_trunc_rec.c
index aadd580..4dd8eb3 100644
--- a/sr_port/jnl_write_trunc_rec.c
+++ b/sr_port/jnl_write_trunc_rec.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	*
@@ -12,9 +12,6 @@
 
 #include "mdef.h"
 
-#ifdef VMS
-#include <descrip.h> /* Required for gtmsource.h */
-#endif
 #include "gtm_inet.h"
 
 #include "gtm_time.h"
@@ -40,6 +37,7 @@ void    jnl_write_trunc_rec(sgmnt_addrs *csa, uint4 orig_total_blks, uint4 orig_
 	struct_jrec_trunc	trunc_rec;
 	jnl_private_control	*jpc;
 
+	assert(!IN_PHASE2_JNL_COMMIT(csa));
 	assert(csa->now_crit);
 	jpc = csa->jnl;
 	trunc_rec.prefix.jrec_type = JRT_TRUNC;
@@ -53,6 +51,6 @@ void    jnl_write_trunc_rec(sgmnt_addrs *csa, uint4 orig_total_blks, uint4 orig_
 	trunc_rec.orig_free_blocks = orig_free_blocks;
 	trunc_rec.total_blks_after_trunc = total_blks_after_trunc;
 	trunc_rec.prefix.checksum = compute_checksum(INIT_CHECKSUM_SEED, (unsigned char *)&trunc_rec, SIZEOF(struct_jrec_trunc));
-	jnl_write(jpc, JRT_TRUNC, (jnl_record *)&trunc_rec, NULL, NULL, NULL);
+	jnl_write(jpc, JRT_TRUNC, (jnl_record *)&trunc_rec, NULL);
 }
 
diff --git a/sr_port/jnl_write_ztp_logical.c b/sr_port/jnl_write_ztp_logical.c
old mode 100755
new mode 100644
index 3cfa173..20091a2
--- a/sr_port/jnl_write_ztp_logical.c
+++ b/sr_port/jnl_write_ztp_logical.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,9 +13,6 @@
 #include "mdef.h"
 
 #include "gtm_inet.h"
-#ifdef VMS
-#include <descrip.h> /* Required for gtmsource.h */
-#endif
 
 #include "gtm_time.h"
 #include "gdsroot.h"
@@ -38,14 +35,13 @@
 GBLREF	jnl_fence_control	jnl_fence_ctl;
 GBLREF 	jnl_gbls_t		jgbl;
 GBLREF	seq_num			seq_num_zero;
-GBLREF	trans_num		local_tn;	/* transaction number for THIS PROCESS */
 GBLREF	uint4			process_id;
 
-void	jnl_write_ztp_logical(sgmnt_addrs *csa, jnl_format_buffer *jfb, uint4 com_csum, seq_num jnl_seqno,
-				jnlpool_write_ctx_t *jplctx)
+void	jnl_write_ztp_logical(sgmnt_addrs *csa, jnl_format_buffer *jfb, uint4 com_csum, seq_num jnl_seqno)
 {
 	struct_jrec_upd		*jrec;
 	jnl_private_control	*jpc;
+	boolean_t		in_phase2;
 
 	/* If REPL_WAS_ENABLED(csa) is TRUE, then we would not have gone through the code that initializes
 	 * jgbl.gbl_jrec_time or jpc->pini_addr. But in this case, we are not writing the journal record
@@ -55,27 +51,17 @@ void	jnl_write_ztp_logical(sgmnt_addrs *csa, jnl_format_buffer *jfb, uint4 com_c
 	jpc = csa->jnl;
 	assert((0 != jpc->pini_addr) || REPL_WAS_ENABLED(csa));
 	assert(jgbl.gbl_jrec_time || REPL_WAS_ENABLED(csa));
-	assert(csa->now_crit);
 	assert(IS_SET_KILL_ZKILL_ZTRIG(jfb->rectype));
 	assert(IS_ZTP(jfb->rectype));
 	jrec = (struct_jrec_upd *)jfb->buff;
 	jrec->prefix.pini_addr = (0 == jpc->pini_addr) ? JNL_HDR_LEN : jpc->pini_addr;
-	jrec->prefix.tn = csa->ti->curr_tn;
+	in_phase2 = IN_PHASE2_JNL_COMMIT(csa);
+	jrec->prefix.tn = JB_CURR_TN_APPROPRIATE(in_phase2, jpc, csa);
 	jrec->prefix.time = jgbl.gbl_jrec_time;
-	if (QWEQ(jnl_fence_ctl.token, seq_num_zero))
-	{	/* generate token once after op_ztstart and use for all its mini-transactions
-		 * jnl_fence_ctl.token is set to seq_num_zero in op_ztstart */
-		if (REPL_ALLOWED(csa))
-			QWASSIGN(jnl_fence_ctl.token, jnl_seqno);
-		else
-		{
-			TOKEN_SET(&jnl_fence_ctl.token, local_tn, process_id);
-		}
-	}
 	assert(0 != jnl_fence_ctl.token);
 	jrec->token_seq.token = jnl_fence_ctl.token;
 	jrec->strm_seqno = 0;	/* strm_seqno is only for replication & ZTCOM does not work with replic */
 	COMPUTE_LOGICAL_REC_CHECKSUM(jfb->checksum, jrec, com_csum, jrec->prefix.checksum);
 	assert(!REPL_ALLOWED(csa));
-	JNL_WRITE_APPROPRIATE(csa, jpc, jfb->rectype, (jnl_record *)jrec, NULL, jfb, jplctx);
+	JNL_WRITE_APPROPRIATE(csa, jpc, jfb->rectype, (jnl_record *)jrec, jfb);
 }
diff --git a/sr_port/jnlpool_hasnt_overflowed.c b/sr_port/jnlpool_hasnt_overflowed.c
old mode 100755
new mode 100644
index be35c45..c98d22b
--- a/sr_port/jnlpool_hasnt_overflowed.c
+++ b/sr_port/jnlpool_hasnt_overflowed.c
@@ -1,6 +1,7 @@
 /****************************************************************
  *								*
- *	Copyright 2003, 2004 Sanchez Computer Associates, 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	*
@@ -33,9 +34,9 @@ boolean_t jnlpool_hasnt_overflowed(jnlpool_ctl_ptr_t jctl, uint4 jnlpool_size, q
 	 * to be read (including the jnl_data_header). To avoid such conditions, we should commit the order of shared memory
 	 * updates before and after the content is updated (see t_end.c, tp_tend.c). To ensure the source server reads content
 	 * that is correct, it should invalidate its cache before the read. After the read, to ensure that the content is correct
-	 * (not some that may have been overwritten), it has to invalidate its cache to fetch the latest value of early_write_addr.
+	 * (not some that may have been overwritten), it has to invalidate its cache to fetch the latest value of rsrv_write_addr.
 	 *
 	 */
-	SHM_READ_MEMORY_BARRIER; /* to fetch the latest early_write_addr */
-	return (jnlpool_size >= (jctl->early_write_addr - read_addr));
+	SHM_READ_MEMORY_BARRIER; /* to fetch the latest rsrv_write_addr */
+	return (jnlpool_size >= (jctl->rsrv_write_addr - read_addr));
 }
diff --git a/sr_port/jobexam_process.c b/sr_port/jobexam_process.c
index efa5e58..1ea91fd 100644
--- a/sr_port/jobexam_process.c
+++ b/sr_port/jobexam_process.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	*
@@ -56,6 +56,8 @@ GBLREF boolean_t        created_core;
 UNIX_ONLY(GBLREF sigset_t blockalrm;)
 DEBUG_ONLY(GBLREF boolean_t ok_to_UNWIND_in_exit_handling;)
 
+LITREF	mval		literal_zero;
+
 error_def(ERR_GTMASSERT);
 error_def(ERR_GTMASSERT2);
 error_def(ERR_GTMCHECK);
@@ -221,7 +223,7 @@ void jobexam_dump(mval *dump_filename_arg, mval *dump_file_spec, char *fatal_fil
 	parms.str.addr = (char *)dumpable_error_dump_file_parms;
 	parms.str.len = SIZEOF(dumpable_error_dump_file_parms);
 	/* Open, use, and zshow into new file, then close and reset current io device */
-	op_open(dump_file_spec, &parms, 0, 0);
+	op_open(dump_file_spec, &parms, (mval *)&literal_zero, 0);
 	op_use(dump_file_spec, &parms);
 	zshowall.mvtype = MV_STR;
 	zshowall.str.addr = "*";
diff --git a/sr_port/jobinterrupt_init.c b/sr_port/jobinterrupt_init.c
index 35bddd9..42e2ce0 100755
--- a/sr_port/jobinterrupt_init.c
+++ b/sr_port/jobinterrupt_init.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	*
@@ -19,7 +20,7 @@
 
 #include "mdef.h"
 
-#include <signal.h>
+#include "gtm_signal.h"
 
 #include "gtm_string.h"
 #include "gtm_stdio.h"
@@ -40,37 +41,21 @@ void jobinterrupt_init(void)
 	mstr	envvar_logical;
 	char	trans_bufr[MAX_TRANS_NAME_LEN];
 	DCL_THREADGBL_ACCESS;
-#ifdef UNIX
 	struct sigaction new_action;
 
 	SETUP_THREADGBL_ACCESS;
-	/* Setup new signal handler to just drive condition handler which will do the right thing.
-	   Note that although we use send a posix-style signal with mupip intrpt on VMS, the signal
-	   that comes in is NOT handled by posix signal handler because the posix handler is implemented
-	   using native condition handlers which interfere with GT.M's use of native condition handlers.
-	   The VMS signal is instead intercepted via the START_CH macro on VMS which then drives the
-	   jobinterrupt_event routine.
-	*/
+	/* Setup new signal handler to just drive condition handler which will do the right thing.  */
 	memset(&new_action, 0, SIZEOF(new_action));
 	sigemptyset(&new_action.sa_mask);
 	new_action.sa_flags = SA_SIGINFO;
-#ifdef __sparc
-	new_action.sa_handler = jobinterrupt_event;
-#else
 	new_action.sa_sigaction = jobinterrupt_event;
-#endif
 	sigaction(SIGUSR1, &new_action, NULL);
-#else
-	SETUP_THREADGBL_ACCESS;
-	/* Handler for VMS setup via function pointer called by START_CH macro */
-	RFPTR(gtm_sigusr1_handler) = jobinterrupt_event;
-#endif
 
 	/* Provide initial setting for $ZINTERRUPT */
 	envvar_logical.addr = GTM_ZINTERRUPT;
 	envvar_logical.len = SIZEOF(GTM_ZINTERRUPT) - 1;
-	if (SS_NORMAL != TRANS_LOG_NAME(&envvar_logical, &dollar_zinterrupt.str, trans_bufr, SIZEOF(trans_bufr),
-						do_sendmsg_on_log2long))
+	if ((SS_NORMAL != TRANS_LOG_NAME(&envvar_logical, &dollar_zinterrupt.str, trans_bufr, SIZEOF(trans_bufr),
+						do_sendmsg_on_log2long)) || (0 == dollar_zinterrupt.str.len))
 	{	/* Translation failed - use default */
 		dollar_zinterrupt.str.addr = DEF_ZINTERRUPT;
 		dollar_zinterrupt.str.len = SIZEOF(DEF_ZINTERRUPT) - 1;
diff --git a/sr_port/line.c b/sr_port/line.c
index 93a4f5c..31d48f2 100755
--- a/sr_port/line.c
+++ b/sr_port/line.c
@@ -18,13 +18,15 @@
 #include "mdq.h"
 #include "mmemory.h"
 #include "advancewindow.h"
+#include "show_source_line.h"
 
-GBLREF short int		source_line;
+GBLREF command_qualifier	cmd_qlf;
 GBLREF int			mlmax;
-GBLREF mline			*mline_tail;
-GBLREF short int		block_level;
 GBLREF mlabel			*mlabtab;
-GBLREF command_qualifier	cmd_qlf;
+GBLREF mline			mline_root;
+GBLREF mline			*mline_tail;
+GBLREF short int		source_line;
+GBLREF triple			t_orig;		/* head of triples */
 
 error_def(ERR_BLKTOODEEP);
 error_def(ERR_COMMAORRPAREXP);
@@ -54,6 +56,10 @@ boolean_t line(uint4 *lnc)
 	curlin->line_number = 0;
 	curlin->table = FALSE;
 	assert(0 == TREF(expr_depth));
+	curlin->line_number = *lnc;
+	*lnc = *lnc + 1;
+	curlin->table = TRUE;
+	curlin->block_ok = FALSE;
 	(TREF(side_effect_base))[0] = FALSE;
 	TREF(last_source_column) = 0;
 	if (TK_INTLIT == TREF(window_token))
@@ -62,10 +68,8 @@ boolean_t line(uint4 *lnc)
 		start_fetches(OC_LINEFETCH);
 	else
 		newtriple(OC_LINESTART);
-	curlin->line_number = *lnc;
-	*lnc = *lnc + 1;
-	curlin->table = TRUE;
 	CHKTCHAIN(TREF(curtchain), exorder, FALSE);
+	assert(&t_orig == TREF(curtchain));
 	TREF(pos_in_chain) = *(TREF(curtchain));
 	if (TK_IDENT == TREF(window_token))
 	{
@@ -183,28 +187,29 @@ boolean_t line(uint4 *lnc)
 					break;
 			}
 		}
-		if ((block_level + 1) < dot_count)
+		if ((NULL != parmbase) && dot_count)
 		{
-			dot_count = (block_level > 0) ? block_level : 0;
-			stx_error(ERR_BLKTOODEEP);
+			dot_count = TREF(block_level);
+			stx_error(ERR_NESTFORMP);	/* Should be warning */
 			success = FALSE;
 		}
+		if ((TREF(block_level) + (int4)(mline_tail->block_ok)) < dot_count)
+		{
+			dot_count = TREF(block_level);
+			show_source_line(TRUE);
+			dec_err(VARLSTCNT(1) ERR_BLKTOODEEP);
+		}
 	}
-	if ((0 != parmbase) && (0 != dot_count))
-	{
-		stx_error(ERR_NESTFORMP);	/* Should be warning */
-		success = FALSE;
-		dot_count = (block_level > 0 ? block_level : 0);
-	}
-	if ((block_level + 1) <= dot_count)
+	if ((TREF(block_level) < dot_count) || (mline_tail == &mline_root))
 	{
 		mline_tail->child = curlin;
 		curlin->parent = mline_tail;
-		block_level = dot_count;
+		TREF(block_level) = dot_count;
 	} else
 	{
-		for (; dot_count < block_level; block_level--)
-			mline_tail = mline_tail->parent;
+		for (; dot_count < TREF(block_level); (TREF(block_level))--)
+			if (NULL != mline_tail->parent)
+				mline_tail = mline_tail->parent;
 		mline_tail->sibling = curlin;
 		curlin->parent = mline_tail->parent;
 	}
diff --git a/sr_port/linetail.c b/sr_port/linetail.c
index 9fee72e..8c42bb4 100755
--- a/sr_port/linetail.c
+++ b/sr_port/linetail.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	*
@@ -24,6 +25,7 @@ int linetail(void)
 	DCL_THREADGBL_ACCESS;
 
 	SETUP_THREADGBL_ACCESS;
+	TREF(rts_error_in_parse) = FALSE;
 	for (;;)
 	{
 		while (TK_SPACE == TREF(window_token))
@@ -32,10 +34,8 @@ int linetail(void)
 			return TRUE;
 		if (!cmd())
 		{
-			if (OC_RTERROR != (TREF(curtchain))->exorder.bl->exorder.bl->exorder.bl->opcode)
-			{	/* If rterror is last triple generated (has two args), then error already raised */
+			if (!ALREADY_RTERROR)
 				TREF(source_error_found) ? stx_error(TREF(source_error_found)) : stx_error(ERR_CMD);
-			}
 			assert((TREF(curtchain))->exorder.bl->exorder.fl == TREF(curtchain));
 			assert(TREF(source_error_found));
 			return FALSE;
diff --git a/sr_port/lkglvn.c b/sr_port/lkglvn.c
index 1245d1b..bc508f1 100755
--- a/sr_port/lkglvn.c
+++ b/sr_port/lkglvn.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	*
@@ -16,21 +17,28 @@
 #include "compiler.h"
 #include "opcode.h"
 #include "toktyp.h"
+#include "mdq.h"
 #include "subscript.h"
 #include "advancewindow.h"
+#include "fullbool.h"
+#include "show_source_line.h"
 
-error_def(ERR_COMMA);
+GBLREF	boolean_t	run_time;
+
+error_def(ERR_EXPR);
 error_def(ERR_EXTGBLDEL);
 error_def(ERR_LKNAMEXPECTED);
 error_def(ERR_MAXNRSUBSCRIPTS);
+error_def(ERR_RPARENMISSING);
+error_def(ERR_SIDEEFFECTEVAL);
 
 int lkglvn(boolean_t gblvn)
 {
-	boolean_t	vbar;
+	boolean_t	shifting, vbar;
 	char		*lknam, lkname_buf[MAX_MIDENT_LEN + 1], x;
 	opctype		ox;
-	oprtype		*sb1, *sb2, subscripts[MAX_LVSUBSCRIPTS];
-	triple		*ref, *t1;
+	oprtype		*sb1, *sb2, subscripts[MAX_GVSUBSCRIPTS + 1];
+	triple		*oldchain, *ref, tmpchain, *triptr;
 	DCL_THREADGBL_ACCESS;
 
 	SETUP_THREADGBL_ACCESS;
@@ -39,22 +47,40 @@ int lkglvn(boolean_t gblvn)
 	lknam = lkname_buf;
 	if (gblvn)
 		*lknam++ = '^';
+	if (shifting = (TREF(shift_side_effects) && (!TREF(saw_side_effect) || (GTM_BOOL == TREF(gtm_fullbool)
+		&& (OLD_SE == TREF(side_effect_handling))))))
+	{	/* NOTE assignment above */
+		dqinit(&tmpchain, exorder);
+		oldchain = setcurtchain(&tmpchain);
+	}
 	if ((TK_LBRACKET == TREF(window_token)) || (TK_VBAR == TREF(window_token)))
 	{
 		vbar = (TK_VBAR == TREF(window_token));
 		advancewindow();
 		if (EXPR_FAIL == (vbar ? expr(sb1++, MUMPS_EXPR) : expratom(sb1++)))
+		{
+			stx_error(ERR_EXPR);
+			if (shifting)
+				setcurtchain(oldchain);
 			return FALSE;
+		}
 		if (TK_COMMA == TREF(window_token))
 		{
 			advancewindow();
 			if (EXPR_FAIL == (vbar ? expr(sb1++, MUMPS_EXPR) : expratom(sb1++)))
+			{
+				stx_error(ERR_EXPR);
+				if (shifting)
+					setcurtchain(oldchain);
 				return FALSE;
+			}
 		} else
 			*sb1++ = put_str(0, 0);
 		if ((!vbar && (TK_RBRACKET != TREF(window_token))) || (vbar && (TK_VBAR != TREF(window_token))))
 		{
 			stx_error(ERR_EXTGBLDEL);
+			if (shifting)
+				setcurtchain(oldchain);
 			return FALSE;
 		}
 		advancewindow();
@@ -78,11 +104,17 @@ int lkglvn(boolean_t gblvn)
 			if (ARRAYTOP(subscripts) <= sb1)
 			{
 				stx_error(ERR_MAXNRSUBSCRIPTS);
+				if (shifting)
+					setcurtchain(oldchain);
 				return FALSE;
 			}
 			advancewindow();
 			if (EXPR_FAIL == expr(sb1, MUMPS_EXPR))
+			{
+				if (shifting)
+					setcurtchain(oldchain);
 				return FALSE;
+			}
 			sb1++;
 			if (TK_RPAREN == (x = TREF(window_token)))	/* NOTE assignment */
 			{
@@ -91,19 +123,32 @@ int lkglvn(boolean_t gblvn)
 			}
 			if (TK_COMMA != x)
 			{
-				stx_error(ERR_COMMA);
+				stx_error(ERR_RPARENMISSING);
+				if (shifting)
+					setcurtchain(oldchain);
 				return FALSE;
 			}
 		}
 	}
 	ref = newtriple(ox);
 	ref->operand[0] = put_ilit((mint)(sb1 - sb2));
-	for ( ; sb2 < sb1 ; sb2++)
+	SUBS_ARRAY_2_TRIPLES(ref, sb1, sb2, subscripts, 0);
+	if (shifting)
 	{
-		t1 = newtriple(OC_PARAMETER);
-		ref->operand[1] = put_tref(t1);
-		ref = t1;
-		ref->operand[0] = *sb2;
+		if (TREF(saw_side_effect) && ((GTM_BOOL != TREF(gtm_fullbool)) || (OLD_SE != TREF(side_effect_handling))))
+		{	/* saw a side effect in a subscript - time to stop shifting */
+			setcurtchain(oldchain);
+			triptr = (TREF(curtchain))->exorder.bl;
+			dqadd(triptr, &tmpchain, exorder);
+		} else
+		{
+			newtriple(OC_GVSAVTARG);
+			setcurtchain(oldchain);
+			dqadd(TREF(expr_start), &tmpchain, exorder);
+			TREF(expr_start) = tmpchain.exorder.bl;
+			triptr = newtriple(OC_GVRECTARG);
+			triptr->operand[0] = put_tref(TREF(expr_start));
+		}
 	}
 	return TRUE;
 }
diff --git a/sr_port/localvarmonitor.h b/sr_port/localvarmonitor.h
new file mode 100644
index 0000000..999f043
--- /dev/null
+++ b/sr_port/localvarmonitor.h
@@ -0,0 +1,69 @@
+/****************************************************************
+ *								*
+ * 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.	*
+ *								*
+ ****************************************************************/
+
+#ifndef _LOCALVARMONITOR_H_DEFINED_
+#define _LOCALVARMONITOR_H_DEFINED_
+
+/* Note there are two forms of local variable monitoring in GTM - both initiated by VIEW commands. The first is the lv monitoring
+ * potentially done by aliases when #ifdef(DEBUG_ALIAS) is set during a build followed by the appropriate
+ *    VIEW LVMONSTART/LVMONSTOP/LVMONOUT
+ * command.
+ *
+ * The second method is this one. There is one lvmon_var struct (in an array anchored by TREF(lvmon_vars_anchor)) for each
+ * base variable named as a variable in. Monitoring is started with the
+ *    VIEW "LVMON":<var1<:var2<...>>>
+ * command. A lack of arguments turns off monitoring and releases the trace data structures.
+ *
+ * There are two routines of interest:
+ *    1. lvmon_pull_values(idx)
+ *    2. lvmon_compare_value_slots(idx1, idx2)
+ *
+ * lvmon_pull_values(idx)
+ *    - Pulls the current value of all variables being monitored storing it in the index given.
+ *
+ * lvmon_compare_value_slots(idx1, idx2)
+ *    - Compares the values in the two given slots giving an error message and generating a core if they differ but otherwise
+ * 	allowing the process to continue.
+ */
+
+/* Uncomment following statement to debug LVMONITOR */
+/* #define DEBUG_LVMONITOR */
+#ifdef DEBUG_LVMONITOR
+# define DBGLVMON(X) DBGFPF(X)
+#else
+# define DBGLVMON(X)
+#endif
+
+#define MAX_LVMON_VALUES 2				/* Enough for 1 comparison set for now - should be an even number */
+#define IS_LVMON_ACTIVE (TREF(lvmon_active))
+
+/* Structure to hold a single saved value */
+typedef struct
+{
+	lv_val	varlvval;				/* Copy of the lv_val holding value (type and numeric value ) */
+	mstr	varvalue;				/* If varlvval is string, points to malloc'd space holding value */
+	uint4	alloclen;				/* Allocation length of var_value */
+	GTM64_ONLY(int filler;)
+} lvmon_value_ent;
+/* Structure used to monitor variables defined in a table made up of lvmon_var structures */
+typedef struct
+{
+	mname_entry	lvmv;
+	lv_val		*varlvadr;			/* Only need to fetch it once unless curr_symtab_cycle has changed */
+	gtm_int8	curr_symval_cycle;		/* Copy of curr_symval_cycle when copied lv_val addr */
+	lvmon_value_ent	values[MAX_LVMON_VALUES];
+} lvmon_var;
+
+void	lvmon_pull_values(int lvmon_ary_idx);
+void	lvmon_compare_value_slots(int lvmon_idx1, int lvmon_idx2);
+
+#endif /* ifndef _LOCALVARMONITOR_H_DEFINED_ */
diff --git a/sr_port/lvmon_compare_value_slots.c b/sr_port/lvmon_compare_value_slots.c
new file mode 100644
index 0000000..6bcc180
--- /dev/null
+++ b/sr_port/lvmon_compare_value_slots.c
@@ -0,0 +1,91 @@
+/****************************************************************
+ *								*
+ * 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 "gtm_stdio.h"
+#include "gtm_string.h"
+
+#include "gtmio.h"
+#include "io.h"
+#include "lv_val.h"
+#include "send_msg.h"
+#include "localvarmonitor.h"
+#include "error.h"		/* For "gtm_fork_n_core" */
+
+GBLREF int4		gtm_trigger_depth;
+
+error_def(ERR_LVMONBADVAL);
+
+/* Routine that for each local variable being monitored compares the values saved in the two given slots. The assumption is
+ * that these slots have been loaded across multiple calls to lvmon_pull_values() in those slots. Variables must be the same
+ * type and the same value within that type. Note numeric values are not at this time verified so we are only looking for
+ * string types and seeing they have not changed. Note this routine just finds the problems and sends messages to syslog but
+ * does not force the program to stop.
+ *
+ * Parameters:
+ *   lvmon_idx1 - First index to be compared - assumed to be the "expected" value.
+ *   lvmon_idx2 - Second index to be compared.
+ *
+ * If the values saved in the given slots are not the same, an assertpro is generated.
+ */
+void	lvmon_compare_value_slots(int lvmon_idx1, int lvmon_idx2)
+{
+	int		len, cnt;
+	lvmon_var	*lvmon_var_p;
+	lvmon_value_ent	*lvmon_val_ent1_p;
+	lvmon_value_ent	*lvmon_val_ent2_p;
+	boolean_t	error_seen;
+	char		*dummy_str;
+	DCL_THREADGBL_ACCESS;
+
+	SETUP_THREADGBL_ACCESS;
+	assert(TREF(lvmon_active));
+	if ((0 != gtm_trigger_depth) || !TREF(lvmon_active))
+		return;					/* Avoid check if no values yet or triggers are active */
+	error_seen = FALSE;
+	DBGLVMON((stderr, "lvmon_compare_value_slots: Checking slot %d vs %d\n", lvmon_idx1, lvmon_idx2));
+	/* For each of the local variables, compare the string values in the slots looking for corruption */
+	for (cnt = TREF(lvmon_vars_count), lvmon_var_p = TREF(lvmon_vars_anchor); 0 < cnt; cnt--, lvmon_var_p++)
+	{	/* First, see if we have an existing lv_val for this var and if it is valid */
+		lvmon_val_ent1_p = &lvmon_var_p->values[lvmon_idx1 - 1];
+		lvmon_val_ent2_p = &lvmon_var_p->values[lvmon_idx2 - 1];
+		if ((MV_STR & lvmon_val_ent1_p->varlvval.v.mvtype) && (MV_STR & lvmon_val_ent2_p->varlvval.v.mvtype))
+		{	/* Both have string values (not checking string vs number sort of thing at this time */
+			len = lvmon_val_ent1_p->varvalue.len;
+			DBGLVMON((stderr, "** lvmon_compare_value_slots: Checking strings for var %.*s\n",
+				  lvmon_var_p->lvmv.var_name.len, lvmon_var_p->lvmv.var_name.addr));
+			if ((len != lvmon_val_ent2_p->varvalue.len)
+			    || (0 != memcmp(lvmon_val_ent1_p->varvalue.addr, lvmon_val_ent2_p->varvalue.addr, len)))
+			{	/* Something in the value changed and not for the better */
+				error_seen = TRUE;
+				DBGLVMON((stderr, "!! lvmon_compare_value_slots: Strings don't match (%d vs %d). Expected value: "
+					  "%.*s   Actual value: %.*s\n", lvmon_idx1, lvmon_idx2,
+					  lvmon_val_ent1_p->varvalue.len, lvmon_val_ent1_p->varvalue.addr,
+					  lvmon_val_ent2_p->varvalue.len, lvmon_val_ent2_p->varvalue.addr));
+				send_msg_csa(CSA_ARG(NULL) VARLSTCNT(10) ERR_LVMONBADVAL, 8,
+					     lvmon_var_p->lvmv.var_name.len, lvmon_var_p->lvmv.var_name.addr,
+					     lvmon_idx1, lvmon_idx2,
+					     lvmon_val_ent1_p->varvalue.len, lvmon_val_ent1_p->varvalue.addr,
+					     lvmon_val_ent2_p->varvalue.len, lvmon_val_ent2_p->varvalue.addr);
+				gtm_fork_n_core();		/* Generate a core at the failure point */
+			}
+		} else
+		{
+			DBGLVMON((stderr, "** lvmon_compare_value_slots: Comparison avoided for var %.*s - one or both of the "
+				  "values not a string - idx%d type: 0x%04lx", lvmon_var_p->lvmv.var_name.len,
+				  lvmon_var_p->lvmv.var_name.addr, lvmon_idx1, lvmon_val_ent1_p->varlvval.v.mvtype));
+			DBGLVMON((stderr, "   idx%d type: 0x%04lx\n",lvmon_idx2, lvmon_val_ent2_p->varlvval.v.mvtype));
+
+		}
+	}
+}
diff --git a/sr_port/lvmon_pull_values.c b/sr_port/lvmon_pull_values.c
new file mode 100644
index 0000000..0bf291d
--- /dev/null
+++ b/sr_port/lvmon_pull_values.c
@@ -0,0 +1,124 @@
+/****************************************************************
+ *								*
+ * 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 "gtm_stdio.h"
+#include "gtm_string.h"
+
+#include "gtmio.h"
+#include "io.h"
+#include "lv_val.h"
+#include "localvarmonitor.h"
+
+#define LVMON_WBOX_BREAK_VALUE "This is a white box test string"
+#define LVMON_SAVE_VALUE(TYPE, VALUELEN, VALUE)								\
+{													\
+	DBGLVMON((stderr, "** lvmon_pull_values: Fetch "TYPE" string value for variable %.*s\n",	\
+		  lvmon_var_p->lvmv.var_name.len, lvmon_var_p->lvmv.var_name.addr));			\
+	lvmon_val_ent_p->varvalue.len = len = (VALUELEN);						\
+	if (0 < len)											\
+	{	/* Need to copy the string to malloc'd space. If current buffer can hold it,		\
+		 * use it - else release (if exists) and malloc a new one.				\
+		 */											\
+		if (len > lvmon_val_ent_p->alloclen)							\
+		{	/* Length of buffer is too small, release and realloc */			\
+			DBGLVMON((stderr, "** lvmon_pull_values: Reallocating buffer\n"));		\
+			if (lvmon_val_ent_p->alloclen)							\
+				free(lvmon_val_ent_p->varvalue.addr);					\
+			lvmon_val_ent_p->varvalue.addr = malloc(len);					\
+			lvmon_val_ent_p->alloclen = len;						\
+		}											\
+		assert(len >= lvmon_val_ent_p->varvalue.len);						\
+		memcpy(lvmon_val_ent_p->varvalue.addr, (VALUE), len);					\
+	}												\
+}
+
+GBLREF int4	gtm_trigger_depth;
+GBLREF symval	*curr_symval;
+
+/* Routine to pull the current values of a defined list of local vars and store it in one of the value slots.
+ *
+ * Parameters:
+ *   lvmon_p	     - Pointer to lvmon array for which we are grabbing values.
+ *   lvmon_value_idx - Which value index in the lvmon.varvalues[] array to use to store the values.
+ *
+ * Return value meanings:
+ *   0 - All values fetched
+ */
+void lvmon_pull_values(int lvmon_ary_idx)
+{
+	int		cnt, size, len;
+	lvmon_var	*lvmon_var_p;
+	ht_ent_mname	*tabent;
+	lv_val		*lv_val_p;
+	lvmon_value_ent	*lvmon_val_ent_p;
+	DEBUG_ONLY(boolean_t lvmon_wbtest_break_mstr;)
+	DCL_THREADGBL_ACCESS;
+
+	SETUP_THREADGBL_ACCESS;
+	assert(TREF(lvmon_active));
+	if ((0 != gtm_trigger_depth) || !TREF(lvmon_active))
+		return;				/* Don't record trigger values as they disappear when trigger done */
+	DEBUG_ONLY(lvmon_wbtest_break_mstr = FALSE);
+	DBGLVMON((stderr,"lvmon_pull_values: Pulling values into slot %d\n",lvmon_ary_idx));
+	/* Fetch the value of each of the local variables and store them in the values array in the specified index */
+	for (cnt = TREF(lvmon_vars_count), lvmon_var_p = TREF(lvmon_vars_anchor); 0 < cnt; cnt--, lvmon_var_p++)
+	{	/* First, see if we have an existing lv_val for this var and if it is valid */
+		lvmon_val_ent_p = &lvmon_var_p->values[lvmon_ary_idx - 1];
+		if ((NULL == lvmon_var_p->varlvadr) || (TREF(curr_symval_cycle) != lvmon_var_p->curr_symval_cycle))
+		{	/* Either lv_val pointer does not exist or is no longer valid so needs to be re-located */
+			DBGLVMON((stderr, "** lvmon_pull_values: (Re)Pull lv_val addr for %.*s\n",
+				  lvmon_var_p->lvmv.var_name.len, lvmon_var_p->lvmv.var_name.addr));
+			tabent = lookup_hashtab_mname(&curr_symval->h_symtab, &lvmon_var_p->lvmv);
+			if (NULL == tabent)
+			{	/* Variable does not exist in this symbol table so clear the array index for the value
+				 * and continue on. Note do not clear the alloclen field or the address of the value in
+				 * varvalue to avoid a memory leak.
+				 */
+				DBGLVMON((stderr, "** lvmon_pull_values: lv_val for %.*s not found (yet)\n",
+					  lvmon_var_p->lvmv.var_name.len, lvmon_var_p->lvmv.var_name.addr));
+				memset(&lvmon_val_ent_p->varlvval, 0, SIZEOF(lv_val));
+				lvmon_val_ent_p->varvalue.len = 0;
+				continue;
+			}
+			/* Update the fields */
+			lvmon_var_p->curr_symval_cycle = TREF(curr_symval_cycle);
+			lvmon_var_p->varlvadr = lv_val_p = ((lv_val *)tabent->value);
+		} else
+			lv_val_p = lvmon_var_p->varlvadr;
+		lvmon_val_ent_p->varlvval = *lv_val_p;		/* Save entire previous lv_val */
+		/* Common code if lv_val is string - update fields in the specified index of the value array */
+		if (MV_IS_STRING(&lv_val_p->v))
+		{	/* We have a string, see about storing it in a malloc'd buffer. Since we are going
+			 * to be monitoring stringpool garbage collection, it is best to keep our comparison
+			 * values out of the stringpool so we can avoid having "stp_gcol" process our value
+			 * array. Note every $gtm_white_box_test_case_count times, we will copy he wrong value
+			 * to force an error to occur.
+			 */
+#			ifdef DEBUG
+			GTM_WHITE_BOX_TEST(WBTEST_LVMON_PSEUDO_FAIL, lvmon_wbtest_break_mstr, TRUE);
+			if (lvmon_wbtest_break_mstr)
+			{
+				LVMON_SAVE_VALUE("**FAKE**", SIZEOF(LVMON_WBOX_BREAK_VALUE) - 1,
+						 LVMON_WBOX_BREAK_VALUE);
+			} else
+#			endif
+			{
+				LVMON_SAVE_VALUE("current string", lv_val_p->v.str.len, lv_val_p->v.str.addr);
+			}
+			DEBUG_ONLY(lvmon_wbtest_break_mstr = FALSE);
+		} else
+			DBGLVMON((stderr, "** lvmon_pull_values: Value not a string: 0x%04lx\n", lv_val_p->v.mvtype));
+	}
+	return;
+}
diff --git a/sr_port/m_do.c b/sr_port/m_do.c
index 28b6162..7e3118c 100755
--- a/sr_port/m_do.c
+++ b/sr_port/m_do.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	*
@@ -21,6 +21,7 @@
 #include "cmd.h"
 
 GBLREF	boolean_t	run_time;
+GBLREF mline		*mline_tail;
 
 error_def(ERR_ACTOFFSET);
 
@@ -42,6 +43,7 @@ int m_do(void)
 		{
 			calltrip = newtriple(OC_CALLSP);
 			calltrip->operand[0] = put_mnxl();
+			mline_tail->block_ok = TRUE;
 #			ifndef __i386
 			calltrip->operand[1] = put_ocnt();
 #			endif
diff --git a/sr_port/m_goto.c b/sr_port/m_goto.c
index 6f3f7aa..152773f 100755
--- a/sr_port/m_goto.c
+++ b/sr_port/m_goto.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,6 +27,8 @@ int m_goto(void)
 	DCL_THREADGBL_ACCESS;
 
 	SETUP_THREADGBL_ACCESS;
+	if (TREF(xecute_literal_parse))
+		return FALSE;
 	dqinit(&tmpchain, exorder);
 	oldchain = setcurtchain(&tmpchain);
 	if (!entryref(OC_JMP, OC_EXTJMP, (mint)indir_goto, TRUE, FALSE, FALSE))
diff --git a/sr_port/m_job.c b/sr_port/m_job.c
index a7f4a81..1dbbcc3 100755
--- a/sr_port/m_job.c
+++ b/sr_port/m_job.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	*
@@ -21,7 +22,9 @@
 
 GBLREF boolean_t	run_time;
 GBLREF mident		routine_name;
+
 LITREF mident		zero_ident;
+LITREF mval		literal_notimeout;
 
 error_def(ERR_COMMAORRPAREXP);
 error_def(ERR_JOBACTREF);
@@ -122,15 +125,15 @@ int m_job(void)
 		if (is_timeout)
 		{
 			advancewindow();
-			if (EXPR_FAIL == expr(&timeout, MUMPS_INT))
+			if (EXPR_FAIL == expr(&timeout, MUMPS_EXPR))
 				return FALSE;
 		} else
-			timeout = put_ilit(NO_M_TIMEOUT);
+			timeout = put_lit((mval *)&literal_notimeout);
 	} else
 	{
 		is_timeout = FALSE;
 		plist = put_str((char *)empty_plist,SIZEOF(empty_plist));
-		timeout = put_ilit(NO_M_TIMEOUT);
+		timeout = put_lit((mval *)&literal_notimeout);
 	}
 
 	ref = newtriple(OC_JOB);
diff --git a/sr_port/m_lock.c b/sr_port/m_lock.c
index e65678f..dc4817a 100755
--- a/sr_port/m_lock.c
+++ b/sr_port/m_lock.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	*
@@ -18,6 +19,8 @@
 #include "advancewindow.h"
 #include "cmd.h"
 
+LITREF	mval		literal_notimeout;
+
 error_def(ERR_RPARENMISSING);
 
 int m_lock(void)
@@ -30,18 +33,10 @@ int m_lock(void)
 
 	SETUP_THREADGBL_ACCESS;
 	restart = newtriple(OC_RESTARTPC);
-	newtriple(OC_LKINIT);
 	indirect = FALSE;
+	ox = OC_LOCK;
 	switch (TREF(window_token))
 	{
-	case TK_MINUS:
-		advancewindow();
-		ox = OC_LCKDECR;
-		break;
-	case TK_PLUS:
-		advancewindow();
-		ox = OC_LCKINCR;
-		break;
 	case TK_EOL:
 	case TK_SPACE:
 		ox = OC_UNLOCK;
@@ -49,24 +44,31 @@ int m_lock(void)
 		newtriple(OC_UNLOCK);
 		return TRUE;
 		break;
+	case TK_MINUS:
+	case TK_PLUS:
+		ox = (TK_MINUS == TREF(window_token)) ? OC_LCKDECR : OC_LCKINCR;
+		advancewindow();
+		if (TK_ATSIGN != TREF(window_token))
+			break;
+		/* WARNING possible fall-through */
 	case TK_ATSIGN:
 		if (!indirection(&indopr))
 			return FALSE;
 		ref = maketriple(OC_COMMARG);
 		ref->operand[0] = indopr;
-		if (TK_COLON != TREF(window_token))
+		if ((TK_COLON != TREF(window_token)) && (OC_LOCK == ox))
 		{
-			ref->operand[1] = put_ilit((mint) indir_lock);
+			ref->operand[1] = put_ilit((mint)indir_lock);
 			ins_triple(ref);
 			return TRUE;
 		}
-		ref->operand[1] = put_ilit((mint) indir_nref);
-		indirect = TRUE;
-		/*** CAUTION:  FALL-THROUGH ***/
+		ref->operand[1] = put_ilit((mint)indir_nref);
+		indirect = TRUE;			/* WARNING  fall-through */
 	default:
-		newtriple(OC_UNLOCK);
-		ox = OC_LOCK;
+		if (OC_LOCK == ox)
+			newtriple(OC_UNLOCK);
 	}
+	newtriple(OC_LKINIT);
 	if (indirect)
 		ins_triple(ref);
 	else
@@ -88,20 +90,21 @@ int m_lock(void)
 			advancewindow();
 			break;
 		default:
-			if (nref() == EXPR_FAIL)
+			if (EXPR_FAIL == nref())
 				return FALSE;
 			break;
 		}
 	}
 	ref = maketriple(ox);
 	if (TK_COLON != TREF(window_token))
-	{	ref->operand[0] = put_ilit(NO_M_TIMEOUT);
+	{
+		ref->operand[0] = put_lit((mval *)&literal_notimeout);
 		ins_triple(ref);
 	}
 	else
 	{
 		advancewindow();
-		if (EXPR_FAIL == expr(&(ref->operand[0]), MUMPS_INT))
+		if (EXPR_FAIL == expr(&(ref->operand[0]), MUMPS_EXPR))
 			return FALSE;
 		ins_triple(ref);
 		newtriple(OC_TIMTRU);
diff --git a/sr_port/m_new.c b/sr_port/m_new.c
index 510db3b..df3ceef 100755
--- a/sr_port/m_new.c
+++ b/sr_port/m_new.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	*
@@ -45,6 +46,8 @@ int m_new(void)
 	DCL_THREADGBL_ACCESS;
 
 	SETUP_THREADGBL_ACCESS;
+	if (TREF(xecute_literal_parse))
+		return FALSE;
 	switch (TREF(window_token))
 	{
 	case TK_IDENT:
@@ -104,7 +107,7 @@ int m_new(void)
 			{	/* OC_RTERROR triple would have been inserted in curtchain by ins_errtriple
 				 * (invoked by stx_error). No need to do anything else.
 				 */
-				assert(OC_RTERROR == (TREF(curtchain))->exorder.bl->exorder.bl->exorder.bl->opcode);
+				assert(ALREADY_RTERROR);
 			}
 			return TRUE;
 		}
diff --git a/sr_port/m_open.c b/sr_port/m_open.c
index 74c26fa..e0a4d05 100755
--- a/sr_port/m_open.c
+++ b/sr_port/m_open.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	*
@@ -21,7 +22,8 @@
 #include "deviceparameters.h"
 #include "mdq.h"
 
-LITREF mval	literal_null;
+LITREF	mval	literal_notimeout;
+LITREF	mval	literal_null;
 
 int m_open(void)
 {
@@ -72,16 +74,16 @@ int m_open(void)
 	/* Code generation for the optional timeout parm */
 	is_timeout = FALSE;
 	if (TK_COLON != TREF(window_token))
-		timeout = put_ilit(NO_M_TIMEOUT);
+		timeout = put_lit((mval *)&literal_notimeout);
 	else
 	{
 		advancewindow();
 		if (TK_COLON == TREF(window_token))
-			timeout = put_ilit(NO_M_TIMEOUT);
+			timeout = put_lit((mval *)&literal_notimeout);
 		else
 		{
 			is_timeout = TRUE;
-			if (EXPR_FAIL == expr(&timeout, MUMPS_INT))
+			if (EXPR_FAIL == expr(&timeout, MUMPS_EXPR))
 				return FALSE;
 		}
 	}
diff --git a/sr_port/m_quit.c b/sr_port/m_quit.c
index 7669ab3..14702aa 100755
--- a/sr_port/m_quit.c
+++ b/sr_port/m_quit.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	*
@@ -36,6 +37,8 @@ int m_quit(void)
 
 	SETUP_THREADGBL_ACCESS;
 	arg = ((TK_EOL != TREF(window_token)) && (TK_SPACE != TREF(window_token)));
+	if (TREF(xecute_literal_parse))
+		return FALSE;
 	if (TREF(for_stack_ptr) == TADR(for_stack))
 	{	/* not FOR */
 		if (!arg)
diff --git a/sr_port/m_read.c b/sr_port/m_read.c
index 2512389..815d259 100755
--- a/sr_port/m_read.c
+++ b/sr_port/m_read.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	*
@@ -21,6 +21,8 @@
 #include "cmd.h"
 #include "rwformat.h"
 
+LITREF	mval		literal_notimeout;
+
 error_def(ERR_RWARG);
 
 int m_read(void)
@@ -168,12 +170,12 @@ int m_read(void)
 	}
 	if (TK_COLON != TREF(window_token))
 	{
-		*timeout = put_ilit(NO_M_TIMEOUT);
+		*timeout = put_lit((mval *)&literal_notimeout);
 		ins_triple(ref);
 	} else
 	{
 		advancewindow();
-		if (EXPR_FAIL == expr(timeout, MUMPS_INT))
+		if (EXPR_FAIL == expr(timeout, MUMPS_EXPR))
 			return FALSE;
 		ins_triple(ref);
 		newtriple(OC_TIMTRU);
diff --git a/sr_port/m_set.c b/sr_port/m_set.c
index 1f3e130..16876b2 100755
--- a/sr_port/m_set.c
+++ b/sr_port/m_set.c
@@ -325,21 +325,15 @@ int m_set(void)
 				put->operand[1] = put_ilit(indir_set);
 				return TRUE;
 			}
-			if (TREF(side_effect_handling))
-			{	/* save and restore the variable lookup for true left-to-right evaluation */
-				INSERT_INDSAVGLVN(control_slot, v, ANY_SLOT, 0);	/* 0 flag to defer global reference */
-				if (!used_glvn_slot)
-				{
-					used_glvn_slot = TRUE;
-					first_control_slot = control_slot;
-				}
-				put = maketriple(OC_STOGLVN);
-				put->operand[0] = control_slot;
-			} else
-			{	/* quick and dirty old way */
-				put = maketriple(OC_INDSET);
-				put->operand[0] = v;
+			/* save and restore the variable lookup for true left-to-right evaluation */
+			INSERT_INDSAVGLVN(control_slot, v, ANY_SLOT, 0);	/* 0 flag to defer global reference */
+			if (!used_glvn_slot)
+			{
+				used_glvn_slot = TRUE;
+				first_control_slot = control_slot;
 			}
+			put = maketriple(OC_STOGLVN);
+			put->operand[0] = control_slot;
 			put->operand[1] = resptr;
 			dqins(targchain.exorder.bl, exorder, put);
 			break;
diff --git a/sr_port/m_xecute.c b/sr_port/m_xecute.c
index 62b813b..232d9ba 100755
--- a/sr_port/m_xecute.c
+++ b/sr_port/m_xecute.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,6 +11,7 @@
  ****************************************************************/
 
 #include "mdef.h"
+#include "gtm_string.h"
 #include "compiler.h"
 #include "mdq.h"
 #include "opcode.h"
@@ -19,16 +20,30 @@
 #include "mmemory.h"
 #include "advancewindow.h"
 #include "cmd.h"
+#include "lb_init.h"
+#include "error.h"
+
+GBLREF boolean_t	run_time;
+GBLREF int		(*indir_fcn[])(), source_column;
+GBLREF int4		aligned_source_buffer, pending_errtriplecode;
+
+STATICDEF parse_save_block	*parse_state_ptr;
+STATICDEF char			*local_source_buffer;
+
+error_def(ERR_INDRMAXLEN);
 
 int m_xecute(void)
 /* compiler module for XECUTE */
 {
-	oprtype *cr, x;
-	triple *obp, *oldchain, *ref0, *ref1, tmpchain, *triptr;
+	DEBUG_ONLY(boolean_t	my_run_time = run_time);
+	int		rval;
+	mstr		*src;
+	oprtype		*cr, x;
+	triple		*obp, *oldchain, *ref0, *ref1, tmpchain, *triptr;
 	DCL_THREADGBL_ACCESS;
 
 	SETUP_THREADGBL_ACCESS;
-	dqinit(&tmpchain,exorder);
+	dqinit(&tmpchain, exorder);
 	oldchain = setcurtchain(&tmpchain);
 	switch (expr(&x, MUMPS_STR))
 	{
@@ -38,15 +53,74 @@ int m_xecute(void)
 	case EXPR_INDR:
 		if (TK_COLON != TREF(window_token))
 		{
-			make_commarg(&x,indir_xecute);
+			make_commarg(&x, indir_xecute);
 			break;
 		}
-		/* caution: fall through */
+		/* caution: fall through ??? maybe ??? */
 	case EXPR_GOOD:
-		ref0 = maketriple(OC_COMMARG);
-		ref0->operand[0] = x;
-		ref0->operand[1] = put_ilit(indir_linetail);
-		ins_triple(ref0);
+		if (! run_time && (OC_LIT == (ref0 = (TREF(curtchain))->exorder.bl)->opcode)
+			&& (ref0->exorder.bl) == TREF(curtchain))
+		{	/* just found a literal and only one and we are not already at run time; WARNING assignment above */
+			/* Can't drive the parsing with the source because there may be emedded quotes, rather must use the literal
+			 * The code in this block sorta/kinda does things like comp_init and op_commarg between a save and restore
+			 * of parser state. If the parse fails or runs into a GOTO, NEW, QUIT or (nested) XECUTE it reverts to
+			 * producing the code for a a run time evaluation of the literal. GOTO and QUIT must deal with the XECUTE
+			 * frame and that's why they cause it to defer to run time; they use TREF(xecute_literal_parse), as does
+			 * stc_error and BLOWN_FOR, to recognize this "trial" parse and prevent it from causing too much carnage
+			 * Should anthing else call for a similar approach things might should be considered for refactoring and
+			 * adjustments to some names.
+			 */
+			src = &x.oprval.tref->operand[0].oprval.mlit->v.str;
+			dqinit(&tmpchain, exorder);
+			if (MAX_SRCLINE < (unsigned)src->len)
+				rts_error_csa(CSA_ARG(NULL) VARLSTCNT(3) ERR_INDRMAXLEN, 1, MAX_SRCLINE);
+			/* save the parse state, point the compiler at the literal and see what happens */
+			if (NULL == parse_state_ptr)
+				parse_state_ptr = malloc(SIZEOF(parse_save_block));
+			SAVE_PARSE_STATE(parse_state_ptr);
+			if (NULL == local_source_buffer)
+				local_source_buffer = malloc(MAX_SRCLINE + 2);
+			TREF(lexical_ptr) = (TREF(source_buffer)).addr = local_source_buffer;
+			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(block_level) = 	source_column = 0;
+			lb_init();
+			assert(!TREF(xecute_literal_parse));
+			run_time = TREF(xecute_literal_parse) = TRUE;
+			for (;;)
+			{
+				if (EXPR_FAIL == (rval = (*indir_fcn[indir_linetail])()))
+					break;
+				if (TK_EOL == TREF(window_token))
+					break;
+				if (TK_COMMA == TREF(window_token))
+					advancewindow();
+				else
+				{	/* Allow trailing spaces/comments that we will ignore */
+					while (TK_SPACE == TREF(window_token))
+						advancewindow();
+				}
+			}
+			run_time = TREF(xecute_literal_parse) = FALSE;
+			if (TK_EOL != TREF(window_token))
+				rval = EXPR_FAIL;
+			RESTORE_PARSE_STATE(parse_state_ptr);	/* restore the parse state to the original source */
+			if (EXPR_FAIL == rval)
+			{	/* not so good - remove the failed chain and just leave the literal for the run time form */
+				dqinit(&tmpchain, exorder);
+				ins_triple(ref0);
+				pending_errtriplecode = 0;	/* forget the error - leave it to runtime */
+			}
+		} else
+			rval = EXPR_FAIL;
+		if (EXPR_FAIL == rval)
+		{	/* either not a literal or compiling the literal failed, in which case leave it to run time */
+			ref0 = maketriple(OC_COMMARG);
+			ref0->operand[0] = x;
+			ref0->operand[1] = put_ilit(indir_linetail);
+			ins_triple(ref0);
+		}
 	}
 	setcurtchain(oldchain);
 	if (TK_COLON == TREF(window_token))
@@ -90,5 +164,6 @@ int m_xecute(void)
 	}
 	obp = oldchain->exorder.bl;
 	dqadd(obp, &tmpchain, exorder);					/* violates info hiding */
+	assert(my_run_time == run_time);
 	return TRUE;
 }
diff --git a/sr_port/m_zallocate.c b/sr_port/m_zallocate.c
index e718dc7..ddd063b 100755
--- a/sr_port/m_zallocate.c
+++ b/sr_port/m_zallocate.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	*
@@ -20,6 +21,8 @@
 
 error_def(ERR_RPARENMISSING);
 
+LITREF	mval		literal_notimeout;
+
 int m_zallocate(void)
 {
 
@@ -69,12 +72,12 @@ int m_zallocate(void)
 	ref = maketriple(OC_ZALLOCATE);
 	if (TK_COLON != TREF(window_token))
 	{
-		ref->operand[0] = put_ilit(NO_M_TIMEOUT);
+		ref->operand[0] = put_lit((mval *)&literal_notimeout);
 		ins_triple(ref);
 	} else
 	{
 		advancewindow();
-		if (EXPR_FAIL == expr(&(ref->operand[0]), MUMPS_INT))
+		if (EXPR_FAIL == expr(&(ref->operand[0]), MUMPS_EXPR))
 			return EXPR_FAIL;
 		ins_triple(ref);
 		newtriple(OC_TIMTRU);
diff --git a/sr_port/m_zdeallocate.c b/sr_port/m_zdeallocate.c
index 9a4a4ce..6120e05 100755
--- a/sr_port/m_zdeallocate.c
+++ b/sr_port/m_zdeallocate.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	*
@@ -18,6 +19,8 @@
 #include "advancewindow.h"
 #include "cmd.h"
 
+LITREF	mval		literal_notimeout;
+
 error_def(ERR_RPARENMISSING);
 
 int m_zdeallocate(void)
@@ -62,6 +65,6 @@ int m_zdeallocate(void)
 		break;
 	}
 	ref = newtriple(OC_ZDEALLOCATE);
-	ref->operand[0] = put_ilit(NO_M_TIMEOUT);
+	ref->operand[0] = put_lit((mval *)&literal_notimeout);
 	return EXPR_GOOD;
 }
diff --git a/sr_port/m_zwrite.c b/sr_port/m_zwrite.c
index 8357171..1e4517d 100755
--- a/sr_port/m_zwrite.c
+++ b/sr_port/m_zwrite.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	*
@@ -136,12 +136,8 @@ int m_zwrite(void)
 						ref = maketriple(OC_ZWRITESVN);
 						ref->operand[0] = put_ilit(svn_data[index].opcode);
 						ins_triple(ref);
-					} else
-					{       /* OC_RTERROR triple would have been inserted in curtchain by ins_errtriple
-						 * (invoked by stx_error). No need to do anything else.
-						 */
-						assert(OC_RTERROR == (TREF(curtchain))->exorder.bl->exorder.bl->exorder.bl->opcode);
-					}
+					} else	/*  ins_errtriple should have already provided an OC_RTERROR */
+						assert(ALREADY_RTERROR);
 					return TRUE;
 				default:
 					stx_error(ERR_SVNEXPECTED);
diff --git a/sr_port/mdb_condition_handler.c b/sr_port/mdb_condition_handler.c
index dd3ef53..0791cf0 100644
--- a/sr_port/mdb_condition_handler.c
+++ b/sr_port/mdb_condition_handler.c
@@ -93,7 +93,7 @@
 # include "gtm_trigger.h"
 #endif
 
-GBLREF	boolean_t		ctrlc_on, created_core, dont_want_core, in_gvcst_incr, pool_init;
+GBLREF	boolean_t		ctrlc_on, created_core, dont_want_core, in_gvcst_incr, pool_init, run_time;
 GBLREF	boolean_t		ztrap_explicit_null;		/* whether $ZTRAP was explicitly set to NULL in this frame */
 GBLREF	dollar_ecode_type	dollar_ecode;			/* structure containing $ECODE related information */
 GBLREF	dollar_stack_type	dollar_stack;
@@ -552,6 +552,11 @@ CONDITION_HANDLER(mdb_condition_handler)
 #	ifdef GTM_TRIGGER
 	assertpro(TPRESTART_STATE_NORMAL == tprestart_state);	/* Can't leave half-restarted transaction around - out of design */
 #	endif
+	if (TREF(xecute_literal_parse))
+	{	/* This is not expected but protect against it */
+		assert(!TREF(xecute_literal_parse));
+		run_time = TREF(xecute_literal_parse) = FALSE;
+	}
 	UNDO_ACTIVE_LV(actlv_mdb_condition_handler);
 	/*
 	 * If error is at least severity "WARNING", do some cleanups. Note: crit is no longer unconditionally
diff --git a/sr_port/mdef.h b/sr_port/mdef.h
index d4fbb48..db1c537 100644
--- a/sr_port/mdef.h
+++ b/sr_port/mdef.h
@@ -490,6 +490,24 @@ mval *underr_strict(mval *start, ...);
 /* Note MV_FORCE_CANONICAL currently only used in op_add() when vars are known to be defined so no MV_FORCE_DEFINED()
    macro has been added. If uses are added, this needs to be revisited. 01/2008 se
 */
+#define MV_FORCE_MSTIMEOUT(TMV, TMS, NOTACID)	/* requires a flock of include files especially for TP */		\
+MBSTART {					/* also requires threaddef DCL and SETUP*/				\
+	GBLREF uint4		dollar_tlevel;										\
+	GBLREF uint4		dollar_trestart;									\
+															\
+															\
+	MV_FORCE_NUM(TMV);												\
+	if (NO_M_TIMEOUT == TMV->m[1])											\
+		TMS = NO_M_TIMEOUT;											\
+	else														\
+	{														\
+		assert(MV_BIAS >= 1000);        	/* if formats change scale may need attention */		\
+		/* negative becomes 0 larger than MAXPOSINT4 caps to MAXPOSINT4 */					\
+		TMS = (TMV->mvtype & MV_INT) ? ((0 > TMV->m[1]) ? 0 : TMV->m[1]) : (TMV->sgn ? 0 : MAXPOSINT4);		\
+	}														\
+	if ((TREF(tpnotacidtime)).m[1] < TMS)										\
+		TPNOTACID_CHECK(NOTACID);										\
+} MBEND
 #define MV_FORCE_CANONICAL(X)	((((X)->mvtype & MV_NM) == 0 ? s2n(X) : 0 ) \
 				 ,((X)->mvtype & MV_NUM_APPROX ? (X)->mvtype &= MV_NUM_MASK : 0 ))
 #define MV_IS_NUMERIC(X)	(((X)->mvtype & MV_NM) != 0)
@@ -680,9 +698,9 @@ int4 timeout2msec(int4 timeout);
 
 #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;
+# define SET_TRACEABLE_VAR(var,value) var = value
 #else
-# define SET_TRACEABLE_VAR(var,value) var = value;
+# define SET_TRACEABLE_VAR(var,value) var = value
 #endif
 
 /* If this is unix, we have a faster sleep for short sleeps ( < 1 second) than doing a hiber start.
@@ -1413,6 +1431,8 @@ typedef gtm_uint64_t	gtm_off_t;
 #define MAXUINT8	((gtm_uint64_t)-1)
 #define MAXUINT4	((uint4)-1)
 #define MAXUINT2	((unsigned short)-1)
+
+#define MAXINT4		(MAXUINT4/2)
 #define	MAXINT2		(MAXUINT2/2)
 
 /* On platforms that support native 8 byte operations (such as Alpha), an assignment to an 8 byte field is atomic. On other
diff --git a/sr_port/mdq.h b/sr_port/mdq.h
index b3da844..d096d66 100755
--- a/sr_port/mdq.h
+++ b/sr_port/mdq.h
@@ -84,34 +84,34 @@ MBSTART {										\
 } MBEND
 #  define dqdel(x, n)			\
 MBSTART {				\
-	CHKTCHAIN((x), (n), FALSE);	\
+	CHKTCHAIN((x), n, FALSE);	\
 	DQDEL((x), n);			\
-	CHKTCHAIN(-1, (n), TRUE);	\
+	CHKTCHAIN(-1, n, TRUE);	\
 } MBEND
 #  define dqdelchain(q, x, n)		\
 MBSTART {				\
-	CHKTCHAIN((q), (n), FALSE);	\
-	DQDELCHAIN((q), x, n);		\
-	CHKTCHAIN((q), (n), TRUE);	\
+	CHKTCHAIN((q), n, FALSE);	\
+	DQDELCHAIN((q), (x), n);		\
+	CHKTCHAIN((q), n, TRUE);	\
 } MBEND
 #  define dqins(q, n, x)		\
 MBSTART {				\
-	CHKTCHAIN((q), (n), FALSE);	\
-	DQINS((q), n, x);		\
-	CHKTCHAIN((q), (n), TRUE);	\
+	CHKTCHAIN((q), n, FALSE);	\
+	DQINS((q), n, (x));		\
+	CHKTCHAIN((q), n, TRUE);	\
 } MBEND
 #  define dqrins(q, n, x)		\
 MBSTART {				\
-	CHKTCHAIN((q), (n), FALSE);	\
-	DQRINS((q), n, x);		\
-	CHKTCHAIN((q), (n), TRUE);	\
+	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);	\
+	CHKTCHAIN((q), n, FALSE);	\
+	CHKTCHAIN((x), n, FALSE);	\
+	DQADD((q), (x), n);		\
+	CHKTCHAIN((q), n, TRUE);	\
 } MBEND
 #endif
 
diff --git a/sr_port/merrors.msg b/sr_port/merrors.msg
index 3ccc13e..0033593 100644
--- a/sr_port/merrors.msg
+++ b/sr_port/merrors.msg
@@ -144,36 +144,39 @@
 !	ERR_DLLNORTN		150379258 (reported in gtm.c if gtm_main is not found in libgtmshr)
 !	ERR_OPCOMMISSED		150381275 (sent via $SNDOPR in util_output.c if prior errors)
 !
-!  List of known undocumented messages follows (along with a comment)
+!  The following items must be followed by a tab (because they are parsed by tools/library/doc_tools/routines/diffm.m)
+!  List of known undocumented messages follows (along with a comment) (do not change "known undocumented" phrase)
 !	ERR_ACK			internal error (not displayed to the users)
 !	ERR_ASC2EBCDICCONV	not yet documented since zOS is not officially supported
+!	ERR_DBGLDMISMATCH	used internally to rectify an gld vs database characteristic mismatch in favor of the DB
 !	ERR_DEFEREVENT		referenced only if #define DEBUG is TRUE (i.e. for debug builds only)
+!	ERR_DRVLONGJMP		used internally in condition handler management
 !	ERR_ENQ			internal error (not displayed to the users)
+!	ERR_FAKENOSPCLEARED	for internal testing only
 !	ERR_FREEZEID		referenced only if #define DEBUG_FREEZE is TRUE.
 !	ERR_INVDBGLVL		referenced only if "gtmdbglvl" is set to non-zero value (which is a debugging feature)
 !	ERR_JNLREQUIRED		message referenced only in GT.CX code (not supported currently)
 !	ERR_JNLWRTNOWWRTR	internal error (not displayed to the users)
-!	ERR_JOBINTRRETRHOW	internal error (not displayed to users - drives rethrow of jobinterrupt)
+!	ERR_JOBINTRRETHROW	internal error (not displayed to users - drives rethrow of jobinterrupt)
 !	ERR_JOBINTRRQST		internal error (not displayed to users - drives jobinterrupt)
 !	ERR_LKSECINIT		message referenced only in GT.CX code (not supported currently)
+!	ERR_LVMONBADVAL		message used only in an undocumented feature (VIEW "LVMON...]" used for GT.M debugging
 !	ERR_MUDESTROYFAIL	referenced only if #define IPCRM_FOR_SANCHEZ_ONLY is TRUE.
 !	ERR_MUDESTROYSUC	referenced only if #define IPCRM_FOR_SANCHEZ_ONLY is TRUE.
 !	ERR_REPEATERROR		internal error (not displayed to the users)
+!	ERR_REPLONLNRLBK	not issued to user (internal use only)
 !	ERR_SYSTEMVALUE		code is not executed (set $system won't reach op_svput at all to signal the error)
 !	ERR_TPRETRY		internal error (not displayed to the users)
 !	ERR_WILLEXPIRE		error triggered by the license management code which has been since disabled.
 !	ERR_YDIRTSZ		used by a percent utility, which is not documented intentionally
 !	ERR_ZDEFACTIVE		functionality not documented (GT.CM related weirdness)
 !	ERR_ZDEFOFLOW		functionality not documented (GT.CM related weirdness)
-!
-!
-!
+!	ERR_ZLINKBYPASS		to be documented when code is enabled
 ! ----- Buffer to introduce new undocumented error messages without affecting UNUSEDMSGnnn match with corresponding line numbers.
 !
 !
 !
 !
-!
 !  In addition all messages of the LMU and GTLP message facility are not documented as Licensing is out of GT.M since V4.2.
 !
 ACK		<>/success/fao=0!/ansi=0
@@ -421,7 +424,7 @@ ACTRANGE	<Alternate Collating Type !UL is out of range>/error/fao=1!/ansi=0
 ZCCONVERT	<External call: error converting output argument>/error/fao=0!/ansi=0
 ZCRTENOTF	<External call routine !AD not found>/error/fao=2!/ansi=0
 GVRUNDOWN	<Error during global database rundown>/error/fao=0!/ansi=0
-LKRUNDOWN	<Error during lock database rundown>/error/fao=0!/ansi=0
+LKRUNDOWN	<Error during LOCK database rundown>/error/fao=0!/ansi=0
 IORUNDOWN	<Error during image rundown>/error/fao=0!/ansi=0
 FILENOTFND	<File !AD not found>/error/fao=2!/ansi=0
 MUFILRNDWNFL	<File !AD rundown failed>/error/fao=2!/ansi=0
@@ -512,7 +515,7 @@ LOADABORT	<Aborting load at record !UL>/error/fao=1!/ansi=0
 FNOTONSYS	<Function or special variable is not supported by this operating system>/error/fao=0!/ansi=0
 AMBISYIPARAM	<Parameter !AD is ambiguous to $ZGETSYI()>/error/fao=2!/ansi=0
 PREVJNLNOEOF	<A previous generation journal file !AD does not have valid EOF>/error/fao=2!/ansi=0
-LKSECINIT	<Error creating lock section for database !AD>/error/fao=2!/ansi=0
+LKSECINIT	<Error creating LOCK section for database !AD>/error/fao=2!/ansi=0
 MTDOSLAB	<Tape label is not in valid DOS-11 format>/error/fao=0!/ansi=0
 MTDOSFOR	<Use of DOS-11 labels requires stream format>/error/fao=0!/ansi=0
 MTINVLAB	<Invalid label type specified in magtape OPEN>/error/fao=0!/ansi=0
@@ -529,7 +532,7 @@ SUB2LONG	<Subscript invalid, too long>/error/fao=0!/ansi=0
 EXTRACTCTRLY	<User interrupt encountered during extract -- halting>/info/fao=0!/ansi=0
 CCENOWORLD	<CCE does not have WORLD privilege.  Information may be incomplete.>/warning/fao=0!/ansi=0
 GVQUERYFAIL	<Global variable $QUERY function failed.  Failure code: !AD.>/error/fao=2!/ansi=0
-LCKSCANCELLED	<Error on remote node holding locks or zallocates.  All locks and zallocates cancelled.>/error/fao=0!/ansi=0
+LCKSCANCELLED	<Error on remote node holding LOCKs or ZALLOCATEs.  All LOCKs and ZALLOCATEs cancelled.>/error/fao=0!/ansi=0
 INVNETFILNM	<Invalid file name following node designation in global directory>/error/fao=0!/ansi=0
 NETDBOPNERR	<Error while attempting to open database across net>/error/fao=0!/ansi=0
 BADSRVRNETMSG	<Invalid message received from GT.CM server>/error/fao=0!/ansi=0
@@ -567,7 +570,7 @@ CCECCPPID	<The cluster control program has PID 0x!XL>/info/fao=1!/ansi=0
 CCECLSTPRCS	<!UL processes are accessing clustered database files>/info/fao=1!/ansi=0
 ZSHOWBADFUNC	<An illegal function was specified for ZSHOW>/error/fao=0!/ansi=0
 NOTALLJNLEN	<Journaling disabled/off for !AD regions>/warning/fao=2!/ansi=0
-UNUSEDMSG570	<ZSHOWGLOSMALL last used in V6.2-002A>/error/fao=0!/ansi=0
+BADLOCKNEST	<Unsupported nesting of LOCK commands>/error/fao=0!/ansi=0
 NOLBRSRC	<Object libraries cannot have SRC paths associated>/error/fao=0!/ansi=0
 INVZSTEP	<Invalid ZSTEP qualifier>/error/fao=0!/ansi=0
 ZSTEPARG	<ZSTEP argument expected>/error/fao=0!/ansi=0
@@ -579,7 +582,7 @@ 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>/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
+BLKTOODEEP	<Block level too deep>/warning/fao=0!/ansi=0
 NESTFORMP	<Formal parameter list cannot be combined with nested line>/error/fao=0!/ansi=0
 BINHDR		<!AD!/!/Date: !AD!/Time: !AD!/Extract Region Characteristics!/!_Blk Size: !AD!/!_Rec Size: !AD!/!_Key Size: !AD!/!_Std Null Coll: !AD!/!AD!/>/info/fao=16!/ansi=0
 GOQPREC		<Numeric precision in key error:  Blk #!UL, Key #!UL.  Record not loaded.>/info/fao=2!/ansi=0
@@ -616,7 +619,7 @@ WCWRNNOTCHG	<Not all specified database files were changed>/warning/fao=0!/ansi=
 ZCWRONGDESC	<A string longer than 65535 is passed via 32-bit descriptor>/error/fao=0!/ansi=0
 MUTNWARN	<Database file !AD has 0x!16 at XQ more transactions to go before reaching the transaction number limit (0x!16 at XQ). Renew database with MUPIP INTEG TN_RESET>/warning/fao=4!/ansi=0
 GTMSECSHRUPDDBHDR	<[client pid !UL] database fileheader (!AD) updated !AD>/info/fao=5!/ansi=0
-LCKSTIMOUT	<DAL timed lock request expired>/warning/fao=0!/ansi=0
+LCKSTIMOUT	<DAL timed LOCK request expired>/warning/fao=0!/ansi=0
 CTLMNEMAXLEN	<The maximum length of a control mnemonic has been exceeded>/error/fao=0!/ansi=0
 CTLMNEXPECTED	<Control mnemonic is expected in this context>/error/fao=0!/ansi=0
 USRIOINIT	<User-defined device driver not successfully initialized>/error/fao=0!/ansi=0
@@ -640,7 +643,7 @@ TRIGNAMENF	<Trigger name !AD not found with the current default global directory
 TRIGZBREAKREM	<ZBREAK in trigger !AD removed due to trigger being reloaded>/warning/fao=2!/ansi=0
 TLVLZERO	<Transaction is not in progress>/error/fao=0!/ansi=44
 TRESTNOT	<Cannot TRESTART, transaction is not restartable>/error/fao=0!/ansi=27
-TPLOCK		<Cannot release lock(s) held prior to current TSTART>/error/fao=0!/ansi=41
+TPLOCK		<Cannot release LOCK(s) held prior to current TSTART>/error/fao=0!/ansi=41
 TPQUIT		<Cannot QUIT out of a routine with an active transaction>/error/fao=0!/ansi=42
 TPFAIL		<Transaction COMMIT failed.  Failure code: !AD.>/error/fao=2!/ansi=0
 TPRETRY		<Restart transaction from non-concurrency DB failure>/error/fao=0!/ansi=0
@@ -667,7 +670,7 @@ CEBIGSKIP	<Compiler escape user routine skip count is too large>/error/fao=0!/an
 CETOOLONG	<Compiler escape substitution exceeds maximum line size>/error/fao=0!/ansi=0
 CENOINDIR	<Indirection type information not available for compiler escape feature>/error/fao=0!/ansi=0
 COLLATIONUNDEF	<Collation type !UL is not defined>/error/fao=1!/ansi=0
-UNUSEDMSG670	<RBWRNNOTCHG last used in V6.2-002A>/error/fao=0!/ansi=0
+UNUSEDMSG673	<RBWRNNOTCHG last used in V6.2-002A>/error/fao=0!/ansi=0
 GTMSECSHRSRVF	<!AD - !UL : Attempt to service request failed (retry = !UL)>/error/fao=4!/ansi=0
 FREEZECTRL	<Control Y or control C encountered during attempt to freeze the database. Aborting freeze.>/info/fao=0!/ansi=0
 JNLFLUSH	<Error flushing journal buffers to journal file !AD>/info/fao=2!/ansi=0
@@ -773,7 +776,7 @@ 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
-UNUSEDMSG776	<STOPTIMEOUT last used in V6.3-000A>/error/fao=0!/ansi=0
+UNUSEDMSG779	<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
@@ -980,16 +983,16 @@ NOSPACECRE	<Not enough space to create database file !AD.  !@ZQ blocks are neede
 LOWSPACECRE	<Disk space for database file !AD is not enough for !UL future extensions.  !@ZQ !UL-byte blocks are needed, only !@ZQ available.>/warning/fao=6!/ansi=0
 WAITDSKSPACE	<Process 0x!XL will wait !UL seconds for necessary disk space to become available for !AD >/info/fao=4!/ansi=0
 OUTOFSPACE	<Database file !AD ran out of disk space.  Detected by process !UL.  !/Exit without clearing shared memory due to the disk space constraints.  !/Make space and then perform mupip rundown to ensure database integrity.>/fatal/fao=3!/ansi=0
-JNLPVTINFO	<Pid 0x!XL!/     cycle 0x!XL fd_mismatch 0x!XL     channel 0x!XL sync_io 0x!XL!/ pini_addr 0x!XL  qio_active 0x!XL old_channel 0x!XL>/info/fao=8!/ansi=0
+JNLPVTINFO	<Pid 0x!XL cycle 0x!XL fd_mismatch 0x!XL channel 0x!XL sync_io 0x!XL pini_addr 0x!XL qio_active 0x!XL old_channel 0x!XL>/info/fao=8!/ansi=0
 NOSPACEEXT	<Not enough disk space for file !AD to extend.  !UL blocks needed.  !UL blocks available.>/error/fao=4!/ansi=0
 WCBLOCKED	<Field !AD is set by process !UL at transaction number 0x!16 at XQ for database file !AD>/warning/fao=6!/ansi=0
 REPLJNLCLOSED	<Replication in jeopardy as journaling got closed for database file !AD. Current region seqno is !@ZQ [0x!16 at XQ] and system seqno is !@ZQ [0x!16 at XQ]>/error/fao=6!/ansi=0
 RENAMEFAIL	<Rename of file !AD to !AD failed>/warning/fao=4!/ansi=0
 FILERENAME	<File !AD is renamed to !AD>/info/fao=4!/ansi=0
-JNLBUFINFO	<Pid 0x!XL!/     dsk 0x!XL     free 0x!XL  bytcnt 0x!XL io_in_prog 0x!XL fsync_in_prog 0x!XL!/ dskaddr 0x!XL freeaddr 0x!XL  qiocnt 0x!XL now_writer 0x!XL     fsync_pid 0x!XL!/filesize 0x!XL    cycle 0x!XL  errcnt 0x!XL    wrtsize 0x!XL fsync_dskaddr 0x!XL>/info/fao=16!/ansi=0
+JNLBUFINFO	<Pid 0x!XL dsk 0x!XL free 0x!XL bytcnt 0x!XL io_in_prog 0x!XL fsync_in_prog 0x!XL dskaddr 0x!XL freeaddr 0x!XL qiocnt 0x!XL now_writer 0x!XL fsync_pid 0x!XL filesize 0x!XL cycle 0x!XL errcnt 0x!XL wrtsize 0x!XL fsync_dskaddr 0x!XL rsrv_free 0x!XL rsrv_freeaddr 0x!XL phase2_commit_index1 0x!XL phase2_commit_index2 0x!XL next_align_addr 0x!XL>/info/fao=21!/ansi=0
 SDSEEKERR	<Sequential device seek error - !AD>/error/fao=2!/ansi=0
 LOCALSOCKREQ	<LOCAL socket required>/error/fao=0!/ansi=0
-TPNOTACID	<!AD at !AD in a final TP retry violates ACID properties of a TRANSACTION; indefinite RESTARTs may occur !AD !AD>/info/fao=8!/ansi=0
+TPNOTACID	<!AD at !AD violates ACID properties of a TRANSACTION and could exceed !AD seconds; $TRESTART = !UL and indefinite RESTARTs may occur>/info/fao=7!/ansi=0
 JNLSETDATA2LONG	<SET journal record has data of length !UL.  Target system cannot handle data more than !UL bytes.>/error/fao=2!/ansi=0
 JNLNEWREC	<Target system cannot recognize journal record of type !UL, last recognized type is !UL>/error/fao=2!/ansi=0
 REPLFTOKSEM	<Error with replication semaphores for instance file !AD>/error/fao=2!/ansi=0
@@ -1313,7 +1316,7 @@ CRYPTOPFAILED		<Encrypt/Decrypt operation failed for file !AD. !AD>/error/fao=4!
 CRYPTDLNOOPEN		<Could not load encryption library while opening encrypted file !AD. !AD>/error/fao=4!/ansi=0
 CRYPTNOV4		<!AD is an encrypted database. Cannot downgrade(to V4) with Encryption option enabled.>/error/fao=2!/ansi=0
 CRYPTNOMM		<!AD is an encrypted database. Cannot support MM access method.>/error/fao=2!/ansi=0
-UNUSEDMSG1316	<Last used in V6.2-002A>/error/fao=0!/ansi=0
+UNUSEDMSG1319	<Last used in V6.2-002A>/error/fao=0!/ansi=0
 CRYPTKEYFETCHFAILED	<Could not retrieve encryption key corresponding to file !AD. !AD>/error/fao=4!/ansi=0
 CRYPTKEYFETCHFAILEDNF	<Could not retrieve encryption key during !AD operation key. !AD>/error/fao=4!/ansi=0
 CRYPTHASHGENFAILED	<Could not generate cryptographic hash for symmetric key corresponding to file !AD. !AD>/error/fao=4!/ansi=0
@@ -1371,7 +1374,7 @@ GVZTRIGFAIL	<ZTRIGGER of a global variable failed.  Failure code: !AD.>/error/fa
 MUUSERLBK	<Abnormal shutdown of replication-enabled database !AD detected>/error/fao=2!/ansi=0
 SETINSETTRIGONLY	<ISV !AD can only be modified in a 'SET' type trigger>/error/fao=2!/ansi=0
 DZTRIGINTRIG	<$ZTRIGGER() is not allowed inside trigger context. Trigger name: !AD>/error/fao=2!/ansi=0
-UNUSEDMSG1374	<SECNODZTRIGINTP : Last used in V6.2-000>/error/fao=0!/ansi=0
+UNUSEDMSG1377	<SECNODZTRIGINTP : Last used in V6.2-000>/error/fao=0!/ansi=0
 BOOLSIDEFFECT	<Extrinsic ($$), External call ($&) or $INCREMENT() with potential side effects in Boolean expression>/warning/fao=0!/ansi=0
 DBBADUPGRDSTATE	<Correcting conflicting values for fields describing database version upgrade state in the file header for region !AD (!AD) - make fresh backups with new journal files immediately.>/warning/fao=4!/ansi=0
 WRITEWAITPID	<PID !UL waited !UL minute(s) for PID !UL to finish writing block 0x!XL in database file !AD>/error/fao=6!/ansi=0
@@ -1383,7 +1386,7 @@ GTMSECSHRCHDIRF	<gtmsecshr unable to chdir to its temporary directory (!AD)>/err
 JNLORDBFLU	<Error flushing database blocks to !AD. See related messages in the operator log>/error/fao=2!/ansi=0
 ZCCLNUPRTNMISNG	<External call: Cleanup routine name missing. Cannot continue>/error/fao=0!/ansi=0
 ZCINVALIDKEYWORD	<External call: Invalid keyword found. Cannot continue>/error/fao=0!/ansi=0
-UNUSEDMSG1386	<REPLNOMULTILINETRG : Last used in V6.2-000>/error/fao=0!/ansi=0
+UNUSEDMSG1389	<REPLNOMULTILINETRG : Last used in V6.2-000>/error/fao=0!/ansi=0
 DBSHMNAMEDIFF	<Database file !AD points to shared memory (id = !UL) which points to a different database file !AZ>/error/fao=4!/ansi=0
 SHMREMOVED	<Removed Shared Memory id !UL corresponding to file !AD>/info/fao=3!/ansi=0
 DEVICEWRITEONLY	<Cannot read from a write-only device>/error/fao=0!/ansi=0
@@ -1526,7 +1529,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
-UNUSEDMSG1529	<REGOPENRETRY last used in V6.3-000A>/error/fao=0!/ansi=0
+UNUSEDMSG1532	<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,7 +1539,7 @@ 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
-UNUSEDMSG1539	<GVSUBSERR last used in V6.3-000A>/error/fao=0!/ansi=0
+UNUSEDMSG1542	<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
@@ -1580,7 +1583,7 @@ HLPPROC		<Helper Process error>/error/fao=0!/ansi=0
 REPLNOHASHTREC	<Sequence number 0x!16 at XQ contains trigger definition updates. !AD side must be at least V6.2-000 for replication to continue>/error/fao=3!/ansi=0
 REMOTEDBNOTRIG	<Trigger operations on global !AD not supported as it maps to database region !AD that points to a remote file>/error/fao=4!/ansi=0
 NEEDTRIGUPGRD	<Cannot do trigger operation on database file !AD until it is upgraded; Run MUPIP TRIGGER -UPGRADE first>/error/fao=2!/ansi=0
-REQRLNKCTLRNDWN	<Error accessing relinkctl file for $ZROUTINES directory !AD. Must be rundown>/error/fao=2!/ansi=0
+REQRLNKCTLRNDWN	<Error accessing relinkctl file !AZ for $ZROUTINES directory !AD. Must be rundown>/error/fao=3!/ansi=0
 RLNKCTLRNDWNSUC	<Relinkctl file for $ZROUTINES directory !AD successfully rundown>/info/fao=2!/ansi=0
 RLNKCTLRNDWNFL	<Relinkctl file for $ZROUTINES directory !AD failed to rundown as it is open by !UL process(es)>/error/fao=3!/ansi=0
 MPROFRUNDOWN	<Error during M-profiling rundown>/error/fao=0!/ansi=0
@@ -1616,7 +1619,7 @@ CRYPTKEYRELEASEFAILED	<Could not safely release encryption key corresponding to
 MUREENCRYPTSTART	<Database !AD : MUPIP REORG ENCRYPT started by pid !UL at transaction number [0x!16 at XQ]>/info/fao=4!/ansi=0
 MUREENCRYPTV4NOALLOW	<Database (re)encryption supported only on fully upgraded V5 databases. !AD has V4 format blocks>/error/fao=2!/ansi=0
 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
+JNLPOOLRECOVERY	<The size of the data written to the journal pool (!UL) does not match the size of the data in the journal files (!UL) at journal sequence number [0x!16 at XQ] for the replication instance file !AZ. The journal pool has been recovered.>/error/fao=4!/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
@@ -1658,6 +1661,13 @@ STATSDBFNERR	<This database has no accessible statistics database due to the fol
 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
+LVMONBADVAL	<Value for local variable !AD changed inappropriately between two points for indexes !UL and !UL - expected value: !AD  actual value: !AD - Generating core>/error/fao=8!/ansi=0
+RESTRICTEDOP	<Attempt to perform a restricted operation: !AZ>/error/fao=1!/ansi=0
+RESTRICTSYNTAX	<Syntax error in file !AD at line number !UL. All facilities restricted for process.>/error/fao=3!/ansi=0
+MUCREFILERR	<Error in/at !AD creating database !AD (region !AD)>/error/fao=6!/ansi=0
+JNLBUFFPHS2SALVAGE	<Salvaged journal records from process !UL for database file !AD at transaction number [0x!16 at XQ] and journal-sequence-number/unique-token [0x!16 at XQ] with journal file starting offset [0x!XL] and length [0x!XL]>/info/fao=7!/ansi=0
+JNLPOOLPHS2SALVAGE	<Salvaged journal records from process !UL for replication instance file !AD at journal sequence number [0x!16 at XQ] with journal pool starting offset [0x!16 at XQ] and length [0x!XL]>/info/fao=6!/ansi=0
+MURNDWNARGLESS	<Argumentless MUPIP RUNDOWN started with process id !UL by userid !UL from directory !AD>/info/fao=4!/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 340020b..dc3e08f 100755
--- a/sr_port/mlk_lock.c
+++ b/sr_port/mlk_lock.c
@@ -45,10 +45,6 @@
 #include "interlock.h"
 #include "rel_quant.h"
 
-#ifdef VMS
-GBLREF uint4	image_count;
-#endif
-
 GBLREF	int4		process_id;
 GBLREF	short		crash_count;
 GBLREF	uint4		dollar_tlevel;
@@ -90,7 +86,7 @@ uint4 mlk_lock(mlk_pvtblk *p,
 		ctl = p->ctlptr;
 		if (dollar_tlevel)
 		{
-			assert((CDB_STAGNATE > t_tries) || csa->now_crit);
+			assert((CDB_STAGNATE > t_tries) || csa->now_crit || !csa->lock_crit_with_db);
 			/* 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));
 		}
diff --git a/sr_port/mlk_unlock.c b/sr_port/mlk_unlock.c
index 966ded6..de91d71 100755
--- a/sr_port/mlk_unlock.c
+++ b/sr_port/mlk_unlock.c
@@ -59,7 +59,7 @@ void mlk_unlock(mlk_pvtblk *p)
 		d = p->nodptr;
 		if (dollar_tlevel)
 		{
-			assert((CDB_STAGNATE > t_tries) || csa->now_crit);
+			assert((CDB_STAGNATE > t_tries) || csa->now_crit || !csa->lock_crit_with_db);
 			/* 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));
 		}
diff --git a/sr_port/mtables.c b/sr_port/mtables.c
index 06eb907..69de5c8 100644
--- a/sr_port/mtables.c
+++ b/sr_port/mtables.c
@@ -40,6 +40,7 @@
 #endif
 #include "gtm_reservedDB.h"
 #include "mtables.h"
+#include "iotimer.h"
 
 LITDEF char ctypetab[NUM_CHARS] =
 {
@@ -199,7 +200,7 @@ 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[8] = {'-', '1', '1', '1', '0', '1', '0', '0'};
+static readonly unsigned char localpool[15] = {'-', '1', '1', '1', '0', '1', '0', '0', '5', '2', '4', '2', '8', '6'};
 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);
@@ -209,6 +210,7 @@ LITDEF mval literal_oneohoh	= DEFINE_MVAL_LITERAL(MV_STR | MV_NM | MV_INT, 0, 0,
 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);
+LITDEF mval literal_notimeout	= DEFINE_MVAL_LITERAL(MV_STR | MV_NM | MV_INT, 0, 0, 6, (char *)&localpool[8], 0, NO_M_TIMEOUT);
 
 /* --------------------------------------------------------------------------------------------------------------------------
  * All string mvals defined in this module using LITDEF need to have MV_NUM_APPROX bit set. This is because these mval
diff --git a/sr_port/mupip_backup.c b/sr_port/mupip_backup.c
index a920278..13037ae 100755
--- a/sr_port/mupip_backup.c
+++ b/sr_port/mupip_backup.c
@@ -1390,7 +1390,7 @@ repl_inst_bkup_done2:
 			rptr->backup_hdr->shmid = INVALID_SHMID;
 			rptr->backup_hdr->gt_sem_ctime.ctime = 0;
 			rptr->backup_hdr->gt_shm_ctime.ctime = 0;
-			if (jnl_options[jnl_off] || bkdbjnl_off_specified)
+			if ((jnl_options[jnl_off] || bkdbjnl_off_specified) && (jnl_notallowed != gv_cur_region->jnl_state))
 				rptr->backup_hdr->jnl_state = jnl_closed;
 			if (jnl_options[jnl_disable] || bkdbjnl_disable_specified)
 			{
diff --git a/sr_port/mupip_io_dev_dispatch.h b/sr_port/mupip_io_dev_dispatch.h
index cbf40a8..1ab45a9 100755
--- a/sr_port/mupip_io_dev_dispatch.h
+++ b/sr_port/mupip_io_dev_dispatch.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	*
@@ -14,33 +15,16 @@
  *
  * Following definitions have a pattern that most of the routines follow. Only exceptions is:
  *      1. ioff_open() is an extra routine
- *
- * VMS can have addresses in literal constants while most Unix platforms cannot
  */
-UNIX_ONLY(GBLDEF) VMS_ONLY(LITDEF) dev_dispatch_struct io_dev_dispatch_mupip[] =
+GBLDEF dev_dispatch_struct io_dev_dispatch_mupip[] =
 {
-#	ifdef UNIX
 	iotype(iott, iott, iott, nil),
-#	else
-	ionil_dev,
-#	endif
 	ionil_dev,
-#	ifdef UNIX
 	iotype(iorm, iorm, iopi, iopi),
-#	else
-	iotype(iorm, iorm, nil, nil),
-#	endif
 	ionil_dev,
 	ionil_dev,
 	ionil_dev,
-#	ifdef UNIX
 	iotype(ioff, iorm, iopi, nil),
-#	else
-	iotype(ioff, iorm, nil, nil),
-#	endif
 	ionil_dev,
 	ionil_dev
-#	ifdef UNIX
-	,ionil_dev
-#	endif
 };
diff --git a/sr_port/mupip_recover.c b/sr_port/mupip_recover.c
index 7cc8d25..0e8e8ed 100755
--- a/sr_port/mupip_recover.c
+++ b/sr_port/mupip_recover.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	*
@@ -299,9 +299,7 @@ void	mupip_recover(void)
 			 * If so we have to increment cycles in mur_close_files.
 			 */
 			assert(NULL != jnlpool.repl_inst_filehdr);
-			murgbl.incr_db_rlbkd_cycle = jgbl.onlnrlbk
-							? jnlpool.repl_inst_filehdr->jnl_seqno - murgbl.consist_jnl_seqno
-							: FALSE;
+			murgbl.incr_db_rlbkd_cycle = FALSE;
 			gtm_putmsg_csa(CSA_ARG(NULL) VARLSTCNT(4) ERR_RLBKJNSEQ, 2,
 					&murgbl.consist_jnl_seqno, &murgbl.consist_jnl_seqno);
 		}
@@ -553,8 +551,10 @@ void	mupip_recover(void)
 	{
 		/* Determine if any of the databases are taken back in time. If so we have to increment cycles in mur_close_files */
 		assert(NULL != jnlpool.repl_inst_filehdr);
-		murgbl.incr_db_rlbkd_cycle = jgbl.onlnrlbk ? jnlpool.repl_inst_filehdr->jnl_seqno - murgbl.consist_jnl_seqno
-							   : FALSE;
+		assert(!jnlpool.repl_inst_filehdr->jnl_seqno || (jnlpool.repl_inst_filehdr->jnl_seqno >= murgbl.consist_jnl_seqno));
+		murgbl.incr_db_rlbkd_cycle = (jnlpool.repl_inst_filehdr->jnl_seqno)
+						? (jnlpool.repl_inst_filehdr->jnl_seqno != murgbl.consist_jnl_seqno)
+						: FALSE;
 	}
 	/* PHASE 7 : Close all files, rundown and exit */
 	murgbl.clean_exit = TRUE;
diff --git a/sr_port/mupip_set_journal.c b/sr_port/mupip_set_journal.c
index 412e785..7297d7b 100755
--- a/sr_port/mupip_set_journal.c
+++ b/sr_port/mupip_set_journal.c
@@ -795,7 +795,7 @@ uint4	mupip_set_journal(unsigned short db_fn_len, char *db_fn)
 		{	/* 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);
+				jnl_set_cur_prior(gv_cur_region, cs_addrs, csd);
 			/* Reset all fields */
 			csd->jnl_before_image = FALSE;
 			csd->jnl_state = jnl_notallowed;
diff --git a/sr_port/muprec.h b/sr_port/muprec.h
old mode 100755
new mode 100644
index b6f644c..f51d75e
--- a/sr_port/muprec.h
+++ b/sr_port/muprec.h
@@ -93,16 +93,6 @@ error_def(ERR_SYSCALL);
 	murgbl.extr_buff[extract_len++] = '\\';				\
 }
 
-/* extract jnl record "rec" using extraction routine "extract" into file "file_info" (extract/lost/broken transaction files) */
-#define EXTRACT_JNLREC(jctl, rec, extract, file_info, status)		\
-{									\
-	pini_list_struct	*plst;					\
-									\
-	status = mur_get_pini(jctl, (rec)->prefix.pini_addr, &plst);	\
-	if (SS_NORMAL == status)					\
-		(*extract)(jctl, (file_info), (rec), plst);		\
-}
-
 #define	EXTPID(plst)					\
 {							\
 	EXTINT(plst->jpv.jpv_pid);			\
@@ -174,16 +164,16 @@ error_def(ERR_SYSCALL);
 
 #define IS_VALID_LEN_FROM_PREFIX(JREC, JFH)							\
 (	/* length within range */								\
-	(ROUND_DOWN2((JREC)->prefix.forwptr, JNL_REC_START_BNDRY) == (JREC)->prefix.forwptr) &&	\
-	(JREC)->prefix.forwptr > MIN_JNLREC_SIZE  &&						\
-	(JREC)->prefix.forwptr <= (JFH)->max_jrec_len						\
+	(ROUND_DOWN2((JREC)->prefix.forwptr, JNL_REC_START_BNDRY) == (JREC)->prefix.forwptr)	\
+		&& (MIN_JNLREC_SIZE <= (JREC)->prefix.forwptr)					\
+		&& ((JREC)->prefix.forwptr <= (JFH)->max_jrec_len)				\
 )
 
 #define IS_VALID_LEN_FROM_SUFFIX(SUFFIX, JFH)							\
 ( /* length within range */									\
-	(ROUND_DOWN2((SUFFIX)->backptr, JNL_REC_START_BNDRY) == (SUFFIX)->backptr) &&		\
-  	(SUFFIX)->backptr > MIN_JNLREC_SIZE &&							\
-	(SUFFIX)->backptr <= (JFH)->max_jrec_len						\
+	(ROUND_DOWN2((SUFFIX)->backptr, JNL_REC_START_BNDRY) == (SUFFIX)->backptr)		\
+  		&& (MIN_JNLREC_SIZE <= (SUFFIX)->backptr)					\
+		&& ((SUFFIX)->backptr <= (JFH)->max_jrec_len)					\
 )
 
 #define IS_VALID_LINKS(JREC)													\
@@ -348,7 +338,10 @@ enum rec_fence_type
 {
 	NOFENCE = 0,
 	TPFENCE = 1,
-	ZTPFENCE = 2
+	ZTPFENCE = 2,
+	NULLFENCE = 3	/* i.e. a multi-region TP transaction whose TSET/TKILL/USET/UKILL journal records got replaced
+			 * as NULL records by "jnl_phase2_salvage" due to kill9 of process before jnl records were written.
+			 */
 };
 
 enum broken_type
@@ -426,7 +419,7 @@ typedef struct multi_element_struct
 	jnl_tm_t			time;
 	uint4				partner;	/* # of unmatched regions involved in TP/ZTP */
 	uint4				tot_partner;	/* Total # of regions originally involved in TP/ZTP */
-	enum rec_fence_type 		fence;		/* NOFENCE or TPFENCE or ZTPFENCE */
+	enum rec_fence_type 		fence;		/* NOFENCE or TPFENCE or ZTPFENCE or NULLFENCE */
 	struct multi_element_struct	*next;
 } multi_struct;
 
diff --git a/sr_port/mur_back_process.c b/sr_port/mur_back_process.c
old mode 100755
new mode 100644
index 8a6f589..f194bdd
--- a/sr_port/mur_back_process.c
+++ b/sr_port/mur_back_process.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	*
@@ -412,7 +412,7 @@ uint4 mur_back_processing(jnl_tm_t alt_tp_resolve_time)
 						|| (iterationcnt && (strm_seqno == murgbl.resync_strm_seqno[idx])));
 					MUR_SAVE_RESYNC_STRM_SEQNO(rctl, csd);
 					/* flush the changed csd to disk */
-					fc = rctl->gd->dyn.addr->file_cntl;
+					fc = FILE_CNTL(rctl->gd);
 					fc->op = FC_WRITE;
 					/* Note: csd points to shared memory and is already aligned
 					 * appropriately even if db was opened using O_DIRECT.
@@ -597,7 +597,7 @@ uint4	mur_back_processing_one_region(mur_back_opt_t *mur_back_options)
 	reg_ctl_list		*rctl;
 	seq_num			rec_token_seq, save_resync_seqno, save_strm_seqno, strm_seqno;
 	token_num		token, last_tcom_token;
-	trans_num		rec_tn;
+	trans_num		prev_tn, rec_tn;
 	uint4			max_blk_size, max_rec_size;
 	uint4			status, val_len;
 	unsigned short		max_key_size;
@@ -624,13 +624,15 @@ uint4	mur_back_processing_one_region(mur_back_opt_t *mur_back_options)
 	}
 	mur_desc = rctl->mur_desc;
 	jnlrec = mur_desc->jnlrec;
-	rec_tn = jnlrec->prefix.tn;
+	rectype = (enum jnl_record_type)jnlrec->prefix.jrec_type;
+	/* Note: JRT_ALIGN does not have a "prefix.tn" field so need to use GET_JREC_TN macro which handles that case */
+	rec_tn = GET_JREC_TN(jnlrec, rectype);
 	rec_token_seq = mur_back_options->rec_token_seq;
 	first_epoch = mur_back_options->first_epoch;
 	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;
+	fc = FILE_CNTL(rctl->gd);
 	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" */
@@ -648,6 +650,10 @@ uint4	mur_back_processing_one_region(mur_back_opt_t *mur_back_options)
 		assert(0 == jctl->turn_around_offset);
 		jnlrec = mur_desc->jnlrec;
 		rectype = (enum jnl_record_type)jnlrec->prefix.jrec_type;
+		prev_tn = rec_tn;
+		/* Note: JRT_ALIGN does not have a "prefix.tn" field so need to use GET_JREC_TN macro which handles that case */
+		rec_tn = GET_JREC_TN(jnlrec, rectype);
+		rec_time = jnlrec->prefix.time;
 		/* Even if -verify is NOT specified, if the journal file had a crash, do verification until
 		 * the first epoch is reached as the journal file could be corrupt anywhere until then
 		 * (mur_fread_eof on the journal file at the start might not have caught it).
@@ -656,11 +662,11 @@ uint4	mur_back_processing_one_region(mur_back_opt_t *mur_back_options)
 		{
 			if (!mur_validate_checksum(jctl))
 				MUR_BACK_PROCESS_ERROR(jctl, "Checksum validation failed");
-			if ((jnlrec->prefix.tn != rec_tn) && (jnlrec->prefix.tn != (rec_tn - 1)))
+			/* Note: If tn is TN_INVALID for current record or previous record (i.e. JRT_ALIGN), then skip the check */
+			if ((TN_INVALID != rec_tn) && (TN_INVALID != prev_tn) && (rec_tn != prev_tn) && (rec_tn != (prev_tn - 1)))
 			{
 				SNPRINTF(s, TRANS_OR_SEQ_NUM_CONT_CHK_FAILED_SZ, TRANS_NUM_CONT_CHK_FAILED,
-					jnlrec->prefix.tn, rec_tn);
-				rec_tn = jnlrec->prefix.tn;
+					rec_tn, prev_tn);
 				MUR_BACK_PROCESS_ERROR(jctl, s);
 			}
 			if (mur_options.rollback && REC_HAS_TOKEN_SEQ(rectype) && (GET_JNL_SEQNO(jnlrec) > rec_token_seq))
@@ -680,6 +686,7 @@ uint4	mur_back_processing_one_region(mur_back_opt_t *mur_back_options)
 				{	/* Currently encryption operations are not thread-safe. Use lock to serialize */
 					PTHREAD_MUTEX_LOCK_IF_NEEDED(was_holder);
 					use_new_key = USES_NEW_KEY(jctl->jfh);
+					assert(TN_INVALID != rec_tn);
 					assert(NEEDS_NEW_KEY(jctl->jfh, rec_tn) == use_new_key);
 					MUR_DECRYPT_LOGICAL_RECS(
 							keystr,
@@ -771,8 +778,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;
 		}
-		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.
 		 * For non-replication (that is, doing recover) token_seq.token field is used as token in hash table.
 		 * For replication (that is, doing rollback) token_seq.jnl_seqno is used as token in hash table.
@@ -855,6 +860,7 @@ uint4	mur_back_processing_one_region(mur_back_opt_t *mur_back_options)
 			 * In this case we would have applied PBLKs from the interrupted recovery first before coming here
 			 * hence the check for a NULL rctl->jctl_apply_pblk in which case we skip the tn check.
 			 */
+			assert(TN_INVALID != rec_tn);
 			if (!mur_options.forward && first_epoch && !rctl->recov_interrupted && (NULL == rctl->jctl_apply_pblk)
 				&& (NULL != rctl->csd) && (rec_tn > rctl->csd->trans_hist.curr_tn))
 			{
@@ -876,7 +882,7 @@ uint4	mur_back_processing_one_region(mur_back_opt_t *mur_back_options)
 				first_epoch = FALSE;
 			}
 			assert(mur_options.forward || murgbl.intrpt_recovery || (NULL == rctl->csd)
-				|| (jnlrec->prefix.tn <= rctl->csd->trans_hist.curr_tn));
+				|| (rec_tn <= rctl->csd->trans_hist.curr_tn));
 			if (rec_time < jgbl.mur_tp_resolve_time)
 			{	/* Reached EPOCH before resolve-time. Check if we have reached turnaround point.
 				 * For no rollback OR for simple rollback with -resync or -fetchresync NOT specified,
@@ -952,7 +958,7 @@ uint4	mur_back_processing_one_region(mur_back_opt_t *mur_back_options)
 		if (IS_FENCED(rectype))
 		{	/* Note for a ZTP if FSET/GSET is present before mur_options.before_time and
 			 * GUPD/ZTCOM are present after mur_options.before_time, it is considered broken. */
-			rec_fence = GET_REC_FENCE_TYPE(rectype);
+			rec_fence = (IS_TP(rectype) ? TPFENCE : ZTPFENCE);
 			assert(token == ((struct_jrec_upd *)jnlrec)->token_seq.token);
 			/* Get thread-lock before searching/adding in token hash table */
 			PTHREAD_MUTEX_LOCK_IF_NEEDED(was_holder);
@@ -1085,7 +1091,7 @@ uint4	mur_back_processing_one_region(mur_back_opt_t *mur_back_options)
 			}
 			if (!skip_rec)
 			{
-				rec_fence = GET_REC_FENCE_TYPE(rectype);
+				rec_fence = (JRT_NULL == rectype) ? NULLFENCE : NOFENCE;
 				assert(token == ((struct_jrec_upd *)jnlrec)->token_seq.token);
 				/* For rollback, pid/image_type/time are not necessary to establish uniqueness of token
 				 * as token (which is a seqno) is already guaranteed to be unique for an instance.
@@ -1095,9 +1101,8 @@ uint4	mur_back_processing_one_region(mur_back_opt_t *mur_back_options)
 				if (NULL == (multi = MUR_TOKEN_LOOKUP(token, 0, rec_fence)))
 				{	/* We reuse same token table. Most of the fields in multi_struct are unused */
 					MUR_TOKEN_ADD(multi, token, 0, 1, rec_fence, last_tcom_token);
-				} else
+				} else if (NULLFENCE != rec_fence)
 				{
-					assert(FALSE);
 					if (!(mur_report_error(jctl, MUR_DUPTOKEN)))
 					{
 						PTHREAD_MUTEX_UNLOCK_IF_NEEDED(was_holder);
@@ -1105,6 +1110,11 @@ uint4	mur_back_processing_one_region(mur_back_opt_t *mur_back_options)
 						return ERR_DUPTOKEN;
 					}
 				}
+				/* else: if "NULLFENCE == rec_fence", then it is possible we see a NULL record with the same
+				 * seqno across MULTIPLE regions in case "jnl_phase2_salvage" wrote those records overriding
+				 * the reserved space in the jnl file when the process got kill9'ed in phase2 of commit.
+				 * So do not treat that as an error.
+				 */
 				PTHREAD_MUTEX_UNLOCK_IF_NEEDED(was_holder);
 			}
 		}
@@ -1135,8 +1145,8 @@ uint4	mur_back_processing_one_region(mur_back_opt_t *mur_back_options)
 					jnlrec = mur_desc->jnlrec;
 					rectype = (enum jnl_record_type)jnlrec->prefix.jrec_type;
 					rec_time = jnlrec->prefix.time;
-					rec_token_seq = GET_JNL_SEQNO(jnlrec);
 					assert(JRT_EPOCH == rectype);
+					rec_token_seq = GET_JNL_SEQNO(jnlrec);
 					/* handle non-epoch (out-of-design) situation in pro nevertheless */
 					reached_trnarnd = (JRT_EPOCH == rectype)
 							&& (!murgbl.resync_seqno || (rec_token_seq <= murgbl.resync_seqno));
@@ -1209,8 +1219,8 @@ uint4	mur_back_processing_one_region(mur_back_opt_t *mur_back_options)
 			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);
+			rec_token_seq = GET_JNL_SEQNO(jnlrec);
 			assert(!murgbl.resync_seqno || (rec_token_seq <= murgbl.resync_seqno));	/* else RESYNCSEQNOLOW error
 												 * would have been issued.
 												 */
diff --git a/sr_port/mur_close_files.c b/sr_port/mur_close_files.c
index 774eb20..289776f 100644
--- a/sr_port/mur_close_files.c
+++ b/sr_port/mur_close_files.c
@@ -56,6 +56,7 @@
 #include "wcs_flu.h"
 #include "gtm_sem.h"
 #include "gtm_file_stat.h"
+#include "gtm_ipc.h"
 #ifdef DEBUG
 #include "wbox_test_init.h"
 #endif
@@ -176,15 +177,30 @@ boolean_t mur_close_files(void)
 	}
 	anticipatory_freeze_available = INST_FREEZE_ON_ERROR_POLICY;
 	inst_hdr = jnlpool.repl_inst_filehdr;
-	/* Note that murgbl.consist_jnl_seqno is maintained even if the only thing done by rollback was lost transaction processing.
-	 * In this case, we shouldn't consider the instance as being rolled back. So, set murgbl.incr_db_rlbkd_cycle = FALSE;
-	 */
-	if (mur_options.rollback_losttnonly)
+	if (jgbl.onlnrlbk)
 	{
-		assert(!murgbl.incr_onln_rlbk_cycle); /* should not have been set because we did not touch the database at all */
-		murgbl.incr_db_rlbkd_cycle = FALSE;
+		/* Note that murgbl.consist_jnl_seqno is maintained even if the only thing done by rollback was
+		 * lost transaction processing. In this case, we shouldn't consider the instance as being rolled back.
+		 * So, set murgbl.incr_db_rlbkd_cycle = FALSE;
+		 */
+		if (mur_options.rollback_losttnonly)
+		{
+			assert(!murgbl.incr_onln_rlbk_cycle);	/* should not have been set because we did not touch
+								 * the database at all.
+								 */
+			murgbl.incr_db_rlbkd_cycle = FALSE;
+		}
+		/* Note that even if murgbl.incr_db_rlbkd_cycle is TRUE (i.e. the pre-rollback seqno is different
+		 * from the post-rollback seqno, it is possible murgbl.incr_onln_rlbk_cycle is FALSE. For example,
+		 * if we are taking the db back in time seqno wise and all those seqnos happen to be JRT_NULL type of
+		 * records, it is possible undoing those seqnos would not result in any PBLKs being played in the database.
+		 * But as long as at least one database has been taken back in time, we need to set murgbl.incr_onln_rlbk_cycle
+		 * to TRUE as that is the only way csa->nl->onln_rlbk_cycle++ will happen below and in turn this change in seqno
+		 * will be communicated to an active source server that is replicating (so it can react to the online-rollback).
+		 */
+		 if (murgbl.incr_db_rlbkd_cycle)
+			murgbl.incr_onln_rlbk_cycle = TRUE;
 	}
-	assert(!murgbl.incr_db_rlbkd_cycle || murgbl.incr_onln_rlbk_cycle);
 	assert(jnlpool.jnlpool_ctl == jnlpool_ctl);
 #	if 0
 	/* disable assertion until we make jnlpool_init conditional on anticipatory freeze available */
@@ -432,6 +448,7 @@ boolean_t mur_close_files(void)
 					jb = jpc->jnl_buff;
 					jnl_flush(reg);
 					assert(jb->freeaddr == jb->dskaddr);
+					assert(jb->rsrv_freeaddr == jb->freeaddr);
 					jnl_fsync(reg, jb->dskaddr);
 					assert(jb->fsync_dskaddr == jb->dskaddr);
 				}
@@ -471,7 +488,7 @@ boolean_t mur_close_files(void)
 					{
 						jctl->jfh->recover_interrupted = FALSE;
 						/* Since overwriting the journal file header (an already allocated block
-						 * in the file) should not cause ENOSPC, we dont take the trouble of
+						 * in the file) should not cause ENOSPC, we don't take the trouble of
 						 * passing csa or jnl_fn (first two parameters). Instead we pass NULL.
 						 */
 						JNL_DO_FILE_WRITE(NULL, NULL, jctl->channel, 0, jctl->jfh, REAL_JNL_HDR_LEN,
@@ -509,7 +526,7 @@ boolean_t mur_close_files(void)
 				jctl->jfh->prev_recov_blks_to_upgrd_adjust = rctl->blks_to_upgrd_adjust;
 				jctl->jfh->next_jnl_file_name_length = 0;
 				/* Since overwriting the journal file header (an already allocated block
-				 * in the file) should not cause ENOSPC, we dont take the trouble of
+				 * in the file) should not cause ENOSPC, we don't take the trouble of
 				 * passing csa or jnl_fn (first two parameters). Instead we pass NULL.
 				 */
 				JNL_DO_FILE_WRITE(NULL, NULL, jctl->channel, 0,
@@ -528,7 +545,7 @@ boolean_t mur_close_files(void)
 					assert(0 == end_jctl->turn_around_offset);
 					end_jctl->jfh->next_jnl_file_name_length = 0;
 					/* Since overwriting the journal file header (an already allocated block
-					 * in the file) should not cause ENOSPC, we dont take the trouble of
+					 * in the file) should not cause ENOSPC, we don't take the trouble of
 					 * passing csa or jnl_fn (first two parameters). Instead we pass NULL.
 					 */
 					JNL_DO_FILE_WRITE(NULL, NULL, end_jctl->channel, 0, end_jctl->jfh, REAL_JNL_HDR_LEN,
@@ -605,7 +622,7 @@ boolean_t mur_close_files(void)
 		{	/* In case of -ROLLBACK -BACKWARD, do some replication instance file related cleanup.
 			 * For -ROLLBACK -FORWARD, we do not touch the instance file.
 			 */
-			assert(!mur_options.forward);	/* or else murgbl.repl_standalone wont be TRUE
+			assert(!mur_options.forward);	/* or else murgbl.repl_standalone won't be TRUE
 							 * (needed to get in this "if" block)
 							 */
 			udi = FILE_INFO(jnlpool.jnlpool_dummy_reg);
@@ -626,8 +643,14 @@ boolean_t mur_close_files(void)
 						 * which could be 0 even though the next expected seqno is 1) so reset it to 1
 						 * instead in that case. See repl_inst_create.c & gtmsource_seqno_init.c for
 						 * more such 0 -> 1 seqno adjustments.
+						 * For stream #s 1 thru 15, check if there is a non-zero uuid information in the
+						 * instance file header. To avoid REPLINSTNOHIST errors the next time some
+						 * communication happens on this stream #, reset it to 1. See the function
+						 * "repl_inst_histinfo_truncate" for similar adjustments.
 						 */
-						if ((0 == idx) && !this_strm_seqno)
+						if (!this_strm_seqno
+							&& ((0 == idx)
+								|| IS_REPL_INST_UUID_NON_NULL(inst_hdr->strm_group_info[idx - 1])))
 							this_strm_seqno = 1;
 						inst_hdr->strm_seqno[idx] = this_strm_seqno;
 						if (this_strm_seqno)
@@ -670,7 +693,9 @@ boolean_t mur_close_files(void)
 						jnlpool_ctl->last_histinfo_seqno = last_histinfo_seqno;
 						jnlpool_ctl->jnl_seqno = murgbl.consist_jnl_seqno;
 						jnlpool_ctl->start_jnl_seqno = murgbl.consist_jnl_seqno;
-						jnlpool_ctl->early_write_addr = jnlpool_ctl->write_addr = jnlpool_ctl->write = 0;
+						jnlpool_ctl->rsrv_write_addr = jnlpool_ctl->write_addr = 0;
+						jnlpool_ctl->rsrv_write_addr = 0;
+						assert(jnlpool_ctl->phase2_commit_index1 == jnlpool_ctl->phase2_commit_index2);
 						jnlpool_ctl->lastwrite_len = 0;
 						jnlpool_ctl->max_zqgblmod_seqno = max_zqgblmod_seqno;
 						/* Keep strm_seqno in journal pool in sync with the one in instance file header */
@@ -751,7 +776,7 @@ boolean_t mur_close_files(void)
 		reg = rctl->gd;
 		if (NULL == reg)
 			continue;
-		udi = (NULL != reg->dyn.addr->file_cntl) ? FILE_INFO(reg) : NULL;
+		udi = (NULL != FILE_CNTL(reg)) ? FILE_INFO(reg) : NULL;
 		if (reg->open)
 		{
 			assert(!mur_options.forward); /* for forward recovery, "gds_rundown" should have been done before */
@@ -801,7 +826,7 @@ boolean_t mur_close_files(void)
 	}
 	if (mur_options.rollback && murgbl.repl_standalone)
 	{
-		assert(!mur_options.forward);	/* or else murgbl.repl_standalone wont be TRUE (needed to get in this "if" block) */
+		assert(!mur_options.forward); /* or else murgbl.repl_standalone won't be TRUE (needed to get in this "if" block) */
 		udi = FILE_INFO(jnlpool.jnlpool_dummy_reg);
 		ASSERT_HOLD_REPLPOOL_SEMS;
 		/* repl_inst_read and mu_replpool_release_sem expects that the caller holds the ftok semaphore as it is about to
@@ -845,20 +870,13 @@ boolean_t mur_close_files(void)
 				ISSUE_REPLPOOLINST(save_errno, repl_instance.jnlpool_shmid, repl_instance.inst_info.this_instname,
 							"shmctl()");
 			}
-			if (-1 == shmdt((caddr_t)jnlpool_ctl))
+			JNLPOOL_SHMDT(jnlpool, status, save_errno);
+			if (-1 == status)
 			{
-				save_errno = errno;
 				ISSUE_REPLPOOLINST(save_errno, repl_instance.jnlpool_shmid, repl_instance.inst_info.this_instname,
 							"shmdt()");
 				assert(FALSE);
 			}
-			/* Since journal pool is no longer attached, null out fields to indicate it is invalid. */
-			jnlpool.jnlpool_ctl = NULL;
-			jnlpool_ctl = NULL;
-			jnlpool.gtmsrc_lcl_array = NULL;
-			jnlpool.gtmsource_local_array = NULL;
-			jnlpool.jnldata_base = NULL;
-			jnlpool.repl_inst_filehdr = NULL;
 			if ((1 == shm_buf.shm_nattch) && !inst_frozen)
 			{	/* We are the only one attached. Go ahead and remove the shared memory ID and invalidate it in the
 				 * instance file header as well.
@@ -877,7 +895,7 @@ boolean_t mur_close_files(void)
 				/* Now that the journal pool shared memory is removed, go ahead and invalidate it in the file
 				 * header. Note that we cannot reset the halted fields (ftok_counter_halted) because the
 				 * processes that are attached to the journal pool OR the receive pool bump the ftok counter.
-				 * All we know is that there is no one attached to the journal pool now. We dont know anything
+				 * All we know is that there is no one attached to the journal pool now. We don't know anything
 				 * about the receive pool. Resetting ftok_counter_halted implies the ftok counter is back to
 				 * being reliable and that is not correct. We leave it unchanged instead of attaching to the
 				 * receive pool shmid and determining the # of pids attached to it.
diff --git a/sr_port/mur_forward.c b/sr_port/mur_forward.c
index ebba4ed..07e6d62 100644
--- a/sr_port/mur_forward.c
+++ b/sr_port/mur_forward.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	*
@@ -399,9 +399,10 @@ int	mur_forward_multi_proc(reg_ctl_list *rctl)
 		CHECK_IF_EOF_REACHED(rctl, status); /* sets rctl->forw_eof_seen if needed; resets "status" to SS_NORMAL */
 		if (SS_NORMAL != status)
 		{	/* ERR_FILENOTCREATE is possible from "mur_cre_file_extfmt" OR	ERR_FORCEDHALT is possible
-			 * from "mur_forward_play_cur_jrec". No other errors are known to occur here. Assert accordingly.
+			 * from "mur_forward_play_cur_jrec" OR SYSTEM-E-ENO2 from a ERR_RENAMEFAIL is possible from
+			 * a "rename_file_if_exists" call. No other errors are known to occur here. Assert accordingly.
 			 */
-			assert((ERR_FILENOTCREATE == status) || (ERR_FORCEDHALT == status));
+			assert((ERR_FILENOTCREATE == status) || (ERR_FORCEDHALT == status) || (ENOENT == status));
 			goto finish;
 		}
 		if (rctl->forw_eof_seen)
diff --git a/sr_port/mur_forward_play_cur_jrec.c b/sr_port/mur_forward_play_cur_jrec.c
index bd2c937..150736a 100644
--- a/sr_port/mur_forward_play_cur_jrec.c
+++ b/sr_port/mur_forward_play_cur_jrec.c
@@ -128,7 +128,8 @@ uint4	mur_forward_play_cur_jrec(reg_ctl_list *rctl)
 		if (USES_ANY_KEY(jctl->jfh))
 		{
 			use_new_key = USES_NEW_KEY(jctl->jfh);
-			assert(NEEDS_NEW_KEY(jctl->jfh, rec->prefix.tn) == use_new_key);
+			/* Note: JRT_ALIGN does not have a "prefix.tn" field. But in that case we would not have come in the "if" */
+			assert((JRT_ALIGN != rectype) && NEEDS_NEW_KEY(jctl->jfh, rec->prefix.tn) == use_new_key);
 			MUR_DECRYPT_LOGICAL_RECS(
 					keystr,
 					(use_new_key ? TRUE : jctl->jfh->non_null_iv),
@@ -183,8 +184,7 @@ uint4	mur_forward_play_cur_jrec(reg_ctl_list *rctl)
 			if (IS_TP(rectype) && ((!mur_options.rollback && rec_time < murgbl.min_broken_time)
 						|| (mur_options.rollback && rec_token_seq < murgbl.min_broken_seqno)))
 			{
-				rec_fence = GET_REC_FENCE_TYPE(rectype);
-				if (NULL != (multi = MUR_TOKEN_LOOKUP(rec_token_seq, rec_time, rec_fence)))
+				if (NULL != (multi = MUR_TOKEN_LOOKUP(rec_token_seq, rec_time, TPFENCE)))
 				{
 					assert(0 == multi->partner);
 					assert(FALSE == multi->this_is_broken);
@@ -209,7 +209,7 @@ uint4	mur_forward_play_cur_jrec(reg_ctl_list *rctl)
 			} else if (IS_REC_POSSIBLY_BROKEN(rec_time, rec_token_seq))
 			{
 				assert(!mur_options.rollback || process_losttn);
-				rec_fence = GET_REC_FENCE_TYPE(rectype);
+				rec_fence = (IS_TP(rectype) ? TPFENCE : ZTPFENCE);
 				assert(rec_token_seq == ((struct_jrec_upd *)rec)->token_seq.token);
 				multi = MUR_TOKEN_LOOKUP(rec_token_seq, rec_time, rec_fence);
 				if ((NULL != multi) && (0 < multi->partner))
@@ -232,21 +232,14 @@ uint4	mur_forward_play_cur_jrec(reg_ctl_list *rctl)
 	if (mur_options.show)
 	{
 		assert(SS_NORMAL == status);
+		/* Note that ALIGN records do not have a pini_addr field. So skip the "mur_pini_state" call in that case */
 		if (BROKEN_TN != recstat)
 		{
 			if (JRT_PFIN == rectype)
 				status = mur_pini_state(jctl, rec->prefix.pini_addr, FINISHED_PROC);
-			else if ((JRT_EOF != rectype)
-					&& ((JRT_ALIGN != rectype) || (JNL_HDR_LEN != rec->prefix.pini_addr)))
-			{	/* Note that it is possible that we have a PINI record followed by a PFIN record
-				 * and later an ALIGN record with the pini_addr pointing to the original PINI
-				 * record (see comment in jnl_write.c where pini_addr gets assigned to JNL_HDR_LEN)
-				 * In this case we do not want the ALIGN record to cause the process to become
-				 * ACTIVE although it has written a PFIN record. Hence the check above.
-				 */
+			else if ((JRT_EOF != rectype) && (JRT_ALIGN != rectype))
 				status = mur_pini_state(jctl, rec->prefix.pini_addr, ACTIVE_PROC);
-			}
-		} else
+		} else if (JRT_ALIGN != rectype)
 			status = mur_pini_state(jctl, rec->prefix.pini_addr, BROKEN_PROC);
 		if (SS_NORMAL != status)
 			return status;	/* "mur_pini_state" failed due to bad pini_addr */
@@ -283,7 +276,7 @@ uint4	mur_forward_play_cur_jrec(reg_ctl_list *rctl)
 	/* For extract, if database was present we would have done gvcst_init().
 	 * For recover/rollback gvcst_init() should definitely have been done.
 	 * In both cases rctl->gd->open will be non-NULL. Note that rctl->csa could be non-NULL
-	 * (set in mur_forward) even if rctl->gd->open is non-NULL. So dont use that.
+	 * (set in mur_forward) even if rctl->gd->open is non-NULL. So don't use that.
 	 * Only then can we call gvcst_root_search() to find out collation set up for this global.
 	 */
 	assert(gv_cur_region == rctl->gd);
@@ -375,7 +368,8 @@ uint4	mur_forward_play_cur_jrec(reg_ctl_list *rctl)
 				return status;
 		}
 		/* extract "rec" using routine "extraction_routine[rectype]" into broken transaction file */
-		status = mur_get_pini(jctl, rec->prefix.pini_addr, &plst);
+		/* Use GET_JREC_PINI_ADDR macro instead of "rec->prefix.pini_addr" to account for JRT_ALIGN rectype */
+		status = mur_get_pini(jctl, GET_JREC_PINI_ADDR(rec, rectype), &plst);
 		if (SS_NORMAL == status)
 			(*extraction_routine[rectype])(jctl, recstat, rec, plst);
 		else
diff --git a/sr_port/mur_get_pini.c b/sr_port/mur_get_pini.c
old mode 100755
new mode 100644
index 90cbaf1..5ebe19e
--- a/sr_port/mur_get_pini.c
+++ b/sr_port/mur_get_pini.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	*
@@ -108,8 +108,8 @@ uint4	mur_get_pini(jnl_ctl_list *jctl, off_jnl_t pini_addr, pini_list_struct **p
 	}
 	pinirec = (struct_jrec_pini *)(mur_desc->random_buff.base + (pini_addr - mur_desc->random_buff.dskaddr));
 	/* Verify that it's actually a PINI record */
-	if (JRT_PINI != pinirec->prefix.jrec_type || PINI_RECLEN != pinirec->prefix.forwptr ||
-       		!IS_VALID_JNLREC((jnl_record *)pinirec, jctl->jfh))
+	if (JRT_PINI != pinirec->prefix.jrec_type
+		|| PINI_RECLEN != pinirec->prefix.forwptr || !IS_VALID_JNLREC((jnl_record *)pinirec, jctl->jfh))
 	{
 		if (mur_options.update && jctl->after_end_of_data && !jgbl.forw_phase_recovery)
 			return ERR_JNLBADRECFMT;
diff --git a/sr_port/mur_jnl_ext.c b/sr_port/mur_jnl_ext.c
index 6519390..7fe6f26 100644
--- a/sr_port/mur_jnl_ext.c
+++ b/sr_port/mur_jnl_ext.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	*
@@ -246,9 +246,11 @@ void	mur_extract_align(jnl_ctl_list *jctl, enum broken_type recstat, jnl_record
 		return;
 	EXT_DET_PREFIX(jctl);
 	EXTTIME(rec->prefix.time);
-	EXTQW(rec->prefix.tn);
+	EXTQW(0);
 	if (mur_options.detail)
-		EXTINT(rec->prefix.checksum);
+		EXTINT(((struct_jrec_align *)rec)->checksum);	/* Note: Cannot use "rec->prefix.checksum" as JRT_ALIGN
+								 * has checksum at a different offset than other records.
+								 */
 	EXTPID(plst);
 	jnlext_write(jctl, rec, recstat, murgbl.extr_buff, extract_len);
 }
@@ -295,7 +297,6 @@ void	mur_extract_epoch(jnl_ctl_list *jctl, enum broken_type recstat, jnl_record
 	EXTINT(rec->jrec_epoch.free_blocks);
 	EXTINT(rec->jrec_epoch.total_blks);
 	EXTINT(rec->jrec_epoch.fully_upgraded); /* actually boolean_t */
-#	ifdef UNIX
 	/* Extract upto 16 strm_seqno only if they are non-zero */
 	for (idx = 0; idx < MAX_SUPPL_STRMS; idx++)
 	{
@@ -306,7 +307,6 @@ void	mur_extract_epoch(jnl_ctl_list *jctl, enum broken_type recstat, jnl_record
 			EXT_STRM_SEQNO(strm_seqno);
 		}
 	}
-#	endif
 	jnlext_write(jctl, rec, recstat, murgbl.extr_buff, extract_len);
 }
 
diff --git a/sr_port/mur_open_files.c b/sr_port/mur_open_files.c
old mode 100755
new mode 100644
index 43a26a8..5733b63
--- a/sr_port/mur_open_files.c
+++ b/sr_port/mur_open_files.c
@@ -384,7 +384,7 @@ boolean_t mur_open_files()
 	}
 	assert(murgbl.reg_full_total == max_reg_total);
 	DEBUG_ONLY(curr = gld_db_files;)
-	assert(!jgbl.onlnrlbk || (0 != max_epoch_interval));
+	assert(!jgbl.onlnrlbk || (0 != max_epoch_interval) || (NULL == jnlpool_ctl));
 	if (jgbl.onlnrlbk)
 	{
 		inst_requires_rlbk = FALSE;
@@ -489,6 +489,15 @@ boolean_t mur_open_files()
 			grab_lock(jnlpool.jnlpool_dummy_reg, TRUE, GRAB_LOCK_ONLY);
 			csa->hold_onto_crit = TRUE;	/* No more unconditional rel_lock() */
 			assert(jnlpool.repl_inst_filehdr->crash); /* since we haven't removed the journal pool */
+			/* Wait for any pending phase2 commits in jnlpool to finish */
+			while (jnlpool_ctl->phase2_commit_index1 != jnlpool_ctl->phase2_commit_index2)
+			{
+				repl_phase2_cleanup(&jnlpool);
+				if (jnlpool_ctl->phase2_commit_index1 == jnlpool_ctl->phase2_commit_index2)
+					break;
+				JPL_TRACE_PRO(jnlpool_ctl, jnl_pool_write_sleep);
+				SLEEP_USEC(1, FALSE);
+			}
 			repl_inst_flush_jnlpool(FALSE, FALSE);
 			assert((0 == jnlpool_ctl->onln_rlbk_pid) || !is_proc_alive(jnlpool_ctl->onln_rlbk_pid, 0));
 			jnlpool_ctl->onln_rlbk_pid = process_id;
@@ -544,7 +553,8 @@ boolean_t mur_open_files()
 			if (NULL != cs_addrs->jnl)
 			{
 				jb = cs_addrs->jnl->jnl_buff;
-				assert((jb->freeaddr == jb->dskaddr) && (jb->dskaddr == jb->fsync_dskaddr));
+				assert((jb->freeaddr == jb->dskaddr) && (jb->dskaddr == jb->fsync_dskaddr)
+						&& (jb->rsrv_freeaddr == jb->rsrv_freeaddr));
 			}
 #			endif
 			if (cs_data->kill_in_prog)
@@ -578,7 +588,7 @@ 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_info = rctl->gd->dyn.addr->file_cntl->file_info;
+				rctl->db_ctl->file_info = FILE_CNTL(rctl->gd)->file_info;
 				rctl->recov_interrupted = csd->recov_interrupted;
 				if (mur_options.update && rctl->recov_interrupted)
 				{	/* interrupted recovery might have changed current csd's jnl_state/repl_state.
@@ -710,7 +720,7 @@ boolean_t mur_open_files()
 					csd->repl_state = repl_closed;
 					csd->file_corrupt = TRUE;
 					/* flush the changed csd to disk */
-					fc = rctl->gd->dyn.addr->file_cntl;
+					fc = FILE_CNTL(rctl->gd);
 					fc->op = FC_WRITE;
 					/* Note: csd points to shared memory and is already aligned
 					 * appropriately even if db was opened using O_DIRECT.
@@ -990,7 +1000,7 @@ boolean_t mur_open_files()
 	{
 		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 */
+			rctl->csa->miscptr = (void *)rctl; /* needed by gdsfilext_nojnl/jnl_write_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 9d0e5f7..fdf3592 100644
--- a/sr_port/mur_output_record.c
+++ b/sr_port/mur_output_record.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	*
@@ -124,6 +124,7 @@ uint4	mur_output_record(reg_ctl_list *rctl)
 			break;
 	}
 	jgbl.gbl_jrec_time = rec->prefix.time;
+	/* Since we would have returned for the JRT_ALIGN case above, we can safely use rec->prefix.pini_addr below */
 	pini_addr = rec->prefix.pini_addr;
 	reg = rctl->gd;
 	jctl = rctl->jctl;
@@ -408,7 +409,7 @@ uint4	mur_output_record(reg_ctl_list *rctl)
 			{
 				assert(plst->new_pini_addr == csa->jnl->pini_addr);
 				if (0 != csa->jnl->pini_addr)
-					jnl_put_jrt_pfin(csa);
+					jnl_write_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 71aad6d..4c0fe21 100755
--- a/sr_port/mur_output_show.c
+++ b/sr_port/mur_output_show.c
@@ -67,9 +67,9 @@ enum
 #define	ZERO_TIME_LITERAL	"                   0"
 
 static	const	char proc_header[] =
-	"PID        NODE         USER     TERM JPV_TIME           ";
+	"PID        NODE             USER         TERM JPV_TIME           ";
 static	const	char proc_fao[] =
-	"!10ZL !12AD !8AD !4AD !38AD";
+	"!10ZL !16AD !12AD !4AD !19AD";
 
 #define	TIME_DISPLAY_FAO	" !19AD"
 
diff --git a/sr_port/mur_process_intrpt_recov.c b/sr_port/mur_process_intrpt_recov.c
index 1764a4e..8dddf33 100644
--- a/sr_port/mur_process_intrpt_recov.c
+++ b/sr_port/mur_process_intrpt_recov.c
@@ -61,6 +61,7 @@ uint4 mur_process_intrpt_recov()
 	jnl_create_info			jnl_info;
 	uint4				status, status2;
 	uint4				max_autoswitchlimit, max_jnl_alq, max_jnl_deq, freeblks;
+	sgmnt_addrs			*csa;
 	sgmnt_data_ptr_t		csd;
 	jnl_private_control		*jpc;
 	jnl_buffer_ptr_t		jbp;
@@ -72,8 +73,10 @@ uint4 mur_process_intrpt_recov()
 	for (rctl = mur_ctl, rctl_top = mur_ctl + murgbl.reg_total; rctl < rctl_top; rctl++)
 	{
 		TP_CHANGE_REG(rctl->gd);
+		csa = cs_addrs;
+		assert(csa == rctl->csa);
 		csd = cs_data;	/* MM logic after wcs_flu call requires this to be set */
-		assert(csd == rctl->csa->hdr);
+		assert(csd == csa->hdr);
 		jctl = rctl->jctl_turn_around;
 		max_jnl_alq = max_jnl_deq = max_autoswitchlimit = 0;
 		for (last_jctl = NULL ; (NULL != jctl); last_jctl = jctl, jctl = jctl->next_gen)
@@ -156,6 +159,15 @@ uint4 mur_process_intrpt_recov()
 		csd->trans_hist.curr_tn = csd->trans_hist.early_tn;	/* INCREMENT_CURR_TN macro not used but noted in comment
 									 * to identify all places that set curr_tn */
 		csd->jnl_eovtn = csd->trans_hist.curr_tn;
+		/* If online rollback, adjust "tn" related fields in shared memory which might be in the future relative to
+		 * the newly adjusted db curr_tn.
+		 */
+		if (jgbl.onlnrlbk)
+		{
+			if (csa->nl->last_wcs_recover_tn >= csd->trans_hist.curr_tn)
+				csa->nl->last_wcs_recover_tn = csd->trans_hist.curr_tn - 1;
+			csa->nl->update_underway_tn = csd->trans_hist.curr_tn;
+		}
 		csd->turn_around_point = TRUE;
 		/* MUPIP REORG UPGRADE/DOWNGRADE stores its partially processed state in the database file header.
 		 * It is difficult for recovery to restore those fields to a correct partial value.
@@ -197,19 +209,19 @@ uint4 mur_process_intrpt_recov()
 		}
 		assert(!FROZEN_CHILLED(csd));
 		wcs_flu(WCSFLU_FLUSH_HDR | WCSFLU_FSYNC_DB);
-		assert(cs_addrs->ti->curr_tn == jctl->turn_around_tn);
+		assert(csa->ti->curr_tn == jctl->turn_around_tn);
 		if (jgbl.onlnrlbk)
 		{
-			if (dba_bg == cs_addrs->hdr->acc_meth)
+			if (dba_bg == csd->acc_meth)
 			{	/* dryclean the cache (basically reset the cycle fields in all teh cache records) so as to make
 				 * GT.M processes that only does 'reads' to require crit and hence realize that online rollback
 				 * is in progress
 				 */
-				bt_refresh(cs_addrs, FALSE); /* sets earliest bt TN to be the turn around TN */
+				bt_refresh(csa, FALSE); /* sets earliest bt TN to be the turn around TN */
 			}
-			db_csh_ref(cs_addrs, FALSE);
-			assert(NULL != cs_addrs->jnl);
-			jpc = cs_addrs->jnl;
+			db_csh_ref(csa, FALSE);
+			assert(NULL != csa->jnl);
+			jpc = csa->jnl;
 			assert(NULL != jpc->jnl_buff);
 			jbp = jpc->jnl_buff;
 			/* Since Rollback simulates the journal record along with the timestamp at which the update was made, it
@@ -226,10 +238,10 @@ uint4 mur_process_intrpt_recov()
 			SET_JNLBUFF_PREV_JREC_TIME(jbp, jctl->turn_around_time, DO_GBL_JREC_TIME_CHECK_FALSE);
 		} 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);
+			SET_OLDEST_HIST_TN(csa, csa->ti->curr_tn - 1);
 		}
 		csd->turn_around_point = FALSE;
-		assert(OLDEST_HIST_TN(cs_addrs) == (cs_addrs->ti->curr_tn - 1));
+		assert(OLDEST_HIST_TN(csa) == (csa->ti->curr_tn - 1));
 		/* In case this is MM and wcs_flu() remapped an extended database, reset rctl->csd */
 		assert((dba_mm == cs_data->acc_meth) || (rctl->csd == cs_data));
 		rctl->csd = cs_data;
@@ -365,10 +377,10 @@ uint4 mur_process_intrpt_recov()
 		}
 		if (jgbl.onlnrlbk)
 		{
-			cs_addrs = rctl->csa;
+			csa = rctl->csa;
 			/* Mimic what jnl_file_close in case of cleanly a closed journal file */
-			jpc = cs_addrs->jnl; /* the previous loop makes sure cs_addrs->jnl->jnl_buff is valid*/
-			NULLIFY_JNL_FILE_ID(cs_addrs);
+			jpc = csa->jnl; /* the previous loop makes sure csa->jnl->jnl_buff is valid */
+			NULLIFY_JNL_FILE_ID(csa);
 			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 */
 		}
@@ -377,8 +389,8 @@ uint4 mur_process_intrpt_recov()
 			mur_rem_jctls(rctl);
 			rctl->jctl_alt_head = NULL;
 		}
-		/* From this point on, journal records are written into the newly created journal file. However, we still read
-		 * from old journal files.
+		/* From this point on, journal records are written into the newly created journal file.
+		 * However, we still read from old journal files.
 		 */
 	}
 	jgbl.gbl_jrec_time = 0;	/* set to a safe value */
diff --git a/sr_port/mur_read_file.c b/sr_port/mur_read_file.c
index 6349049..ca0016a 100644
--- a/sr_port/mur_read_file.c
+++ b/sr_port/mur_read_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	*
@@ -742,15 +742,16 @@ uint4 mur_fread_eof_crash(jnl_ctl_list *jctl, off_jnl_t lo_off, off_jnl_t hi_off
 /* #GTM_THREAD_SAFE : The below function (mur_valrec_prev) is thread-safe */
 uint4 mur_valrec_prev(jnl_ctl_list *jctl, off_jnl_t lo_off, off_jnl_t hi_off)
 {
-	off_jnl_t	mid_off, new_mid_off, rec_offset, mid_further;
-	boolean_t	this_rec_valid;
-	jnl_file_header	*jfh;
-	jrec_prefix	*prefix;
-	uint4		status, rec_len, blen;
-	jnl_record	*rec;
-	trans_num	rec_tn;
-	seq_num		rec_seqno;
-	mur_read_desc_t	*mur_desc;
+	off_jnl_t		mid_off, new_mid_off, rec_offset, mid_further;
+	boolean_t		this_rec_valid;
+	jnl_file_header		*jfh;
+	jrec_prefix		*prefix;
+	uint4			status, rec_len, blen;
+	jnl_record		*rec;
+	trans_num		prev_tn, rec_tn;
+	seq_num			rec_seqno;
+	mur_read_desc_t		*mur_desc;
+	enum jnl_record_type	rectype;
 
 	jfh = jctl->jfh;
 	assert(jctl->tail_analysis || jctl->after_end_of_data);
@@ -841,20 +842,27 @@ uint4 mur_valrec_prev(jnl_ctl_list *jctl, off_jnl_t lo_off, off_jnl_t hi_off)
 		return status;
 	}
 	/* Note: though currently it is required not to change system time when journaling is on,
-	 *       we do not check time continuity here. We hope that in future we will remove the restriction */
-	rec_len = mur_desc->jnlrec->prefix.forwptr;
-	rec_tn = mur_desc->jnlrec->prefix.tn;
+	 * we do not check time continuity here. We hope that in future we will remove the restriction.
+	 */
+	rec = mur_desc->jnlrec;
+	rec_len = rec->prefix.forwptr;
+	rectype = (enum jnl_record_type)rec->prefix.jrec_type;
+	/* Note: JRT_ALIGN does not have a "prefix.tn" field so need to use GET_JREC_TN macro which handles that case */
+	rec_tn = GET_JREC_TN(rec, rectype);
 	rec_seqno = 0;
 	assert(rec_offset + rec_len <= hi_off);	/* We get inside for loop below at least once */
-	for ( ; jctl->rec_offset + rec_len <= hi_off;
-				rec_len = mur_desc->jnlrec->prefix.forwptr, rec_tn = mur_desc->jnlrec->prefix.tn)
+	for ( ; jctl->rec_offset + rec_len <= hi_off; rec_len = rec->prefix.forwptr)
 	{
 		rec_offset = jctl->rec_offset;
-		if ((SS_NORMAL != mur_next(jctl, 0))
-				|| ((mur_desc->jnlrec->prefix.tn != rec_tn) && (mur_desc->jnlrec->prefix.tn != (rec_tn + 1))))
+		if (SS_NORMAL != mur_next(jctl, 0))
 			break;
+		prev_tn = rec_tn;
 		rec = mur_desc->jnlrec;
-		if (mur_options.rollback && REC_HAS_TOKEN_SEQ(rec->prefix.jrec_type))
+		rectype = (enum jnl_record_type)rec->prefix.jrec_type;
+		rec_tn = GET_JREC_TN(rec, rectype);
+		if ((TN_INVALID != rec_tn) && (TN_INVALID != prev_tn) && (rec_tn != prev_tn) && (rec_tn != (prev_tn + 1)))
+			break;
+		if (mur_options.rollback && REC_HAS_TOKEN_SEQ(rectype))
 		{
 			if (GET_JNL_SEQNO(rec) < rec_seqno) /* if jnl seqno is not in sequence */
 				break;
diff --git a/sr_port/mur_report_error.c b/sr_port/mur_report_error.c
index be6da2e..61d5eb5 100755
--- a/sr_port/mur_report_error.c
+++ b/sr_port/mur_report_error.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	*
@@ -54,7 +54,6 @@ boolean_t mur_report_error(jnl_ctl_list *jctl, enum mur_error code)
 		break;
 
 	case MUR_DUPTOKEN:
-		assert(FALSE);
  		gtm_putmsg_csa(CSA_ARG(JCTL2CSA(jctl)) VARLSTCNT(7) ERR_DUPTOKEN, 5,
 				&((struct_jrec_tcom *)jctl->reg_ctl->mur_desc->jnlrec)->token_seq.token,
  				jctl->jnl_fn_len, jctl->jnl_fn, DB_LEN_STR(jctl->reg_ctl->gd));
diff --git a/sr_port/mur_select_rec.c b/sr_port/mur_select_rec.c
old mode 100755
new mode 100644
index ee4e9a7..957ec32
--- a/sr_port/mur_select_rec.c
+++ b/sr_port/mur_select_rec.c
@@ -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	*
@@ -54,10 +55,10 @@ boolean_t	mur_select_rec(jnl_ctl_list *jctl)
 	assert(mur_options.selection);
 	rec = jctl->reg_ctl->mur_desc->jnlrec;
 	rectype = (enum jnl_record_type)rec->prefix.jrec_type;
-	pini_addr = rec->prefix.pini_addr;
 	key = NULL;
-	if (JRT_NULL == rectype || JRT_ALIGN == rectype)
+	if ((JRT_NULL == rectype) || (JRT_ALIGN == rectype))
 		return TRUE;
+	pini_addr = rec->prefix.pini_addr;	/* Since rectype != JRT_ALIGN, we can safely use "prefix.pini_addr" */
 	status = mur_get_pini(jctl, pini_addr, &plst);
 	if (SS_NORMAL != status)
 		return TRUE;
diff --git a/sr_port/mur_validate_checksum.c b/sr_port/mur_validate_checksum.c
old mode 100755
new mode 100644
index f964752..8abd190
--- a/sr_port/mur_validate_checksum.c
+++ b/sr_port/mur_validate_checksum.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	*
@@ -35,17 +35,19 @@
 boolean_t mur_validate_checksum(jnl_ctl_list *jctl)
 {
 	enum jnl_record_type 	rectype;
-	uint4			rec_csum, tmp_csum;
+	uint4			orig_csum, rec_csum, tmp_csum;
 	unsigned char		*start_ptr, *end_ptr;
 	jnl_record		*jnlrec;
 	reg_ctl_list		*rctl;
 	mur_read_desc_t		*mur_desc;
+	struct_jrec_align	*align_rec;
 
 	rec_csum = INIT_CHECKSUM_SEED;
 	rctl = jctl->reg_ctl;
 	mur_desc = rctl->mur_desc;
 	jnlrec = mur_desc->jnlrec;
 	rectype = (enum jnl_record_type)jnlrec->prefix.jrec_type;
+	orig_csum = GET_JREC_CHECKSUM(jnlrec, rectype);
 	if (IS_SET_KILL_ZKILL_ZTWORM_LGTRIG_ZTRIG(rectype))	/* TUPD/UUPD/FUPD/GUPD */
 	{
 		COMPUTE_COMMON_CHECKSUM(tmp_csum, jnlrec->prefix);
@@ -63,25 +65,24 @@ boolean_t mur_validate_checksum(jnl_ctl_list *jctl)
 		rec_csum = compute_checksum(INIT_CHECKSUM_SEED, (unsigned char *)start_ptr,
 								MIN(jnlrec->jrec_pblk.prefix.forwptr, jnlrec->jrec_pblk.bsiz));
 		COMPUTE_PBLK_CHECKSUM(rec_csum, &jnlrec->jrec_pblk, tmp_csum, rec_csum);
-	} else if (IS_FIXED_SIZE(rectype) || rectype == JRT_ALIGN)
+	} else if (IS_FIXED_SIZE(rectype))
 	{
-		tmp_csum = jnlrec->prefix.checksum;
 		jnlrec->prefix.checksum = INIT_CHECKSUM_SEED;
-		switch (rectype)
-		{
-		case JRT_ALIGN:
-			rec_csum = compute_checksum(INIT_CHECKSUM_SEED, (unsigned char *)&jnlrec->jrec_align, SIZEOF(jrec_prefix));
-			break;
-		default:
-			if (JRT_TRIPLE != rectype && JRT_HISTREC != rectype)
-			rec_csum = compute_checksum(INIT_CHECKSUM_SEED,
-							(unsigned char *)&jnlrec->jrec_set_kill, jnlrec->prefix.forwptr);
-			break;
-		}
-		jnlrec->prefix.checksum = tmp_csum;
-	}
+		assert(JRT_TRIPLE != rectype);
+		assert(JRT_HISTREC != rectype);
+		rec_csum = compute_checksum(INIT_CHECKSUM_SEED, (unsigned char *)jnlrec, jnlrec->prefix.forwptr);
+		jnlrec->prefix.checksum = orig_csum;
+	} else if (JRT_ALIGN == rectype)
+	{	/* Note: "struct_jrec_align" has a different layout (e.g. "checksum" at different offset etc.) than all
+		 * other jnl records. So handle this specially.
+		 */
+		align_rec = (struct_jrec_align *)jnlrec;
+		align_rec->checksum = INIT_CHECKSUM_SEED;
+		rec_csum = compute_checksum(INIT_CHECKSUM_SEED, (unsigned char *)align_rec, FIXED_ALIGN_RECLEN);
+		align_rec->checksum = orig_csum;
+	} else
+		assert(FALSE);
 	ADJUST_CHECKSUM(rec_csum, jctl->rec_offset, rec_csum);
 	ADJUST_CHECKSUM(rec_csum, jctl->jfh->checksum, rec_csum);
-	/* assert(jnlrec->prefix.checksum == rec_csum); Can fail only for journal after crash or with holes */
-	return (jnlrec->prefix.checksum == rec_csum);
+	return (orig_csum == rec_csum);
 }
diff --git a/sr_port/nref.c b/sr_port/nref.c
index d983db0..d509099 100755
--- a/sr_port/nref.c
+++ b/sr_port/nref.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	*
@@ -16,7 +17,7 @@
 #include "indir_enum.h"
 #include "advancewindow.h"
 
-error_def(ERR_VAREXPECTED);
+error_def(ERR_LKNAMEXPECTED);
 
 int nref(void)
 {
@@ -36,9 +37,7 @@ int nref(void)
 	case TK_LBRACKET:
 	case TK_IDENT:
 	case TK_VBAR:
-		if (!lkglvn(gbl))
-			return EXPR_FAIL;
-		return TRUE;
+		return lkglvn(gbl);
 	case TK_ATSIGN:
 		if (!indirection(&tmparg))
 			return EXPR_FAIL;
@@ -48,7 +47,7 @@ int nref(void)
 		ins_triple(ref);
 		return EXPR_INDR;
 	default:
-		stx_error(ERR_VAREXPECTED);
+		stx_error(ERR_LKNAMEXPECTED);
 		return EXPR_FAIL;
 	}
 }
diff --git a/sr_port/objlabel.h b/sr_port/objlabel.h
index cf57a39..ccf495d 100755
--- a/sr_port/objlabel.h
+++ b/sr_port/objlabel.h
@@ -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	32
+#define OBJ_UNIX_LABEL	33
 #define	OBJ_PLATFORM_LABEL	0
 
 #ifdef USHBIN_SUPPORTED
diff --git a/sr_port/op.h b/sr_port/op.h
index faa67f5..0f22037 100644
--- a/sr_port/op.h
+++ b/sr_port/op.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	*
@@ -31,7 +31,7 @@ void	op_close(mval *v, mval *p);
 void	op_commarg(mval *v, unsigned char argcode);
 int	op_currhd(void);
 void	op_cvtparm(int iocode, mval *src, mval *dst);
-int	op_decrlock(int timeout);
+int	op_decrlock(mval *timeout);
 void	op_div(mval *u, mval *v, mval *q);
 void	op_dmode(void);
 void	op_dt_false(void);
@@ -43,26 +43,12 @@ void	op_exfunretals(mval *retval);
 void	op_exp(mval *u, mval *v, mval *p);
 /*	op_fetch currently does not exist. Instead gtm_fetch is the name (should be renamed to op_fetch to keep naming scheme) */
 void	gtm_fetch(UNIX_ONLY_COMMA(unsigned int cnt_arg) unsigned int indxarg, ...);
-#ifdef UNIX
 int	op_fetchintrrpt();
-#elif defined(VMS)
-void	op_fetchintrrpt();
-#endif
-#ifdef UNIX
 void	op_fgnlookup(void);
-/*	op_fgnlookup : prototype for VMS defined in sr_vvms/op_fgnlookup.h as it does not return a simple type */
-#endif
 void	op_fnascii(int4 num, mval *in, mval *out);
 void	op_fnchar(UNIX_ONLY_COMMA(int cnt) mval *dst, ...);
 void	op_fnextract(int last, int first, mval *src, mval *dest);
-#ifdef __sun
-int	op_fnfgncal_rpc(unsigned int n_mvals, ...); /* typ to keep the compiler happy as set into xfer_table, which is int */
-#endif
-#if defined(UNIX)
 void	op_fnfgncal(uint4 n_mvals, mval *dst, mval *package, mval *extref, uint4 mask, int4 argcnt, ...);
-#elif defined(VMS)
-void	op_fnfgncal(mval *dst, ...);
-#endif
 int4	op_fnfind(mval *src, mval *del, mint first, mval *dst);
 void	op_fnfnumber(mval *src, mval *fmt, boolean_t use_fract, int fract, mval *dst);
 void	op_fnget1(mval *src, mval *dst);
@@ -104,16 +90,10 @@ void	op_fnzbitor(mval *dst, mval *bitstr1, mval *bitstr2);
 void	op_fnzbitset(mval *dst, mval *bitstr, int pos, int truthval);
 void	op_fnzbitstr(mval *bitstr, int size, int truthval);
 void	op_fnzbitxor(mval *dst, mval *bitstr1, mval *bitstr2);
-#ifdef VMS
-void	op_fnzcall(mval *dst, ...);
-#else
 void	op_fnzcall(void);	/* stub only */
-#endif
 void	op_fnzchar(UNIX_ONLY_COMMA(int cnt) mval *dst, ...);
-#ifdef UNIX
 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);
@@ -128,9 +108,7 @@ void	op_fnzlkid(mint boolex, mval *retval);
 void	op_fnzm(mint x, mval *v);
 void	op_fnzp1(mval *src, int del, int trgpcidx, UNIX1_VMS2(mval *dst, boolean_t srcisliteral));
 void	op_fnzparse(mval *file, mval *field, mval *def1, mval *def2, mval *type, mval *ret);
-#ifdef UNIX
 void	op_fnzpeek(mval *baseaddr, int offset, int len, mval *format, mval *ret);
-#endif
 void	op_fnzpid(mint boolexpr, mval *ret);
 void	op_fnzpiece(mval *src, mval *del, int first, int last, UNIX1_VMS2(mval *dst, boolean_t srcisliteral));
 void	op_fnzpopulation(mval *arg1, mval *arg2, mval *dst);
@@ -143,25 +121,17 @@ void	op_fnzsigproc(int processid, int signum, mval *retcode);
 void	op_fnzsocket(UNIX_ONLY_COMMA(int numarg) mval *dst, ...);
 void	op_fnzsqlexpr(mval *value, mval *target);
 void	op_fnzsqlfield(int findex, mval *target);
-#ifdef UNIX
 void	op_fnzsubstr(mval *src, int start, int bytelen, mval *dest);
 void	op_fnzsyslog(mval *src, mval *dst);
-#endif
 void	op_fnztranslate(mval *src, mval *in_str , mval *out_str, mval *dst);
 void	op_fnztrigger(mval *func, mval *arg1, mval *arg2, mval *dst);
 void	op_fnztrnlnm(mval *name, mval *table, int4 ind, mval *mode, mval *case_blind, mval *item, mval *ret);
 void	op_fnztrnlnm(mval *name, mval *table, int4 ind, mval *mode, mval *case_blind, mval *item, mval *ret);
-#ifdef UNIX
 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();
-#elif defined(VMS)
-void	op_forintrrpt();
-#endif
 int	op_forloop();
 void	op_gvdata(mval *v);
 void	op_gvextnam(UNIX_ONLY_COMMA(int4 count) mval *val1, ...);
@@ -190,7 +160,7 @@ void	op_horolog(mval *s);
 void	op_idiv(mval *u, mval *v, mval *q);
 mval	*op_igetdst(void);
 void	op_igetsrc(mval *v);
-int	op_incrlock(int timeout);
+int	op_incrlock(mval *timeout);
 void	op_inddevparms(mval *devpsrc, int4 ok_iop_parms, mval *devpiopl);
 void	op_indfnname(mval *dst, mval *target, mval *value);
 void	op_indfnname2(mval *finaldst, mval *depthval, mval *prechomp);
@@ -212,7 +182,7 @@ void	op_indset(mval *target, mval *value);
 void	op_indtext(mval *lab, mint offset, mval *rtn, mval *dst);
 void	op_iocontrol(UNIX_ONLY_COMMA(int4 n) mval *vparg, ...);
 void	op_iretmval(mval *v, mval *dst);
-int	op_job(UNIX_ONLY(int4 argcnt) VMS_ONLY(mval *label), ...);
+int	op_job(int4 argcnt, ...);
 void	op_killaliasall(void);
 void	op_killall(void);
 void	op_killall(void);
@@ -221,8 +191,8 @@ int	op_linestart();
 void	op_litc(mval *dst, mval *src);
 void	op_lkinit(void);
 void	op_lkname(UNIX_ONLY_COMMA(int subcnt) mval *extgbl1, ...);
-int	op_lock(int timeout);
-int	op_lock2(int4 timeout, unsigned char laflag);
+int	op_lock(mval *timeout);
+int	op_lock2(mval *timeout, unsigned char laflag);
 void	op_lvpatwrite(UNIX_ONLY_COMMA(int4 count) UINTPTR_T arg1, ...);
 void	op_lvzwrite(UNIX_ONLY_COMMA(int4 count) long arg1, ...);
 /*	op_merge     : prototype defined separately in op_merge.h */
@@ -235,11 +205,11 @@ void	op_newintrinsic(int intrtype);
 void	op_newvar(uint4 arg1);
 mval	*op_nullexp(void);
 void	op_oldvar(void);
-int	op_open(mval *device, mval *devparms, int timeout, mval *mspace);
-int	op_open_dummy(mval *v, mval *p, int t, mval *mspace);
-int	op_rdone(mval *v, int4 timeout);
-int	op_read(mval *v, int4 timeout);
-int	op_readfl(mval *v, int4 length, int4 timeout);
+int	op_open(mval *device, mval *devparms, mval *timeout, mval *mspace);
+int	op_open_dummy(mval *v, mval *p, mval *timeout, mval *mspace);
+int	op_rdone(mval *v, mval *timeout);
+int	op_read(mval *v, mval *timeout);
+int	op_readfl(mval *v, int4 length, mval *timeout);
 int	op_ret();
 int	op_retarg();
 void	op_rterror(int4 sig, boolean_t subrtn);
@@ -251,11 +221,7 @@ void	op_setzextract(mval *src, mval *expr, int schar, int echar, mval *dst);
 void	op_setzp1(mval *src, int delim, mval *expr, int ind, mval *dst);
 void	op_setzpiece(mval *src, mval *del, mval *expr, int4 first, int4 last, mval *dst);
 void	op_sqlinddo(mstr *m_init_rtn);
-#ifdef UNIX
 int	op_startintrrpt();
-#elif defined(VMS)
-void	op_startintrrpt();
-#endif
 void	op_stolitc(mval *val);
 void	op_sub(mval *u, mval *v, mval *s);
 void	op_sub(mval *u, mval *v, mval *s);
@@ -291,28 +257,25 @@ void	op_wtone(int c);
 void	op_wttab(mint x);
 void	op_xkill(UNIX_ONLY_COMMA(int n) mval *lvname_arg, ...);
 void	op_xnew(UNIX_ONLY_COMMA(unsigned int argcnt_arg) mval *s_arg, ...);
-int	op_zallocate(int timeout);
+int	op_zallocate(mval *timeout);
 void	op_zattach(mval *);
 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_zdealloc2(mval *timeout, UINTPTR_T auxown);
+void	op_zdeallocate(mval *timeout);
 void	op_zedit(mval *v, mval *p);
 void	op_zg1(int4 level);
 void	op_zgoto(mval *rtnname, mval *lblname, int offset, int level);
 void    op_zrupdate(int argcnt, ...);
-#	ifdef UNIX
-        /* note op_ztrigger.c is present even in non-GTM_TRIGGER UNIX environments but is not runnable */
 void	op_ztrigger(void);
-#	endif
 void	op_zhalt(mval *returncode);
 void	op_zhelp_xfr(mval *subject, mval *lib);
 void	op_zhorolog(mval *s);
 void	op_zlink(mval *v, mval *quals);
-void	op_zmess(UNIX_ONLY(unsigned int cnt) VMS_ONLY(int4 errnum), ...);
+void	op_zmess(unsigned int cnt, ...);
 void	op_zprevious(mval *v);
 void	op_zprint(mval *rtn, mval *start_label, int start_int_exp, mval *end_label, int end_int_exp);
 void	op_zst_break(void);
diff --git a/sr_port/op_break.c b/sr_port/op_break.c
index 48ea7a9..4a8beb7 100644
--- a/sr_port/op_break.c
+++ b/sr_port/op_break.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	*
@@ -20,6 +21,7 @@
 #include "op.h"
 #include "dm_setup.h"
 #include "min_max.h"
+#include "restrict.h"
 
 GBLREF io_pair	io_curr_device;
 GBLREF io_pair	io_std_device;
@@ -28,6 +30,14 @@ GBLREF mval	dollar_zstatus;
 GBLREF int4 	break_message_mask;
 GBLREF bool	dec_nofac;
 
+error_def(ERR_RTSLOC);
+error_def(ERR_BREAK);
+error_def(ERR_BREAKDEA);
+error_def(ERR_BREAKZBA);
+error_def(ERR_BREAKZST);
+error_def(ERR_NOTPRINCIO);
+error_def(ERR_TEXT);
+
 void op_break(void)
 {
 	bool		do_msg;
@@ -36,14 +46,8 @@ void op_break(void)
 	int		line_length;
 	int		em;
 
-	error_def(ERR_RTSLOC);
-	error_def(ERR_BREAK);
-	error_def(ERR_BREAKDEA);
-	error_def(ERR_BREAKZBA);
-	error_def(ERR_BREAKZST);
-	error_def(ERR_NOTPRINCIO);
-	error_def(ERR_TEXT);
-
+	if (RESTRICTED(break_op))
+		return;
 	flush_pio();
 	line_length = 0;
 	if (frame_pointer->type & SFT_ZTRAP)
diff --git a/sr_port/op_close.c b/sr_port/op_close.c
index e409c61..11db903 100755
--- a/sr_port/op_close.c
+++ b/sr_port/op_close.c
@@ -50,9 +50,12 @@ void op_close(mval *v, mval *p)
 	        if (0 == (tl = get_log_name(&tn, NO_INSERT)))
 			return;
 		ciod = tl->iod;
-		if ((NULL == ciod) || (TRUE == ciod->perm) ||
-		    (ciod->state != dev_open))
+		if ((NULL == ciod) || (TRUE == ciod->perm) || (dev_open != ciod->state))
+		{
+			if (dev_never_opened == ciod->state)
+				remove_rms(ciod);
 			return;
+		}
 
 		for (prev = io_root_log_name, l = prev->next; NULL != l;  prev = l, l = l->next)
 		{
@@ -72,9 +75,13 @@ void op_close(mval *v, mval *p)
 	{
 	        if (0 == (l = get_log_name(&v->str, NO_INSERT)))
 			return;
-		else if (0 == (ciod = l->iod) || TRUE == ciod->perm
-			 || (dev_open != ciod->state))
+		ciod = l->iod;
+		if ((NULL == ciod) || (TRUE == ciod->perm) || (dev_open != ciod->state))
+		{
+			if (dev_never_opened == ciod->state)
+				remove_rms(ciod);
 			return;
+		}
 	}
 #	ifdef UNIX
 	else if (SS_LOG2LONG == stat)
diff --git a/sr_port/op_decrlock.c b/sr_port/op_decrlock.c
index 5b9e31d..f2b10e8 100755
--- a/sr_port/op_decrlock.c
+++ b/sr_port/op_decrlock.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	*
@@ -28,12 +29,13 @@ GBLREF bool		remlkreq;
 GBLREF unsigned char	cm_action;
 GBLREF tp_frame		*tp_pointer;
 
-int	op_decrlock(int timeout)
+error_def(ERR_TPLOCK);
+
+int	op_decrlock(mval *timeout)
 {
 	int		count;
 	mlk_pvtblk	**prior;
 	void		lckclr(void);
-	error_def(ERR_TPLOCK);
 
 	lckclr();
 	if (tp_pointer)
@@ -44,11 +46,10 @@ int	op_decrlock(int timeout)
 			/* if there were any old locks before TSTART, they can't be  unlocked */
 			if ((*prior)->granted && (*prior)->tp &&
 				(*prior)->tp->level > (*prior)->level - (*prior)->translev)
-				rts_error(VARLSTCNT(1) ERR_TPLOCK);
+				rts_error_csa(NULL, VARLSTCNT(1) ERR_TPLOCK);
 			prior = &((*prior)->next);
 		}
 	}
-
 	prior = &mlk_pvt_root;
 	for (count = 0; count < lks_this_cmd; count++)
 	{
@@ -61,7 +62,6 @@ int	op_decrlock(int timeout)
 			else
 			{
 				(*prior)->level -= (*prior)->translev > (*prior)->level ? (*prior)->level : (*prior)->translev;
-
 				if (!(*prior)->zalloc && (0 == (*prior)->level))
 				{
 					mlk_unlock(*prior);
@@ -72,12 +72,12 @@ int	op_decrlock(int timeout)
 			}
 		}
 	}
-
 	if (gtcm_connection && remlkreq)
 	{
 		cm_action = INCREMENTAL;
 		gvcmx_unlock(0, TRUE, INCREMENTAL);
 		remlkreq = FALSE;
 	}
+	lks_this_cmd = 0;	/* reset so we can check whether an extrinsic is trying to nest a LOCK operation */
 	return TRUE;	/* return TRUE unconditionally (since this is a timed unlock) so $TEST gets set to 1 as per M-standard */
 }
diff --git a/sr_port/op_dmode.c b/sr_port/op_dmode.c
index 4e18ee9..f66c0d6 100644
--- a/sr_port/op_dmode.c
+++ b/sr_port/op_dmode.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,9 +27,7 @@
 #include "jnl.h"
 #include "indir_enum.h"
 #include "io.h"
-#ifdef UNIX
 #include "iottdef.h"
-#endif
 #include "iotimer.h"
 #include <rtnhdr.h>
 #include "stack_frame.h"
@@ -46,7 +45,7 @@
 #include "have_crit.h"		/* for the TPNOTACID_CHECK macro */
 #endif
 
-#define	DIRECTMODESTR	"Entering DIRECT MODE - TP RESTART will fail"
+#define	DIRECTMODESTR	"DIRECT MODE (any TP RESTART will fail)"
 
 GBLREF	uint4		dollar_trestart;
 GBLREF	io_pair		io_curr_device;
@@ -55,21 +54,21 @@ GBLREF	stack_frame	*frame_pointer;
 GBLREF	unsigned char	*restart_pc;
 GBLREF	unsigned char	*restart_ctxt;
 
+LITREF	mval		literal_notimeout;
+
 error_def(ERR_NOTPRINCIO);
 error_def(ERR_NOPRINCIO);
 
 void	op_dmode(void)
 {
-	gd_region	*save_reg;
-	mval		prompt, dummy, *input_line;
-	static io_pair	save_device;
-	static bool	dmode_intruptd;
-#	ifdef UNIX
-	static int	loop_cnt = 0;
-	static int	old_errno = 0;
-	d_tt_struct	*tt_ptr;
-#	endif
-	static bool	kill = FALSE;
+	d_tt_struct		*tt_ptr;
+	gd_region		*save_re;
+	mval			prompt, dummy, *input_line;
+	static boolean_t	dmode_intruptd;
+	static boolean_t	kill = FALSE;
+	static int		loop_cnt = 0;
+	static int		old_errno = 0;
+	static io_pair		save_device;
 	DCL_THREADGBL_ACCESS;
 
 	SETUP_THREADGBL_ACCESS;
@@ -93,19 +92,16 @@ void	op_dmode(void)
 	/* The following code avoids an infinite loop on UNIX systems when there is an error in writing to the principal device
 	 * resulting in a call to the condition handler and an eventual return to this location
 	 */
-#	ifdef UNIX
 	if ((loop_cnt > 0) && (errno == old_errno))
 	{	/* Tried and failed 2x to write to principal device */
 		kill = TRUE;
-		send_msg(VARLSTCNT(1) ERR_NOPRINCIO);
-		rts_error(VARLSTCNT(1) ERR_NOPRINCIO);
+		send_msg_csa(NULL, VARLSTCNT(1) ERR_NOPRINCIO);
+		rts_error_csa(NULL, VARLSTCNT(1) ERR_NOPRINCIO);
 	}
 	++loop_cnt;
 	old_errno = errno;
-#	endif
 	*((INTPTR_T **)&restart_pc) = (INTPTR_T *)CODE_ADDRESS(call_dm);
 	*((INTPTR_T **)&restart_ctxt) = (INTPTR_T *)GTM_CONTEXT(call_dm);
-#	ifdef UNIX
 	loop_cnt = 0;
 	old_errno = 0;
 	if (tt == io_curr_device.in->type)
@@ -113,7 +109,6 @@ void	op_dmode(void)
 	else
 		tt_ptr = NULL;
 	if (!tt_ptr || !tt_ptr->mupintr)
-#	endif
 		op_wteol(1);
 	TPNOTACID_CHECK(DIRECTMODESTR);
 	if (io_curr_device.in->type == tt)
@@ -123,7 +118,7 @@ void	op_dmode(void)
 		prompt.mvtype = MV_STR;
 		prompt.str = TREF(gtmprompt);
 		op_write(&prompt);
-		op_read(input_line, NO_M_TIMEOUT);
+		op_read(input_line, (mval *)&literal_notimeout);
 	}
 	op_wteol(1);
 	io_curr_device = save_device;
diff --git a/sr_port/op_fntranslate.c b/sr_port/op_fntranslate.c
index 7245f47..1315f6d 100755
--- a/sr_port/op_fntranslate.c
+++ b/sr_port/op_fntranslate.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	*
@@ -14,6 +15,7 @@
 #include "gtm_string.h"
 
 #include "stringpool.h"
+#include "min_max.h"
 #include "op.h"
 
 GBLREF spdesc stringpool;
@@ -70,11 +72,13 @@ void op_fntranslate(mval *src, mval *in_str, mval *out_str, mval *dst)
 {
 	unsigned char	*inptr, *intop, *outptr, *outbase, *outtop, *dstbase, *nextptr, *chptr;
 	int4		xlate[256]; /* translation table to hold all single-byte character mappings */
-	hash_table_int4	xlate_hash;  /* translation table to hold all multi-byte character mappings */
+	static hash_table_int4	xlate_hash;  /* translation table to hold all multi-byte character mappings */
+	static int hash_table_size = 0;
 	INTPTR_T	choff;	/* byte offset of the character within out_str */
 	ht_ent_int4	*tabent;
 	unsigned char 	ch, drop;
 	int 		n, max_len_incr, size, inlen, outlen, char_len, chlen, dstlen;
+	int		max_length_string = 0;
 	uint4		code;
 	boolean_t	hashtab_created, char_already_seen;
 
@@ -92,7 +96,19 @@ void op_fntranslate(mval *src, mval *in_str, mval *out_str, mval *dst)
 	memset(xlate, 0, SIZEOF(xlate));
 	if (!MV_IS_SINGLEBYTE(in_str))
 	{ /* hash table not needed if input is entirely single byte */
-		init_hashtab_int4(&xlate_hash, 0, HASHTAB_COMPACT, HASHTAB_SPARE_TABLE);
+		max_length_string = MAX(in_str->str.len, out_str->str.len);
+		if (NULL == xlate_hash.base)
+			init_hashtab_int4(&xlate_hash, max_length_string * (100.0 / HT_LOAD_FACTOR),
+					HASHTAB_COMPACT, HASHTAB_SPARE_TABLE);
+		else
+		{
+			reinitialize_hashtab_int4(&xlate_hash);
+			if (max_length_string > hash_table_size)
+			{
+				hash_table_size = max_length_string;
+				expand_hashtab_int4(&xlate_hash, max_length_string * (100.0 / HT_LOAD_FACTOR));
+			}
+		}
 		hashtab_created = TRUE;
 	} else
 		hashtab_created = FALSE;
@@ -184,7 +200,7 @@ void op_fntranslate(mval *src, mval *in_str, mval *out_str, mval *dst)
 		if (MAXPOSINT4 != choff)
 		{ /* add a new character into the result based on the translation above */
 			if (dstlen + chlen > MAX_STRLEN)
-			 	rts_error(VARLSTCNT(1) ERR_MAXSTRLEN);
+			 	rts_error_csa(NULL, VARLSTCNT(1) ERR_MAXSTRLEN);
 			if (1 == chlen)
 				dstbase[dstlen] = *chptr;
 			else
@@ -193,8 +209,6 @@ void op_fntranslate(mval *src, mval *in_str, mval *out_str, mval *dst)
 			++char_len;
 		}
 	}
-	if (hashtab_created)
-		free_hashtab_int4(&xlate_hash);
 	MV_INIT_STRING(dst, dstlen, (char *)dstbase);
 	assert(dst->str.len <= size);
 	dst->mvtype |= MV_UTF_LEN; /* set character length since we know it */
diff --git a/sr_port/op_fnview.c b/sr_port/op_fnview.c
index 5a9a3c6..a866b23 100755
--- a/sr_port/op_fnview.c
+++ b/sr_port/op_fnview.c
@@ -54,6 +54,9 @@
 #include "gtm_ctype.h"		/* for ISDIGIT_ASCII macro */
 #include "gvn2gds.h"
 #include "io.h"
+#include "repl_msg.h"
+#include "gtmsource.h"
+#include "interlock.h"
 
 GBLREF spdesc		stringpool;
 GBLREF int4		cache_hits, cache_fails;
@@ -77,6 +80,8 @@ GBLREF int		gv_fillfactor;
 GBLREF int4		gtm_max_sockets;
 GBLREF gv_key		*gv_currkey;
 GBLREF boolean_t	is_gtm_chset_utf8;
+GBLREF jnlpool_addrs	jnlpool;
+GBLREF	uint4		process_id;
 UNIX_ONLY(GBLREF	boolean_t		dmterm_default;)
 
 error_def(ERR_COLLATIONUNDEF);
@@ -363,6 +368,48 @@ void	op_fnview(UNIX_ONLY_COMMA(int numarg) mval *dst, ...)
 			csa = &FILE_INFO(reg)->s_addrs;
 			n = csa->gbuff_limit;
 			break;
+#ifdef TESTPOLLCRIT
+		case VTK_GRABCRIT:
+		case VTK_RELCRIT:
+		case VTK_GRABLOCK:
+		case VTK_RELLOCK:
+		case VTK_GRABJNLPH2:
+		case VTK_RELJNLPH2:
+		case VTK_RELJNLPOOLPH2:
+		case VTK_GRABJNLPOOLPH2:
+		case VTK_GRABJNLQIO:
+		case VTK_RELJNLQIO:
+			reg = parmblk.gv_ptr;
+			if (!reg->open)
+				gv_init_reg(reg);
+			csa = &FILE_INFO(reg)->s_addrs;
+			if (NULL != csa->hdr)
+			{
+				if (VTK_GRABCRIT == vtp->keycode)
+					grab_crit(reg);
+				else if (VTK_RELCRIT == vtp->keycode)
+					rel_crit(reg);
+				else if (VTK_GRABLOCK == vtp->keycode)
+					grab_lock(jnlpool.jnlpool_dummy_reg, TRUE, ASSERT_NO_ONLINE_ROLLBACK);
+				else if (VTK_RELLOCK == vtp->keycode)
+					rel_lock(jnlpool.jnlpool_dummy_reg);
+				else if (VTK_GRABJNLPH2 == vtp->keycode)
+					grab_latch(&csa->jnl->jnl_buff->phase2_commit_latch, GRAB_LATCH_INDEFINITE_WAIT);
+				else if (VTK_RELJNLPH2 == vtp->keycode)
+					rel_latch(&csa->jnl->jnl_buff->phase2_commit_latch);
+				else if (VTK_GRABJNLPOOLPH2 == vtp->keycode)
+					grab_latch(&jnlpool.jnlpool_ctl->phase2_commit_latch, GRAB_LATCH_INDEFINITE_WAIT);
+				else if (VTK_RELJNLPOOLPH2 == vtp->keycode)
+					rel_latch(&jnlpool.jnlpool_ctl->phase2_commit_latch);
+				else if (VTK_GRABJNLQIO == vtp->keycode)
+				{
+					while (!GET_SWAPLOCK(&csa->jnl->jnl_buff->io_in_prog_latch))
+						SHORT_SLEEP(1);
+				} else if (VTK_RELJNLQIO == vtp->keycode)
+					RELEASE_SWAPLOCK(&csa->jnl->jnl_buff->io_in_prog_latch);
+			}
+			break;
+#endif
 		case VTK_PROBECRIT:
 			assert(NULL != gd_header);	/* view_arg_convert would have done this for VTK_POOLLIMIT */
 			reg = parmblk.gv_ptr;
diff --git a/sr_port/op_fnztrigger.c b/sr_port/op_fnztrigger.c
index d9efb4d..d2ae0af 100644
--- a/sr_port/op_fnztrigger.c
+++ b/sr_port/op_fnztrigger.c
@@ -1,6 +1,7 @@
 /****************************************************************
  *								*
- *	Copyright 2010, 2014 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	*
@@ -37,6 +38,10 @@
 #include "trigger_update_protos.h"
 #include "trigger_select_protos.h"
 #include "trigger_trgfile_protos.h"
+#include "restrict.h"
+#include "xfer_enum.h"
+#include "code_address_type.h"
+#include "fix_xfer_entry.h"
 
 GBLREF	sgmnt_data_ptr_t cs_data;
 GBLREF  uint4		dollar_tlevel;
@@ -66,6 +71,7 @@ STATICDEF boolean_t	in_op_fnztrigger;
 
 error_def(ERR_DZTRIGINTRIG);
 error_def(ERR_FILENAMETOOLONG);
+error_def(ERR_RESTRICTEDOP);
 error_def(ERR_ZTRIGINVACT);
 
 
@@ -211,6 +217,8 @@ void op_fnztrigger(mval *func, mval *arg1, mval *arg2, mval *dst)
 	switch(ztrprm_data[index])
 	{
 		case ZTRP_FILE:
+			if (RESTRICTED(trigger_mod))
+				rts_error_csa(CSA_ARG(NULL) VARLSTCNT(3) ERR_RESTRICTEDOP, 1, "$ZTRIGGER(FILE)");
 			/* If 2nd parameter is empty, do nothing (but dont issue error) */
 			if (arg1->str.len)
 			{
@@ -225,6 +233,8 @@ void op_fnztrigger(mval *func, mval *arg1, mval *arg2, mval *dst)
 				failed = FALSE;
 			break;
 		case ZTRP_ITEM:
+			if (RESTRICTED(trigger_mod))
+				rts_error_csa(CSA_ARG(NULL) VARLSTCNT(3) ERR_RESTRICTEDOP, 1, "$ZTRIGGER(ITEM)");
 			/* If 2nd parameter is empty, do nothing (but dont issue error) */
 			failed = (arg1->str.len) ? trigger_update(arg1->str.addr, arg1->str.len) : FALSE;
 			break;
diff --git a/sr_port/op_gvnaked.c b/sr_port/op_gvnaked.c
index 191cf6d..d3d763e 100644
--- a/sr_port/op_gvnaked.c
+++ b/sr_port/op_gvnaked.c
@@ -41,11 +41,12 @@
 #include "tp_set_sgm.h"
 #include "dpgbldir.h"
 
-GBLREF	uint4		dollar_tlevel;
+GBLREF	bool		undef_inhibit;
+GBLREF	gd_region	*gv_cur_region;
 GBLREF	gv_key		*gv_currkey;
 GBLREF	gv_namehead	*gv_target;
 GBLREF	sgmnt_addrs	*cs_addrs;
-GBLREF	gd_region	*gv_cur_region;
+GBLREF	uint4		dollar_tlevel;
 
 error_def(ERR_GVNAKED);
 error_def(ERR_MAXNRSUBSCRIPTS);
@@ -142,7 +143,7 @@ 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)
+	if (!val->mvtype && !undef_inhibit)
 		gv_currkey->end = 0;
 	for ( ; ; )
 	{
diff --git a/sr_port/op_hang.c b/sr_port/op_hang.c
index 5496eb1..57353e6 100644
--- a/sr_port/op_hang.c
+++ b/sr_port/op_hang.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	*
@@ -69,7 +69,7 @@ GBLREF	stack_frame	*frame_pointer;
 
 error_def(ERR_SYSCALL);
 
-#define HANGSTR "HANG time too long"
+#define HANGSTR "HANG"
 
 /*
  * ------------------------------------------
@@ -108,10 +108,6 @@ 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 */
 	{
@@ -120,8 +116,12 @@ void op_hang(mval* num)
 	}
 	if (ms)
 	{
-		if (TREF(tpnotacidtime) * 1000 < ms)
+		if ((TREF(tpnotacidtime)).m[1] < ms)
 			TPNOTACID_CHECK(HANGSTR);
+#		ifdef _AIX	/* AIX times are a bit wobbly, 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
 #		if defined(DEBUG)
 		if (WBTEST_ENABLED(WBTEST_DEFERRED_TIMERS) && (3 > gtm_white_box_test_case_count) && (123000 == ms))
 		{	/* LONG_SLEEP messes with signals */
diff --git a/sr_port/op_incrlock.c b/sr_port/op_incrlock.c
index fb40a45..d5e175b 100755
--- a/sr_port/op_incrlock.c
+++ b/sr_port/op_incrlock.c
@@ -29,7 +29,7 @@
  *	the $T variable by the caller if timeout is specified.
  * -----------------------------------------------
  */
-int op_incrlock(int timeout)
+int op_incrlock(mval *timeout)
 {
 	return (op_lock2(timeout, INCREMENTAL));
 }
diff --git a/sr_port/op_lkinit.c b/sr_port/op_lkinit.c
index 3c00435..fa4d9b8 100755
--- a/sr_port/op_lkinit.c
+++ b/sr_port/op_lkinit.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	*
@@ -17,12 +18,18 @@
 GBLREF bool		remlkreq;
 GBLREF unsigned short	lks_this_cmd;
 
+error_def(ERR_BADLOCKNEST);
+
 void op_lkinit(void)
 {
+	if (lks_this_cmd)
+	{
+		lks_this_cmd = 0;
+		rts_error_csa(CSA_ARG(NULL) VARLSTCNT(1) ERR_BADLOCKNEST);
+	}
 	if (remlkreq)
 	{
 		gvcmz_clrlkreq();
 		remlkreq = FALSE;
 	}
-	lks_this_cmd = 0;
 }
diff --git a/sr_port/op_lock.c b/sr_port/op_lock.c
index 0f92f8d..940d9a6 100755
--- a/sr_port/op_lock.c
+++ b/sr_port/op_lock.c
@@ -31,7 +31,7 @@
  *	the $T variable by the caller if timeout is specified.
  * -----------------------------------------------
  */
-int op_lock(int timeout)
+int op_lock(mval *timeout)
 {
 	return (op_lock2(timeout, CM_LOCKS));
 }
diff --git a/sr_port/op_lock2.c b/sr_port/op_lock2.c
index 20df6d6..83acc68 100644
--- a/sr_port/op_lock2.c
+++ b/sr_port/op_lock2.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	*
@@ -59,6 +59,7 @@
 #include "getzposition.h"
 #include "lockdefs.h"
 #include "is_proc_alive.h"
+#include "mvalconv.h"
 #ifdef DEBUG
 #include "have_crit.h"		/* for the TPNOTACID_CHECK macro */
 #endif
@@ -81,8 +82,8 @@ error_def(ERR_LOCKINCR2HIGH);
 error_def(ERR_LOCKIS);
 error_def(ERR_LOCKTIMINGINTP);
 
-#define LOCKTIMESTR "LOCK time too long"
-#define ZALLOCTIMESTR "ZALLOCATE time too long"
+#define LOCKTIMESTR "LOCK"
+#define ZALLOCTIMESTR "ZALLOCATE"
 #define MAX_WARN_STR_ARG_LEN 256
 
 /* We made these messages seperate functions because we did not want to do the MAXSTR_BUFF_DECL(buff) declaration in op_lock2,
@@ -94,6 +95,7 @@ STATICFNDCL void tp_warning(mlk_pvtblk *pvt_ptr); /* put these prototypes. These
 						   */
 STATICFNDCL void level_err(mlk_pvtblk *pvt_ptr)
 {
+	lks_this_cmd = 0;
 	MAXSTR_BUFF_DECL(buff);
 	MAXSTR_BUFF_INIT;
 	lock_str_to_buff(pvt_ptr, buff, MAX_STRBUFF_INIT);
@@ -129,7 +131,7 @@ STATICFNDCL void tp_warning(mlk_pvtblk *pvt_ptr)
  *	the $T variable by the caller if timeout is specified.
  * -----------------------------------------------
  */
-int	op_lock2(int4 timeout, unsigned char laflag)	/* timeout is in seconds */
+int	op_lock2(mval *timeout, unsigned char laflag)	/* timeout is in milliseconds */
 {
 	boolean_t		blocked, timer_on;
 	signed char		gotit;
@@ -148,26 +150,16 @@ int	op_lock2(int4 timeout, unsigned char laflag)	/* timeout is in seconds */
 	SETUP_THREADGBL_ACCESS;
 	gotit = -1;
 	cm_action = laflag;
-	out_of_time = FALSE;
-	if (timeout < 0)
-		timeout = 0;
-	else if (TREF(tpnotacidtime) < timeout)
-	{
-		if (CM_ZALLOCATES == cm_action)
-			TPNOTACID_CHECK(ZALLOCTIMESTR)
-		else
-			TPNOTACID_CHECK(LOCKTIMESTR)
-	}
-	if (!(timer_on = (NO_M_TIMEOUT != timeout)))	/* NOTE assignment */
-		msec_timeout = NO_M_TIMEOUT;
+	out_of_time = timer_on = FALSE;
+	if (CM_ZALLOCATES == cm_action)		/* can't use ? : syntax here because of the way the macros nest */
+		MV_FORCE_MSTIMEOUT(timeout, msec_timeout, ZALLOCTIMESTR);
 	else
+		MV_FORCE_MSTIMEOUT(timeout, msec_timeout, LOCKTIMESTR);
+	if (NO_M_TIMEOUT != msec_timeout)
 	{
-		msec_timeout = timeout2msec(timeout);
 		if (0 == msec_timeout)
-		{
 			out_of_time = TRUE;
-			timer_on = FALSE;
-		} else
+		else
 		{
 			sys_get_curr_time(&cur_time);
 			mv_zintcmd = find_mvstent_cmd(ZINTCMD_LOCK, restart_pc, restart_ctxt, FALSE);
@@ -176,9 +168,9 @@ int	op_lock2(int4 timeout, unsigned char laflag)	/* timeout is in seconds */
 				end_time = mv_zintcmd->mv_st_cont.mvs_zintcmd.end_or_remain;
 				remain_time = sub_abs_time(&end_time, &cur_time);	/* get remaing time to sleep */
 				if (0 <= remain_time.at_sec)
-					msec_timeout = (int4)(remain_time.at_sec * MILLISECS_IN_SEC +
-							      /* Round up in order to prevent premautre timeouts */
-							      DIVIDE_ROUND_UP(remain_time.at_usec, MICROSECS_IN_MSEC));
+					msec_timeout = (int4)((remain_time.at_sec * MILLISECS_IN_SEC) +
+						/* Round up in order to prevent premature timeouts */
+						DIVIDE_ROUND_UP(remain_time.at_usec, MICROSECS_IN_MSEC));
 				else
 					msec_timeout = 0;
 				TAREF1(zintcmd_active, ZINTCMD_LOCK).restart_pc_last
@@ -197,11 +189,13 @@ int	op_lock2(int4 timeout, unsigned char laflag)	/* timeout is in seconds */
 			} else
 				add_int_to_abs_time(&cur_time, msec_timeout, &end_time);
 			if (0 < msec_timeout)
-				start_timer((TID)&timer_on, msec_timeout, wake_alarm, 0, NULL);
-			else
 			{
+				start_timer((TID)mlk_lock, msec_timeout, wake_alarm, 0, NULL);
+				timer_on = TRUE;
+			} else
+			{
+				cancel_timer((TID)mlk_lock);
 				out_of_time = TRUE;
-				timer_on = FALSE;
 			}
 		}
 	}
@@ -283,7 +277,7 @@ int	op_lock2(int4 timeout, unsigned char laflag)	/* timeout is in seconds */
 			mlk_bckout(pvt_ptr2, action);
 		}
 		assert(!pvt_ptr2->granted && (pvt_ptr2 == pvt_ptr1));
-		if (dollar_tlevel && timeout && (CDB_STAGNATE <= t_tries))
+		if (dollar_tlevel && msec_timeout && (CDB_STAGNATE <= t_tries))
 		{
 			assert(have_crit(CRIT_HAVE_ANY_REG));
 			tp_warning(pvt_ptr2);
@@ -307,22 +301,19 @@ int	op_lock2(int4 timeout, unsigned char laflag)	/* timeout is in seconds */
 					{
 						if (timer_on)
 						{
-							cancel_timer((TID)&timer_on);
+							cancel_timer((TID)mlk_lock);
 							timer_on = FALSE;
 						}
-						if (NO_M_TIMEOUT != timeout)
+						if (NO_M_TIMEOUT != msec_timeout)
 						{	/* get remain = end_time - cur_time */
 							sys_get_curr_time(&cur_time);
 							remain_time = sub_abs_time(&end_time, &cur_time);
-							if (0 <= remain_time.at_sec)
-								msec_timeout = (int4)(remain_time.at_sec * 1000
-									+ remain_time.at_usec / 1000);
-							else
-								msec_timeout = 0;	/* treat as out_of_time */
+							msec_timeout = (int4)(remain_time.at_sec * MILLISECS_IN_SEC +
+								/* Round up in order to prevent premature timeouts */
+								DIVIDE_ROUND_UP(remain_time.at_usec, MICROSECS_IN_MSEC));
 							if (0 >= msec_timeout)
 							{
 								out_of_time = TRUE;
-								timer_on = FALSE;	/* as if LOCK :0 */
 								break;
 							}
 							if ((tptimeout != outofband) && (ctrlc != outofband))
@@ -342,9 +333,9 @@ int	op_lock2(int4 timeout, unsigned char laflag)	/* timeout is in seconds */
 								TAREF1(zintcmd_active, ZINTCMD_LOCK).count++;
 								mv_chain->mv_st_cont.mvs_zintcmd.command = ZINTCMD_LOCK;
 							}
-							outofband_action(FALSE);	/* no return */
-						} else
-							outofband_action(FALSE);	/* no return */
+						}
+						lks_this_cmd = 0;	/* no return - clear flag that we're in LOCK processing */
+						outofband_action(FALSE);
 					}
 					break;
 				}
@@ -398,10 +389,11 @@ int	op_lock2(int4 timeout, unsigned char laflag)	/* timeout is in seconds */
 		gvcmz_clrlkreq();
 		remlkreq = FALSE;
 	}
-	if (NO_M_TIMEOUT != timeout)
+	lks_this_cmd = 0;	/* reset so we can check whether an extrinsic is trying to nest a LOCK operation */
+	if (NO_M_TIMEOUT != msec_timeout)
 	{	/* was timed or immediate */
-		if (timer_on && !out_of_time)
-			cancel_timer((TID)&timer_on);
+		if (timer_on)
+			cancel_timer((TID)mlk_lock);
 		if (blocked)
 		{
 			for (prior = &mlk_pvt_root;  *prior;)
diff --git a/sr_port/op_open.c b/sr_port/op_open.c
index c389475..a8b73c1 100755
--- a/sr_port/op_open.c
+++ b/sr_port/op_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	*
@@ -18,6 +18,7 @@
 #include "cryptdef.h"
 #include "op.h"
 #include "trans_log_name.h"
+#include "iotimer.h"
 
 #include "gdsroot.h"
 #include "gdskill.h"
@@ -57,19 +58,20 @@ error_def(LP_NOTACQ);				/* bad license */
 error_def(ERR_DEVOPENFAIL);
 error_def(ERR_TEXT);
 
-#define OPENTIMESTR "OPEN time too long"
+#define OPENTIMESTR "OPEN"
 
-int op_open(mval *device, mval *devparms, int timeout, mval *mspace)
+int op_open(mval *device, mval *devparms, mval *timeout, mval *mspace)
 {
 	char		buf1[MAX_TRANS_NAME_LEN];	/* buffer to hold translated name */
+	char		*c1;				/* used to compare $P name */
+	int4		msec_timeout;			/* timeout converted to number of milliseconds */
+	int4		stat;				/* status */
+	int		nlen;				/* len of $P name */
 	io_log_name	*naml;				/* logical record for passed name */
 	io_log_name	*tl;				/* logical record for translated name */
 	io_log_name	*prev;				/* logical record for removal search */
 	io_log_name	*tlp;				/* logical record for translated name for $principal */
-	int4		stat;				/* status */
 	mstr		tn;				/* translated name */
-	char		*c1;				/* used to compare $P name */
-	int		nlen;				/* len of $P name */
 	DCL_THREADGBL_ACCESS;
 
 	SETUP_THREADGBL_ACCESS;
@@ -77,23 +79,16 @@ int op_open(mval *device, mval *devparms, int timeout, mval *mspace)
 	MV_FORCE_STR(devparms);
 	if (mspace)
 		MV_FORCE_STR(mspace);
-	if (timeout < 0)
-		timeout = 0;
-	else if (TREF(tpnotacidtime) < timeout)
-		TPNOTACID_CHECK(OPENTIMESTR);
 	assert((unsigned char)*devparms->str.addr < n_iops);
-
-
+	MV_FORCE_MSTIMEOUT(timeout, msec_timeout, OPENTIMESTR);
 	if (dollar_principal || io_root_log_name->iod)
 	{
 		/* make sure that dollar_principal is defined or iod has been defined for the root */
 		/* log name before attempting to use it.  This is necessary as an attempt to open "0" done */
 		/* during initialization occurs prior to io_root_log_name->iod being initialized. */
-
 		/* if the device name is the value of $P followed by "< /" or "> /" issue an error */
 		/* we have no way of knowing if this is a $P variant without checking this name */
 		/* the device length has to be the length of $P + 3 for the special chars at the end */
-
 		tlp = dollar_principal ? dollar_principal : io_root_log_name->iod->trans_name;
 		nlen = tlp->len;
 		assert(dollar_zpout.len == dollar_zpin.len);
@@ -111,11 +106,9 @@ int op_open(mval *device, mval *devparms, int timeout, mval *mspace)
 					rts_error_csa(CSA_ARG(NULL) VARLSTCNT(8) ERR_DEVOPENFAIL, 2, device->str.len,
 						      device->str.addr, ERR_TEXT, 2,
 						      LEN_AND_LIT("The value of $P followed by \"> /\" is an invalid device name"));
-
 			}
 		}
 	}
-
 	naml = get_log_name(&device->str, INSERT);
 	if (naml->iod != 0)
 		tl = naml;
@@ -146,15 +139,13 @@ int op_open(mval *device, mval *devparms, int timeout, mval *mspace)
 					break;
 				}
 			}
-#			ifdef UNIX
 			if (SS_LOG2LONG == stat)
 				rts_error_csa(CSA_ARG(NULL) VARLSTCNT(5) ERR_LOGTOOLONG, 3, device->str.len,
 					      device->str.addr, SIZEOF(buf1) - 1);
 			else
-#			endif
 				rts_error_csa(CSA_ARG(NULL) VARLSTCNT(1) stat);
 		}
 	}
-	stat = io_open_try(naml, tl, devparms, timeout, mspace);
+	stat = io_open_try(naml, tl, devparms, msec_timeout, mspace);
 	return (stat);
 }
diff --git a/sr_port/op_open_dummy.c b/sr_port/op_open_dummy.c
index 00b9d47..cb3cfab 100755
--- a/sr_port/op_open_dummy.c
+++ b/sr_port/op_open_dummy.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	*
@@ -12,6 +13,7 @@
 #include "mdef.h"
 #include "op.h"
 
-int op_open_dummy(mval *v, mval *p, int t, mval *mspace){
+int op_open_dummy(mval *v, mval *p, mval *timeout, mval *mspace)
+{
 	return 0;
 }
diff --git a/sr_port/op_rdone.c b/sr_port/op_rdone.c
index 6e0bdbc..ef5671d 100755
--- a/sr_port/op_rdone.c
+++ b/sr_port/op_rdone.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	*
@@ -18,6 +19,26 @@
 #include "op.h"
 #include "mvalconv.h"
 #include "ebc_xlat.h"
+#include "gdsroot.h"
+#include "gdskill.h"
+#include "gdsbt.h"
+#include "gtm_facility.h"
+#include "fileinfo.h"
+#include "gdsfhead.h"
+#include "gdscc.h"
+#include "filestruct.h"
+#include "buddy_list.h"		/* needed for tp.h */
+#include "jnl.h"
+#include "hashtab_int4.h"	/* needed for tp.h */
+#include "tp.h"
+#include "send_msg.h"
+#include "gtmmsg.h"		/* for gtm_putmsg() prototype */
+#include "change_reg.h"
+#include "setterm.h"
+#include "getzposition.h"
+#ifdef DEBUG
+#include "have_crit.h"		/* for the TPNOTACID_CHECK macro */
+#endif
 
 #define TMP_BUF_LEN	1
 
@@ -25,25 +46,24 @@ GBLREF io_pair		io_curr_device;
 GBLREF io_desc		*active_device;
 GBLREF spdesc		stringpool;
 
-int op_rdone(mval *v, int4 timeout)
+error_def(ERR_IONOTOPEN);
+
+int op_rdone(mval *v, mval *timeout)
 {
-	int4	stat;
+	char		*start_ptr,temp_buf[TMP_BUF_LEN];
 	int	x;
-
-	char	temp_buf[TMP_BUF_LEN];
+	int4		msec_timeout;
+	size_t		insize, outsize, stat;
 	unsigned char	*temp_buf_ptr;
-	char	*start_ptr;
-	size_t	insize, outsize;
-	error_def(ERR_IONOTOPEN);
+	DCL_THREADGBL_ACCESS;
 
+	SETUP_THREADGBL_ACCESS;
+	MV_FORCE_MSTIMEOUT(timeout, msec_timeout, READTIMESTR);
 	active_device = io_curr_device.in;
-	if (timeout < 0)
-		timeout = 0;
 	x = -1;
 	assert(SIZEOF(mint) == SIZEOF(x));
-	stat = (io_curr_device.in->disp_ptr->rdone)((mint *)&x, timeout);
-
-#if defined(KEEP_zOS_EBCDIC) || defined(VMS)
+	stat = (io_curr_device.in->disp_ptr->rdone)((mint *)&x, msec_timeout);
+#	if defined(KEEP_zOS_EBCDIC)
 	if (DEFAULT_CODE_SET != active_device->in_code_set)
 	{
 		insize = outsize = 1;
@@ -53,11 +73,8 @@ int op_rdone(mval *v, int4 timeout)
 		ICONVERT(active_device->input_conv_cd, &temp_buf_ptr, &insize, &temp_buf_ptr, &outsize); /* 	in-place conv */
 		x = start_ptr[0];
 	}
-#endif
-
+#	endif
 	MV_FORCE_MVAL(v, x);
 	active_device = 0;
-	if (timeout != NO_M_TIMEOUT)
-		return (stat);
-	return FALSE;
+	return ((NO_M_TIMEOUT != msec_timeout) ? stat : FALSE);
 }
diff --git a/sr_port/op_read.c b/sr_port/op_read.c
index f013ef9..ae25c5f 100755
--- a/sr_port/op_read.c
+++ b/sr_port/op_read.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	*
@@ -39,33 +40,28 @@
 #include "have_crit.h"		/* for the TPNOTACID_CHECK macro */
 #endif
 
-GBLREF uint4		dollar_trestart;
 GBLREF io_pair		io_curr_device;
 GBLREF io_desc		*active_device;
 GBLREF spdesc		stringpool;
 
 error_def(ERR_TEXT);
 
-#define READTIMESTR "READ time too long"
-
-int op_read(mval *v, int4 timeout)
+int op_read(mval *v, mval *timeout)
 {
-	int stat;
-	mval val;
-	size_t cnt, insize, outsize;
-	unsigned char *temp_ch;
-	char *start_ptr, *save_ptr;
+	char		*save_ptr, *start_ptr;
+	int		stat;
+	int4		msec_timeout;
+	mval		val;
+	size_t		cnt, insize, outsize;
+	unsigned char	*temp_ch;
 	DCL_THREADGBL_ACCESS;
 
 	SETUP_THREADGBL_ACCESS;
-	if (timeout < 0)
-		timeout = 0;
-	else if (TREF(tpnotacidtime) < timeout)
-		TPNOTACID_CHECK(READTIMESTR);
+	MV_FORCE_MSTIMEOUT(timeout, msec_timeout, READTIMESTR);
 	active_device = io_curr_device.in;
 	v->mvtype = MV_STR;
 	v->str.len = 0;
-	stat = (io_curr_device.in->disp_ptr->read)(v, timeout);
+	stat = (io_curr_device.in->disp_ptr->read)(v, msec_timeout);
 	if (IS_AT_END_OF_STRINGPOOL(v->str.addr, 0))
 		stringpool.free += v->str.len;	/* see UNIX iott_readfl */
 	assert(stringpool.free <= stringpool.top);
@@ -86,7 +82,5 @@ int op_read(mval *v, int4 timeout)
 	}
 #	endif
 	active_device = 0;
-	if (NO_M_TIMEOUT != timeout)
-		return(stat);
-	return FALSE;
+	return ((NO_M_TIMEOUT != msec_timeout) ? stat : FALSE);
 }
diff --git a/sr_port/op_readfl.c b/sr_port/op_readfl.c
index 1664b81..da65700 100755
--- a/sr_port/op_readfl.c
+++ b/sr_port/op_readfl.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	*
@@ -16,26 +17,48 @@
 #include "stringpool.h"
 #include "op.h"
 #include "ebc_xlat.h"
+#include "gdsroot.h"
+#include "gdskill.h"
+#include "gdsbt.h"
+#include "gtm_facility.h"
+#include "fileinfo.h"
+#include "gdsfhead.h"
+#include "gdscc.h"
+#include "filestruct.h"
+#include "buddy_list.h"		/* needed for tp.h */
+#include "jnl.h"
+#include "hashtab_int4.h"	/* needed for tp.h */
+#include "tp.h"
+#include "send_msg.h"
+#include "gtmmsg.h"		/* for gtm_putmsg() prototype */
+#include "change_reg.h"
+#include "setterm.h"
+#include "getzposition.h"
+#ifdef DEBUG
+#include "have_crit.h"		/* for the TPNOTACID_CHECK macro */
+#endif
 
+GBLREF boolean_t	gtm_utf8_mode;
 GBLREF io_pair		io_curr_device;
-GBLREF spdesc		stringpool;
 GBLREF io_desc		*active_device;
-GBLREF boolean_t	gtm_utf8_mode;
+GBLREF spdesc		stringpool;
 
-error_def(ERR_TEXT);
 error_def(ERR_RDFLTOOSHORT);
 error_def(ERR_RDFLTOOLONG);
+error_def(ERR_TEXT);
 
-int op_readfl(mval *v, int4 length, int4 timeout)
+int op_readfl(mval *v, int4 length, mval *timeout)
 {
+	char		*start_ptr, *save_ptr;
+	int		b_length;
 	int4		stat;		/* status */
+	int4		msec_timeout;
 	size_t		cnt, insize, outsize;
-	char		*start_ptr, *save_ptr;
 	unsigned char	*temp_ch;
-	int		b_length;
+	DCL_THREADGBL_ACCESS;
 
-	if (timeout < 0)
-		timeout = 0;
+	SETUP_THREADGBL_ACCESS;
+	MV_FORCE_MSTIMEOUT(timeout, msec_timeout, READTIMESTR);
 	/* Length is in units of characters, MAX_STRLEN and allocation unit in stp is bytes. Compute the worst case need in bytes.
 	 * Worst case, every Unicode char is 4 bytes
 	 */
@@ -52,12 +75,12 @@ int op_readfl(mval *v, int4 length, int4 timeout)
 	ENSURE_STP_FREE_SPACE(b_length + ESC_LEN);
 	v->str.addr = (char *)stringpool.free;
 	active_device = io_curr_device.in;
-	stat = (io_curr_device.in->disp_ptr->readfl)(v, length, timeout);
+	stat = (io_curr_device.in->disp_ptr->readfl)(v, length, msec_timeout);
 	if (IS_AT_END_OF_STRINGPOOL(v->str.addr, 0))
-		stringpool.free += v->str.len;	/* see UNIX iott_readfl */
+		stringpool.free += v->str.len;	/* see iott_readfl */
 	assert((int4)v->str.len <= b_length);
 	assert(stringpool.free <= stringpool.top);
-#	if defined(KEEP_zOS_EBCDIC) || defined(VMS)
+#	if defined(KEEP_zOS_EBCDIC)
 	if (DEFAULT_CODE_SET != active_device->in_code_set)
 	{
 		cnt = insize = outsize = v->str.len;
@@ -74,7 +97,5 @@ int op_readfl(mval *v, int4 length, int4 timeout)
 	}
 #	endif
 	active_device = 0;
-	if (NO_M_TIMEOUT != timeout)
-		return (stat);
-	return FALSE;
+	return ((NO_M_TIMEOUT != msec_timeout) ? stat : FALSE);
 }
diff --git a/sr_port/op_setzbrk.c b/sr_port/op_setzbrk.c
index 4abc13b..b1bccbc 100644
--- a/sr_port/op_setzbrk.c
+++ b/sr_port/op_setzbrk.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,6 +33,7 @@
 #include "compiler.h"
 #include "min_max.h"
 #include "dm_setup.h"
+#include "restrict.h"
 #ifdef GTM_TRIGGER
 # include "gdsroot.h"			/* for gdsfhead.h */
 # include "gdsbt.h"			/* for gdsfhead.h */
@@ -55,6 +56,7 @@ error_def(ERR_INVZBREAK);
 error_def(ERR_MEMORY);
 error_def(ERR_NOPLACE);
 error_def(ERR_NOZBRK);
+error_def(ERR_RESTRICTEDOP);
 error_def(ERR_TRIGNAMENF);
 error_def(ERR_VMSMEMORY);
 error_def(ERR_ZBREAKFAIL);
@@ -81,6 +83,9 @@ void	op_setzbrk(mval *rtn, mval *lab, int offset, mval *act, int cnt)
 	boolean_t	deleted;
 	GTMTRIG_ONLY(boolean_t	is_trigger);
 
+	if (RESTRICTED(zbreak_op))
+		rts_error_csa(CSA_ARG(NULL) VARLSTCNT(3) ERR_RESTRICTEDOP, 1, "ZBREAK");
+
 	MV_FORCE_STR(rtn);
 	MV_FORCE_STR(lab);
 	MV_FORCE_STR(act);
diff --git a/sr_port/op_unlock.c b/sr_port/op_unlock.c
index ba21a2c..d1b094f 100755
--- a/sr_port/op_unlock.c
+++ b/sr_port/op_unlock.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	*
@@ -25,10 +25,11 @@
 #include "gvcmx.h"
 
 GBLREF	boolean_t	gtcm_connection;
-GBLREF	unsigned char	cm_action;
+GBLREF	int		process_exiting;
 GBLREF	mlk_pvtblk	*mlk_pvt_root;
 GBLREF	tp_frame	*tp_pointer;
-GBLREF	int		process_exiting;
+GBLREF	unsigned char	cm_action;
+GBLREF	unsigned short	lks_this_cmd;
 
 error_def(ERR_TPLOCK);
 
@@ -40,6 +41,8 @@ void op_unlock(void)
 	/* if there were any old locks before TSTART, they can't be  unlocked */
 	if (mlk_pvt_root && tp_pointer && tp_pointer->old_locks)
 		rts_error_csa(CSA_ARG(NULL) VARLSTCNT(1) ERR_TPLOCK);
+	lks_this_cmd = 0;
+	op_lkinit();
 	/* must deal with cm */
 	if (gtcm_connection)
 	{
diff --git a/sr_port/op_view.c b/sr_port/op_view.c
index 95d65e4..88ef711 100644
--- a/sr_port/op_view.c
+++ b/sr_port/op_view.c
@@ -13,7 +13,7 @@
 #include "mdef.h"
 
 #include <stdarg.h>
-#if defined(UNIX) && defined(DEBUG)
+#ifdef DEBUG
 # include "gtm_syslog.h"	/* Needed for white box case in VTK_STORDUMP */
 #endif
 #include "gtm_string.h"
@@ -63,13 +63,11 @@
 # include "gv_trigger.h"
 # include "gtm_trigger.h"
 #endif
-#ifdef UNIX
-# include "wbox_test_init.h"
-# include "mutex.h"
-# include "gtmlink.h"
-# ifdef DEBUG
-#  include "gtmsecshr.h"
-# endif
+#include "wbox_test_init.h"
+#include "mutex.h"
+#include "gtmlink.h"
+#ifdef DEBUG
+# include "gtmsecshr.h"
 #endif
 #ifdef AUTORELINK__SUPPORTED
 # include "relinkctl.h"
@@ -80,7 +78,9 @@
 #include "interlock.h"
 #include "wcs_backoff.h"
 #include "wcs_wt.h"
+#include "localvarmonitor.h"
 
+STATICFNDCL void lvmon_release(void);
 STATICFNDCL void view_dbop(unsigned char keycode, viewparm *parmblkptr, mval *thirdarg);
 
 GBLREF	volatile int4 		db_fsync_in_prog;
@@ -110,7 +110,7 @@ GBLREF	spdesc			stringpool;
 GBLREF	boolean_t		is_updproc;
 GBLREF	uint4			process_id;
 GBLREF	uint4			dollar_tlevel;
-UNIX_ONLY(GBLREF	boolean_t		dmterm_default;)
+GBLREF	boolean_t		dmterm_default;
 
 error_def(ERR_ACTRANGE);
 error_def(ERR_COLLATIONUNDEF);
@@ -150,7 +150,7 @@ error_def(ERR_ZDEFACTIVE);
 			gvnh->gvname.var_name.addr, gvnh->noisolation, status);					\
 }
 
-void	op_view(UNIX_ONLY_COMMA(int numarg) mval *keyword, ...)
+void	op_view(int numarg, mval *keyword, ...)
 {
 	boolean_t		dbgdmpenabled, old_bool, was_crit, was_skip_gtm_putmsg;
 	char			*chptr;
@@ -162,11 +162,12 @@ void	op_view(UNIX_ONLY_COMMA(int numarg) mval *keyword, ...)
 	gv_namehead		*gvnh;
 	hash_table_mname	*table;
 	ht_ent_mname		*tabent, *table_base_orig, *topent;
-	int			clrlen, lcnt, lct, icnt, ncol, nct, status, table_size_orig;
+	int			acnt, clrlen, lcnt, lct, icnt, ncol, nct, size, status, table_size_orig;
 	int4			testvalue, tmpzdefbufsiz;
 	jnl_buffer_ptr_t	jb;
 	lv_blk			*lvbp;
 	lv_val			*lv, *lvp, *lvp_top;
+	lvmon_var		*lvmon_var_p, *lvmon_vars_base;
 	mstr			tmpstr;
 	mval			*arg, *nextarg, outval;
 	noisolation_element	*gvnh_entry;
@@ -181,7 +182,6 @@ void	op_view(UNIX_ONLY_COMMA(int numarg) mval *keyword, ...)
 	open_relinkctl_sgm	*linkctl;
 	relinkrec_t		*linkrec;
 #	endif
-	VMS_ONLY(int		numarg;)
 	static readonly char msg1[] = "Caution: Database Block Certification Has Been ";
 	static readonly char lv_msg1[] =
 		"Caution: GT.M reserved local variable string pointer duplicate check diagnostic has been";
@@ -193,7 +193,6 @@ void	op_view(UNIX_ONLY_COMMA(int numarg) mval *keyword, ...)
 
 	SETUP_THREADGBL_ACCESS;
 	VAR_START(var, keyword);
-	VMS_ONLY(va_count(numarg));
 	jnl_status = 0;
 	assertpro(1 <= numarg);
 	MV_FORCE_STR(keyword);
@@ -244,14 +243,12 @@ void	op_view(UNIX_ONLY_COMMA(int numarg) mval *keyword, ...)
 		case VTK_POOLLIMIT:
 			view_dbop(vtp->keycode, &parmblk, (numarg > 1) ? va_arg(var, mval *) : (mval *)NULL);
 			break;
-#		ifdef UNIX
 		case VTK_DMTERM:
 			dmterm_default = TRUE;
 			break;
 		case VTK_NODMTERM:
 			dmterm_default = FALSE;
 			break;
-#		endif
 		case VTK_FULLBOOL:
 		case VTK_FULLBOOLWARN:
 		case VTK_NOFULLBOOL:
@@ -278,9 +275,6 @@ void	op_view(UNIX_ONLY_COMMA(int numarg) mval *keyword, ...)
 		case VTK_GVDUPSETNOOP:
 			gvdupsetnoop = (0 != MV_FORCE_INT(parmblk.value));
 			break;
-		case VTK_LVDUPCHECK:
-			/* This feature is not needed any more. This is a noop now */
-			break;
 		case VTK_LVNULLSUBS:
 			TREF(lv_null_subs) = LVNULLSUBS_OK;
 			break;
@@ -290,7 +284,6 @@ void	op_view(UNIX_ONLY_COMMA(int numarg) mval *keyword, ...)
 		case VTK_NEVERLVNULLSUBS:
 			TREF(lv_null_subs) = LVNULLSUBS_NEVER;
 			break;
-#		ifndef VMS
 		case VTK_JNLERROR:
 			/* 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
@@ -309,7 +302,6 @@ void	op_view(UNIX_ONLY_COMMA(int numarg) mval *keyword, ...)
 				view_dbop(vtp->keycode, &parmblk, (mval *)NULL);
 			}
 			break;
-#		endif
 		case VTK_JNLWAIT:
 			/* Go through all regions that could have possibly been open across all global directories */
 			if (!dollar_tlevel)
@@ -614,20 +606,7 @@ void	op_view(UNIX_ONLY_COMMA(int numarg) mval *keyword, ...)
 					turn_tracing_off(NULL);
 			}
 			break;
-		case VTK_ZDIR_FORM:
-			VMS_ONLY(
-				if (NULL != arg)
-				{
-					testvalue = MV_FORCE_INT(parmblk.value);
-					if (!IS_VALID_ZDIR_FORM(testvalue))
-					{
-						va_end(var);
-						rts_error_csa(CSA_ARG(NULL) VARLSTCNT(3) ERR_INVZDIRFORM, 1, testvalue);
-					}
-				} else
-					testvalue = ZDIR_FORM_FULLPATH;
-				zdir_form = testvalue;
-			)
+		case VTK_ZDIR_FORM:			/* Vestigial remnant from VMS - to be removed in the future */
 			break;
 		case VTK_FILLFACTOR:
 			testvalue = MV_FORCE_INT(parmblk.value);
@@ -664,7 +643,7 @@ void	op_view(UNIX_ONLY_COMMA(int numarg) mval *keyword, ...)
 			DEFER_BASE_REL_HASHTAB(table, FALSE);
 			break;
 		case VTK_STORDUMP:
-#			if defined(DEBUG) && defined(UNIX)
+#			ifdef DEBUG
 			if (gtm_white_box_test_case_enabled
 				&& (WBTEST_HOLD_CRIT_TILL_LCKALERT == gtm_white_box_test_case_number))
 			{	/* Hold crit for a long enough interval to generate lock alert which then does a continue_proc */
@@ -739,11 +718,9 @@ void	op_view(UNIX_ONLY_COMMA(int numarg) mval *keyword, ...)
 		case VTK_NOLOGNONTP:
 			TREF(nontprestart_log_delta) = 0;
 			break;
-#		ifdef UNIX
 		case VTK_LINK:
 			init_relink_allowed(&parmblk.value->str);
 			break;
-#		endif
 #		ifdef DEBUG_ALIAS
 		case VTK_LVMONOUT:
 			als_lvmon_output();
@@ -806,6 +783,33 @@ void	op_view(UNIX_ONLY_COMMA(int numarg) mval *keyword, ...)
 				gvcst_statshare_optout();
 			}
 			break;
+		case VTK_LVMON:
+			if (0 < numarg)
+			{	/* A variable list was supplied - Need a new table but first free any existing old table first */
+				if (NULL != TREF(lvmon_vars_anchor))
+					lvmon_release();			/* Table exists. Free allocated var names/values */
+				TREF(lvmon_vars_count) = numarg;		/* Elements in this table */
+				size = numarg * SIZEOF(lvmon_var);		/* Byte size of new table */
+				lvmon_vars_base = TREF(lvmon_vars_anchor) = malloc(size);	/* Allocate new table */
+				memset(lvmon_vars_base, 0, size);		/* Clear new table */
+				for (acnt = numarg, lvmon_var_p = lvmon_vars_base;  0 < acnt; acnt--, lvmon_var_p++)
+				{	/* Load up new table from args given */
+					MV_FORCE_STR(arg);
+					lvmon_var_p->lvmv.var_name.len = arg->str.len;
+					lvmon_var_p->lvmv.var_name.addr = malloc(arg->str.len);
+					memcpy(lvmon_var_p->lvmv.var_name.addr, arg->str.addr, arg->str.len);
+					COMPUTE_HASH_MNAME(&lvmon_var_p->lvmv);	/* Set hash value for var name */
+					if (1 < acnt)				/* If another var to fetch, do so */
+						arg = va_arg(var, mval *);
+				}
+				TREF(lvmon_active) = TRUE;			/* We are active now */
+			} else
+			{
+				if (NULL != TREF(lvmon_vars_anchor))
+					lvmon_release();			/* No vars specified - free what have if any */
+				TREF(lvmon_active) = FALSE;			/* No monitoring active now */
+			}
+			break;
 		default:
 			va_end(var);
 			rts_error_csa(CSA_ARG(NULL) VARLSTCNT(1) ERR_VIEWCMD);
@@ -814,7 +818,48 @@ void	op_view(UNIX_ONLY_COMMA(int numarg) mval *keyword, ...)
 	return;
 }
 
-void view_dbop(unsigned char keycode, viewparm *parmblkptr, mval *thirdarg)
+/* Routine to locate the structure associated with local variable monitoring across given points in GTM code
+ * and release all of:
+ *   1. The malloc'd variable names.
+ *   2. The malloc'd variable values.
+ *   3. The array of lvmon_vars structures anchored at TREF(lvmon_var_anchor).
+ */
+STATICFNDEF void lvmon_release(void)
+{
+	int		acnt;
+	lvmon_var	*lvmon_var_p, *lvmon_vars_base;
+	lvmon_value_ent	*lvmon_val_ent_p;
+	int		ecnt;
+	DCL_THREADGBL_ACCESS;
+
+	SETUP_THREADGBL_ACCESS;
+	for (acnt = TREF(lvmon_vars_count), lvmon_var_p = TREF(lvmon_vars_anchor);
+	     0 < acnt;
+	     acnt--, lvmon_var_p++)
+	{
+		assert(NULL != lvmon_var_p->lvmv.var_name.addr);
+		if (NULL != lvmon_var_p->lvmv.var_name.addr)
+		{
+			free(lvmon_var_p->lvmv.var_name.addr);	/* Free var name */
+			lvmon_var_p->lvmv.var_name.addr = NULL;
+		}
+		for (ecnt = MAX_LVMON_VALUES, lvmon_val_ent_p = &lvmon_var_p->values[0];
+		     0 < ecnt;
+		     ecnt--, lvmon_val_ent_p++)
+		{
+			assert(NULL != lvmon_val_ent_p->varvalue.addr);
+			if (NULL != lvmon_val_ent_p->varvalue.addr)
+			{
+				free(lvmon_val_ent_p->varvalue.addr);
+				lvmon_val_ent_p->varvalue.addr = NULL;
+			}
+		}
+	}
+	free(TREF(lvmon_vars_anchor));		/* Release the old table */
+	TREF(lvmon_vars_anchor) = NULL;
+}
+
+STATICFNDEF void view_dbop(unsigned char keycode, viewparm *parmblkptr, mval *thirdarg)
 {
 	boolean_t		was_crit;
 	gd_region		*reg, *r_top, *save_reg;
@@ -823,8 +868,8 @@ void view_dbop(unsigned char keycode, viewparm *parmblkptr, mval *thirdarg)
 	jnl_buffer_ptr_t	jb;
 	sgmnt_addrs		*csa;
 	sgmnt_data_ptr_t	csd;
-	uint4			jnl_status, dummy_errno;
-	UNIX_ONLY(unix_db_info	*udi;)
+	uint4			jnl_status, dummy_errno, wcsflu_parms;
+	unix_db_info		*udi;
 
 	if (NULL == gd_header)		/* Open gbldir */
 		gvinit();
@@ -852,7 +897,6 @@ void view_dbop(unsigned char keycode, viewparm *parmblkptr, mval *thirdarg)
 				}
 				break;
 			case VTK_DBSYNC:
-#				ifdef UNIX
 				if (!reg->read_only)
 				{
 					csa = cs_addrs;
@@ -865,7 +909,6 @@ void view_dbop(unsigned char keycode, viewparm *parmblkptr, mval *thirdarg)
 						save_errno = 0;
 					}
 				}
-#				endif
 				break;
 			case VTK_EPOCH:
 			case VTK_FLUSH:
@@ -879,17 +922,19 @@ void view_dbop(unsigned char keycode, viewparm *parmblkptr, mval *thirdarg)
 					 * TPFAIL error because we are already in the final retry. By passing the WCSFLU_IN_COMMIT
 					 * bit, we instruct wcs_flu to avoid wcs_recover.
 					 */
-					wcs_flu(WCSFLU_FLUSH_HDR | WCSFLU_WRITE_EPOCH | WCSFLU_IN_COMMIT | WCSFLU_SPEEDUP_NOBEFORE);
+					wcsflu_parms = WCSFLU_FLUSH_HDR | WCSFLU_WRITE_EPOCH | WCSFLU_SPEEDUP_NOBEFORE;
+					if (dollar_tlevel)
+						wcsflu_parms |= WCSFLU_IN_COMMIT;
+					wcs_flu(wcsflu_parms);
 				}
 				break;
 			case VTK_GVSRESET:
 				change_reg();
 				if (!reg->read_only)
 					CLRGVSTATS(cs_addrs);
-				/* Always reset process stats in process-private storage */
+				/* Reset process stats in either process-private storage or a shared statsDB record */
 				memset((char *)cs_addrs->gvstats_rec_p, 0, SIZEOF(gvstats_rec_t));
 				break;
-#			ifndef VMS
 			case VTK_JNLERROR:
 				if (!reg->read_only)
 				{
@@ -907,7 +952,6 @@ void view_dbop(unsigned char keycode, viewparm *parmblkptr, mval *thirdarg)
 					}
 				}
 				break;
-#				endif
 			case VTK_JNLFLUSH:
 				csa = cs_addrs;
 				csd = csa->hdr;
@@ -925,8 +969,9 @@ void view_dbop(unsigned char keycode, viewparm *parmblkptr, mval *thirdarg)
 							if (SS_NORMAL == (jnl_status = jnl_flush(reg)))
 							{
 								assert(jb->dskaddr == jb->freeaddr);
-								UNIX_ONLY(jnl_fsync(reg, jb->dskaddr));
-								UNIX_ONLY(assert(jb->freeaddr == jb->fsync_dskaddr));
+								assert(jb->freeaddr == jb->rsrv_freeaddr);
+								jnl_fsync(reg, jb->dskaddr);
+								assert(jb->freeaddr == jb->fsync_dskaddr);
 							} else
 							{
 								send_msg_csa(CSA_ARG(csa) VARLSTCNT(9) ERR_JNLFLUSH, 2,
diff --git a/sr_port/op_zallocate.c b/sr_port/op_zallocate.c
index f9e6ae8..6aaca80 100755
--- a/sr_port/op_zallocate.c
+++ b/sr_port/op_zallocate.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	*
@@ -32,7 +33,7 @@
  *	the $T variable by the caller if timeout is specified.
  * -----------------------------------------------
  */
-int op_zallocate(int timeout)
+int op_zallocate(mval *timeout)
 {
 
 	return op_lock2(timeout, CM_ZALLOCATES);
diff --git a/sr_port/op_zdealloc2.c b/sr_port/op_zdealloc2.c
index e69847a..a7dddf8 100755
--- a/sr_port/op_zdealloc2.c
+++ b/sr_port/op_zdealloc2.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	*
@@ -31,6 +32,8 @@ GBLREF mlk_pvtblk	*mlk_pvt_root;
 GBLREF unsigned char	cm_action;
 GBLREF tp_frame		*tp_pointer;
 
+error_def(ERR_TPLOCK);
+
 /*
  * -----------------------------------------------
  * Arguments:
@@ -39,15 +42,13 @@ GBLREF tp_frame		*tp_pointer;
  * -----------------------------------------------
  */
 
-void op_zdealloc2(int4 timeout, UINTPTR_T auxown)
+void op_zdealloc2(mval *timeout, UINTPTR_T auxown)
 {
 	unsigned short	count;
 	mlk_pvtblk	**prior;
 	bool		specific;
 
-	error_def(ERR_TPLOCK);
-
-	assert(NO_M_TIMEOUT == timeout);
+	assert(NO_M_TIMEOUT == timeout->m[1]);
 	if (lks_this_cmd)
 	{
 		specific = TRUE;
@@ -59,7 +60,10 @@ void op_zdealloc2(int4 timeout, UINTPTR_T auxown)
 			{
 				/* if there were any old locks before TSTART, they can't be  unlocked */
 				if ((*prior)->granted && (*prior)->zalloc && (*prior)->tp && (*prior)->tp->zalloc)
-					rts_error(VARLSTCNT(1) ERR_TPLOCK);
+				{
+					lks_this_cmd = 0;
+					rts_error_csa(NULL, VARLSTCNT(1) ERR_TPLOCK);
+				}
 				prior = &((*prior)->next);
 			}
 		}
@@ -87,7 +91,10 @@ void op_zdealloc2(int4 timeout, UINTPTR_T auxown)
 	{
 		/* if there were any old locks before TSTART, they can't be  unlocked */
 		if (mlk_pvt_root && tp_pointer && tp_pointer->old_locks)
-			rts_error(VARLSTCNT(1) ERR_TPLOCK);
+		{
+			lks_this_cmd = 0;
+			rts_error_csa(NULL, VARLSTCNT(1) ERR_TPLOCK);
+		}
 		specific = FALSE;
 		for (prior = &mlk_pvt_root;  *prior;)
 		{
@@ -109,6 +116,7 @@ void op_zdealloc2(int4 timeout, UINTPTR_T auxown)
 			}
 		}
 	}
+	lks_this_cmd = 0;	/* reset so we can check whether an extrinsic is trying to nest a LOCK operation */
 	if (gtcm_connection)
 	{
 		cm_action = CM_ZALLOCATES;
diff --git a/sr_port/op_zdeallocate.c b/sr_port/op_zdeallocate.c
index a1ec6fb..876288a 100755
--- a/sr_port/op_zdeallocate.c
+++ b/sr_port/op_zdeallocate.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	*
@@ -20,7 +21,7 @@
 #include "mdef.h"
 #include "op.h"
 
-void op_zdeallocate (int4 timeout)
+void op_zdeallocate (mval *timeout)
 {
 	op_zdealloc2(timeout, 0);
 	return;
diff --git a/sr_port/op_zprint.c b/sr_port/op_zprint.c
index d00b33b..849991a 100644
--- a/sr_port/op_zprint.c
+++ b/sr_port/op_zprint.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	*
@@ -112,10 +112,10 @@ void op_zprint(mval *rtn, mval *start_label, int start_int_exp, mval *end_label,
 		null_str.mvtype = MV_STR;
 		null_str.str.len = 0;
 		stat2 = get_src_line(rtn, &null_str, 1, &src2, NULL);
+		assert(NULL != src2);
 		/* number of lines less one for duplicated zero'th line and one due
 		   to termination condition being <=
 		*/
-		assert((INTPTR_T)src2 > 0);
 		src2 += rtn_vector->lnrtab_len - 2;
 	}
 	if (stat1 & CHECKSUMFAIL)
diff --git a/sr_port/op_zsystem.c b/sr_port/op_zsystem.c
index 805f3ad..f958d78 100755
--- a/sr_port/op_zsystem.c
+++ b/sr_port/op_zsystem.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,12 +36,12 @@
 #include "change_reg.h"
 #include "setterm.h"
 #include "getzposition.h"
+#include "restrict.h"
 #ifdef DEBUG
 #include "have_crit.h"		/* for the TPNOTACID_CHECK macro */
 #endif
 
 #define	ZSYSTEMSTR	"ZSYSTEM"
-#define	MAXZSYSSTRLEN	4096	/* maximum command line length supported by most Unix shells */
 
 GBLREF	uint4		dollar_trestart;
 GBLREF	int4		dollar_zsystem;			/* exit status of child */
@@ -49,12 +49,12 @@ GBLREF	io_pair		io_std_device;
 GBLREF	uint4           trust;
 
 error_def(ERR_INVSTRLEN);
+error_def(ERR_RESTRICTEDOP);
 error_def(ERR_SYSCALL);
 
 void op_zsystem(mval *v)
 {
-	int		len, shlen;
-	char		*sh, cmd_buf[MAXZSYSSTRLEN + 1], *cmd;
+	char		*cmd_buf = NULL;
 #ifdef _BSD
         union wait      wait_stat;
 #else
@@ -63,40 +63,25 @@ void op_zsystem(mval *v)
 	DCL_THREADGBL_ACCESS;
 
 	SETUP_THREADGBL_ACCESS;
+	if (RESTRICTED(zsystem_op))
+		rts_error_csa(CSA_ARG(NULL) VARLSTCNT(3) ERR_RESTRICTEDOP, 1, "ZSYSTEM");
 	TPNOTACID_CHECK(ZSYSTEMSTR);
 	MV_FORCE_STR(v);
-	/* get SHELL environment */
-	sh = GETENV("SHELL");
-	shlen = (NULL == sh)? 0 : STRLEN(sh);
-	len = (0 < shlen)? shlen : STRLEN("/bin/sh");
-	/* Include " -c ''" in the total string length */
-	len += STRLEN(" -c ''");
-	if ((v->str.len + len) > MAXZSYSSTRLEN)
-		rts_error_csa(CSA_ARG(NULL) VARLSTCNT(4) ERR_INVSTRLEN, 2, v->str.len,
-				(MAXZSYSSTRLEN > len)? (MAXZSYSSTRLEN - len) : 0);
-	cmd = cmd_buf;
+	flush_pio();
+	if (io_std_device.in->type == tt)
+		resetterm(io_std_device.in);
 	if (v->str.len)
 	{
-		/* Use bourne shell as default */
-		if (0 < shlen)
-			SNPRINTF(cmd_buf, MAXZSYSSTRLEN, "%s -c '", sh);
-		else
-			STRNCPY_LIT_FULL(cmd_buf, "/bin/sh -c '");
-		len = STRLEN(cmd);
-		memcpy(cmd + len, v->str.addr, v->str.len);
-		*(cmd + len + v->str.len) = 39; /* ' = 39 */
-		*(cmd + len + v->str.len + 1) = 0;
+		/* Copy the commander to a new buffer and append a '\0' */
+		cmd_buf = (char*)malloc(v->str.len+1);
+		memcpy(cmd_buf, v->str.addr, v->str.len);
+		cmd_buf[v->str.len] = '\0';
 	} else
 	{
-		if (0 < shlen)
-			SNPRINTF(cmd_buf, MAXZSYSSTRLEN, "%s", sh);
-		else
-			STRNCPY_LIT_FULL(cmd_buf, "/bin/sh");
+		cmd_buf = GETENV("SHELL");;
+		cmd_buf = (NULL == cmd_buf || '\0' == *cmd_buf) ? "/bin/sh" : cmd_buf;
 	}
-	flush_pio();
-	if (io_std_device.in->type == tt)
-		resetterm(io_std_device.in);
-	dollar_zsystem = SYSTEM(cmd);
+	dollar_zsystem = SYSTEM(cmd_buf);
 	if (-1 == dollar_zsystem)
 		rts_error_csa(CSA_ARG(NULL) VARLSTCNT(8) ERR_SYSCALL, 5, RTS_ERROR_LITERAL("system"), CALLFROM, errno);
 #ifdef _BSD
diff --git a/sr_port/op_ztcommit.c b/sr_port/op_ztcommit.c
index d32d577..ba1682e 100644
--- a/sr_port/op_ztcommit.c
+++ b/sr_port/op_ztcommit.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,11 +11,9 @@
  ****************************************************************/
 
 #include "mdef.h"
+
 #include "gtm_time.h"
 #include "gtm_inet.h"
-#ifdef VMS
-#include <descrip.h> /* Required for gtmsource.h */
-#endif
 
 #include "gdsroot.h"
 #include "gtm_facility.h"
@@ -160,14 +158,14 @@ void    op_ztcommit(int4 n)
 		jpc = csa->jnl;
 		assert(csa->now_crit);
 		if (0 == jpc->pini_addr)
-			jnl_put_jrt_pini(csa);
+			jnl_write_pini(csa);
 		ztcom_record.prefix.pini_addr = jpc->pini_addr;
 		ztcom_record.prefix.tn = csa->ti->curr_tn;
 		ztcom_record.prefix.checksum = INIT_CHECKSUM_SEED;
 		ztcom_record.prefix.time = jgbl.gbl_jrec_time;
 		ztcom_record.prefix.checksum = compute_checksum(INIT_CHECKSUM_SEED,
 									(unsigned char *)&ztcom_record, SIZEOF(struct_jrec_ztcom));
-		JNL_WRITE_APPROPRIATE(csa, jpc, JRT_ZTCOM, (jnl_record *)&ztcom_record, NULL, NULL, NULL);
+		JNL_WRITE_APPROPRIATE(csa, jpc, JRT_ZTCOM, (jnl_record *)&ztcom_record, NULL);
 		if (!csa->hold_onto_crit)
 			rel_crit(jpc->region);
 	}
diff --git a/sr_port/opcode_def.h b/sr_port/opcode_def.h
index 5f00f18..7e1245a 100755
--- a/sr_port/opcode_def.h
+++ b/sr_port/opcode_def.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	*
@@ -165,7 +165,7 @@ OPCODE_DEF(OC_CLRTEST, (OCT_NULL))
 OPCODE_DEF(OC_FORLOOP, (OCT_NULL))
 OPCODE_DEF(OC_JMPTSET, (OCT_JUMP))
 OPCODE_DEF(OC_JMPTCLR, (OCT_JUMP))
-OPCODE_DEF(OC_NUMCMP, (OCT_BOOL))
+OPCODE_DEF(OC_NUMCMP, (OCT_BOOL | OCT_REL))
 OPCODE_DEF(OC_JMPEQU, (OCT_JUMP))
 OPCODE_DEF(OC_JMPNEQ, (OCT_JUMP))
 OPCODE_DEF(OC_JMPGTR, (OCT_JUMP))
@@ -348,5 +348,5 @@ 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))
+OPCODE_DEF(OC_LASTOPCODE, (OCT_CGSKIP))
+/* insert new opcodes before OC_LASTOPCODE */
diff --git a/sr_port/pattab.c b/sr_port/pattab.c
index e951e79..b91772c 100755
--- a/sr_port/pattab.c
+++ b/sr_port/pattab.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	*
@@ -188,13 +188,13 @@ int initialize_pattern_table(void)
 		pat_allmaskbits |= pattern_typemask[letter];	/* used in do_patfixed/do_pattern */
 	/* Locate default pattern file and load it. */
         status = TRANS_LOG_NAME(&pat_file, &transnam, buffer, SIZEOF(buffer), do_sendmsg_on_log2long);
-	if (SS_NORMAL != status)
+	if ((SS_NORMAL != status) || (0 == transnam.len))
 		return 0;
 	if (!load_pattern_table(transnam.len, transnam.addr))
 		return 0;
 	/* Establish default pattern table. */
 	status = TRANS_LOG_NAME(&pat_table,&transnam,buffer, SIZEOF(buffer), do_sendmsg_on_log2long);
-	if (SS_NORMAL != status)
+	if ((SS_NORMAL != status) || (0 == transnam.len))
 		return 0;
 	patname.len = transnam.len;
 	patname.addr = transnam.addr;
diff --git a/sr_port/performcaslatchcheck.c b/sr_port/performcaslatchcheck.c
index 8196edf..c2826dd 100755
--- a/sr_port/performcaslatchcheck.c
+++ b/sr_port/performcaslatchcheck.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	*
@@ -27,27 +28,29 @@
 #endif
 
 GBLREF	pid_t	process_id;
-GBLREF	uint4	image_count;
 GBLREF 	int4 	exi_condition;
 
-void performCASLatchCheck(sm_global_latch_ptr_t latch, boolean_t cont_proc)
+/* Returns TRUE if latch was held by a dead pid and was made available inside this function.
+ * Returns FALSE otherwise.
+ * TRUE return enables callers to invoke some latch-specific recovery action.
+ */
+boolean_t performCASLatchCheck(sm_global_latch_ptr_t latch, boolean_t cont_proc)
 {
-	pid_t	holder_pid;
-	VMS_ONLY(uint4 holder_imgcnt;)
+	pid_t		holder_pid;
+	boolean_t	ret;
 
 	holder_pid = latch->u.parts.latch_pid;
-	VMS_ONLY(holder_imgcnt = latch->u.parts.latch_image_count);
+	ret = FALSE;
 	if (LOCK_AVAILABLE != holder_pid)
 	{ 	/* should never be done recursively - but signal case is permitted for now as it will never return */
 		/* remove 0 == exi_condition below when fixed */
-		if ((process_id == holder_pid) && (0 == exi_condition) VMS_ONLY(&& image_count == holder_imgcnt))
-			GTMASSERT;
-		if ((process_id == holder_pid VMS_ONLY(&& image_count == holder_imgcnt))
-		    || (FALSE == is_proc_alive(holder_pid, UNIX_ONLY(0) VMS_ONLY(holder_imgcnt))))
-		{ /* remove (processe_id == holder && image_count == holder_pid) when fixed */
-			COMPSWAP_UNLOCK(latch, holder_pid, holder_imgcnt, LOCK_AVAILABLE, 0);
-		}
-		UNIX_ONLY(else if (cont_proc)
-		                    continue_proc(holder_pid);)	/* Attempt wakeup in case process is stuck */
+		assertpro((process_id != holder_pid) || (0 != exi_condition));
+		if ((process_id == holder_pid) || (FALSE == is_proc_alive(holder_pid, 0)))
+		{	/* remove (processe_id == holder) when fixed */
+			COMPSWAP_UNLOCK(latch, holder_pid, 0, LOCK_AVAILABLE, 0);
+			ret = TRUE;
+		} else if (cont_proc)
+			continue_proc(holder_pid);	/* Attempt wakeup in case process is stuck */
 	}
+	return ret;
 }
diff --git a/sr_port/performcaslatchcheck.h b/sr_port/performcaslatchcheck.h
index e6a8432..9610f30 100755
--- a/sr_port/performcaslatchcheck.h
+++ b/sr_port/performcaslatchcheck.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	*
@@ -11,4 +12,4 @@
 
 /* Check that the latch is not stuck on a dead process */
 
-void performCASLatchCheck(sm_global_latch_ptr_t, boolean_t);
+boolean_t performCASLatchCheck(sm_global_latch_ptr_t, boolean_t);
diff --git a/sr_port/preemptive_db_clnup.c b/sr_port/preemptive_db_clnup.c
index 94fdbbe..84248c9 100644
--- a/sr_port/preemptive_db_clnup.c
+++ b/sr_port/preemptive_db_clnup.c
@@ -21,7 +21,6 @@
 #include "gdsblk.h"
 #include "gtm_facility.h"
 #include "fileinfo.h"
-#include "probe.h"
 #include "gdsfhead.h"
 #include "error.h"
 #include "gdskill.h"
@@ -87,11 +86,11 @@ void preemptive_db_clnup(int preemptive_severe)
 			{
 				csa = si->tp_csa;
 				assert(si->tp_csa == si->kip_csa);
-				PROBE_DECR_KIP(csa->hdr, csa, si->kip_csa);
+				DECR_KIP(csa->hdr, csa, si->kip_csa);
 			}
 		}
 	} else if (NULL != kip_csa && (NULL != kip_csa->hdr) && (NULL != kip_csa->nl))
-		PROBE_DECR_KIP(kip_csa->hdr, kip_csa, kip_csa);
+		DECR_KIP(kip_csa->hdr, kip_csa, kip_csa);
 	if (IS_DSE_IMAGE)
 	{	/* Release crit on any region that was obtained for the current erroring DSE operation.
 		 * Take care NOT to release crits obtained by a previous CRIT -SEIZE command.
diff --git a/sr_port/probe.h b/sr_port/probe.h
deleted file mode 100755
index c805b21..0000000
--- a/sr_port/probe.h
+++ /dev/null
@@ -1,44 +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.	*
- *								*
- ****************************************************************/
-
-#ifndef PROBE_included
-#define PROBE_included
-
-/* Only VAX has a non-boolean return code due to the secvector mechanism. */
-#if defined(VAX)
-uint4		probe(uint4 len, sm_uc_ptr_t addr, boolean_t write);
-#elif defined(UNIX)
-boolean_t	probe(uint4 len, void *addr, boolean_t write);
-#else
-boolean_t	probe(uint4 len, sm_uc_ptr_t addr, boolean_t write);
-#endif
-
-/* GTM_PROBE is defined to call the probe() function. In VAX, probe() resides in GTMSECSHR
- * and might return a status code (actually from change_mode.mar) which should not be confused
- * with the output of the probe() call. Hence the check for TRUE == probe().
- */
-
-#ifdef VAX
-#define 	GTM_PROBE(X, Y, Z) 	(TRUE == probe((X), (Y), (Z)))
-#else
-#define 	GTM_PROBE(X, Y, Z) 	(probe((uint4)(X), (Y), (Z)))
-#endif
-
-#define 	WRITE			TRUE
-#define 	READ			FALSE
-
-#define		PROBE_EVEN(X)	(!((UINTPTR_T)(X) & 1))
-#define		PROBE_ODD(X)	(!PROBE_EVEN(X))
-
-#define		PROBE_DECR_CNT(X,Y)	if (PROBE_EVEN(X)) DECR_CNT((X),(Y))
-#define		PROBE_INCR_CNT(X,Y)	if (PROBE_EVEN(X)) INCR_CNT((X),(Y))
-
-#endif
diff --git a/sr_port/region_freeze.c b/sr_port/region_freeze.c
index 5faf8c8..8221cf5 100644
--- a/sr_port/region_freeze.c
+++ b/sr_port/region_freeze.c
@@ -52,7 +52,6 @@ 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))
-# define LATCH_WAIT_SEC	(5 * 60)
 
 #ifdef DEBUG_FREEZE
 #define SEND_FREEZEID(STATE, CSA)							\
@@ -181,8 +180,8 @@ freeze_status	region_freeze_main(gd_region *region, boolean_t freeze, boolean_t
 			 */
 			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));
+		/* Return value of "grab_latch" does not need to be checked because we pass GRAB_LATCH_INDEFINITE_WAIT as timeout */
+		grab_latch(&cnl->freeze_latch, GRAB_LATCH_INDEFINITE_WAIT);
 		rval = REG_FREEZE_SUCCESS;
 		jnl_switch_done = FALSE;
 		jpc = csa->jnl;
@@ -248,8 +247,8 @@ freeze_status	region_freeze_main(gd_region *region, boolean_t freeze, boolean_t
 		return rval;
 	}
 	/* !freeze */
-	while (!grab_latch(&cnl->freeze_latch, LATCH_WAIT_SEC))
-		assert(FREEZE_LATCH_HELD(csa));
+	/* Return value of "grab_latch" does not need to be checked because we pass GRAB_LATCH_INDEFINITE_WAIT as timeout */
+	grab_latch(&cnl->freeze_latch, GRAB_LATCH_INDEFINITE_WAIT);
 	/* 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.
 	 */
diff --git a/sr_port/repl_filter.c b/sr_port/repl_filter.c
old mode 100755
new mode 100644
index 0b70db4..e3d7356
--- a/sr_port/repl_filter.c
+++ b/sr_port/repl_filter.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,16 +18,10 @@
 #include "gtm_string.h"
 #include "gtm_stdio.h"
 #include "gtm_select.h"
-#ifdef UNIX
 #include "gtm_ipc.h"
-#endif
 
-#ifdef UNIX
 #include <sys/mman.h>
 #include <sys/shm.h>
-#elif defined(VMS)
-#include <descrip.h>
-#endif
 #include <stddef.h>
 #include <errno.h>
 #include <sys/wait.h>
@@ -57,10 +51,8 @@
 #include "jnl_typedef.h"
 #include "gv_trigger_common.h" /* for HASHT* macros */
 #include "replgbl.h"
-#ifdef UNIX
 #include "gtm_c_stack_trace.h"
 #include "fork_init.h"
-#endif
 #include "wbox_test_init.h"
 #ifdef GTM_USE_POLL_FOR_SUBSECOND_SELECT
 #include <sys/poll.h>
@@ -334,7 +326,7 @@
 	(PREFIX)->jrec_type = JRT_NULL;						\
 	(PREFIX)->forwptr = V17_NULL_RECLEN;					\
 	/* pini_addr, time, checksum and tn fields of "jrec_prefix" are not	\
-	 * used by update process so dont bother initializing them.		\
+	 * used by update process so don't bother initializing them.		\
 	 */									\
 	CB += JREC_PREFIX_SIZE;							\
 	/* Initialize the sequence number */					\
@@ -356,17 +348,15 @@
 	(PREFIX)->jrec_type = JRT_NULL;						\
 	(PREFIX)->forwptr = V24_NULL_RECLEN;					\
 	/* pini_addr, time, checksum and tn fields of "jrec_prefix" are not	\
-	 * used by update process so dont bother initializing them.		\
+	 * used by update process so don't bother initializing them.		\
 	 */									\
 	CB += JREC_PREFIX_SIZE;							\
 	/* Initialize "jnl_seqno" */						\
 	*(seq_num *)(CB) = SEQNO;						\
 	CB += SIZEOF(seq_num);							\
 	/* Initialize "strm_seqno" */						\
-	UNIX_ONLY(assert(IS_VALID_STRM_SEQNO(STRM_SEQNO));)			\
-	UNIX_ONLY(*(seq_num *)(CB) = STRM_SEQNO;)				\
-	VMS_ONLY(assert(0 == STRM_SEQNO));					\
-	VMS_ONLY(*(seq_num *)(CB) = 0;)						\
+	assert(IS_VALID_STRM_SEQNO(STRM_SEQNO));				\
+	*(seq_num *)(CB) = STRM_SEQNO;						\
 	CB += SIZEOF(seq_num);							\
 	/* Skip the filler */							\
 	CB += SIZEOF(uint4);							\
@@ -412,30 +402,32 @@ enum
 
 GBLDEF	intlfltr_t repl_filter_cur2old[JNL_VER_THIS - JNL_VER_EARLIEST_REPL + 1] =
 {
-	IF_24TO17,	/* Convert from filter format V24 to V17 (i.e., from jnl ver V26 to V17) */
-	IF_24TO17,	/* Convert from filter format V24 to V17 (i.e., from jnl ver V26 to V18) */
-	IF_24TO19,	/* Convert from filter format V24 to V19 (i.e., from jnl ver V26 to V19) */
-	IF_24TO19,	/* Convert from filter format V24 to V19 (i.e., from jnl ver V26 to V20) */
-	IF_24TO21,	/* Convert from filter format V24 to V21 (i.e., from jnl ver V26 to V21) */
-	IF_24TO22,	/* Convert from filter format V24 to V22 (i.e., from jnl ver V26 to V22) */
-	IF_24TO22,	/* Convert from filter format V24 to V22 (i.e., from jnl ver V26 to V23) */
-	IF_24TO24,	/* Convert from filter format V24 to V24 (i.e., from jnl ver V26 to V24) */
-	IF_24TO24,	/* Convert from filter format V24 to V24 (i.e., from jnl ver V26 to V25) */
-	IF_24TO24	/* Convert from filter format V24 to V24 (i.e., from jnl ver V26 to V26) */
+	IF_24TO17,	/* Convert from filter format V24 to V17 (i.e., from jnl ver V27 to V17) */
+	IF_24TO17,	/* Convert from filter format V24 to V17 (i.e., from jnl ver V27 to V18) */
+	IF_24TO19,	/* Convert from filter format V24 to V19 (i.e., from jnl ver V27 to V19) */
+	IF_24TO19,	/* Convert from filter format V24 to V19 (i.e., from jnl ver V27 to V20) */
+	IF_24TO21,	/* Convert from filter format V24 to V21 (i.e., from jnl ver V27 to V21) */
+	IF_24TO22,	/* Convert from filter format V24 to V22 (i.e., from jnl ver V27 to V22) */
+	IF_24TO22,	/* Convert from filter format V24 to V22 (i.e., from jnl ver V27 to V23) */
+	IF_24TO24,	/* Convert from filter format V24 to V24 (i.e., from jnl ver V27 to V24) */
+	IF_24TO24,	/* Convert from filter format V24 to V24 (i.e., from jnl ver V27 to V25) */
+	IF_24TO24,	/* Convert from filter format V24 to V24 (i.e., from jnl ver V27 to V26) */
+	IF_24TO24	/* Convert from filter format V24 to V24 (i.e., from jnl ver V27 to V27) */
 };
 
 GBLDEF	intlfltr_t repl_filter_old2cur[JNL_VER_THIS - JNL_VER_EARLIEST_REPL + 1] =
 {
-	IF_17TO24,	/* Convert from filter format V17 to V24 (i.e., from jnl ver V17 to V26) */
-	IF_17TO24,	/* Convert from filter format V17 to V24 (i.e., from jnl ver V18 to V26) */
-	IF_19TO24,	/* Convert from filter format V19 to V24 (i.e., from jnl ver V19 to V26) */
-	IF_19TO24,	/* Convert from filter format V19 to V24 (i.e., from jnl ver V20 to V26) */
-	IF_21TO24,	/* Convert from filter format V21 to V24 (i.e., from jnl ver V21 to V26) */
-	IF_22TO24,	/* Convert from filter format V22 to V24 (i.e., from jnl ver V22 to V26) */
-	IF_22TO24,	/* Convert from filter format V22 to V24 (i.e., from jnl ver V23 to V26) */
-	IF_24TO24,	/* Convert from filter format V24 to V24 (i.e., from jnl ver V24 to V26) */
-	IF_24TO24,	/* Convert from filter format V24 to V24 (i.e., from jnl ver V25 to V26) */
-	IF_24TO24	/* Convert from filter format V24 to V24 (i.e., from jnl ver V25 to V26) */
+	IF_17TO24,	/* Convert from filter format V17 to V24 (i.e., from jnl ver V17 to V27) */
+	IF_17TO24,	/* Convert from filter format V17 to V24 (i.e., from jnl ver V18 to V27) */
+	IF_19TO24,	/* Convert from filter format V19 to V24 (i.e., from jnl ver V19 to V27) */
+	IF_19TO24,	/* Convert from filter format V19 to V24 (i.e., from jnl ver V20 to V27) */
+	IF_21TO24,	/* Convert from filter format V21 to V24 (i.e., from jnl ver V21 to V27) */
+	IF_22TO24,	/* Convert from filter format V22 to V24 (i.e., from jnl ver V22 to V27) */
+	IF_22TO24,	/* Convert from filter format V22 to V24 (i.e., from jnl ver V23 to V27) */
+	IF_24TO24,	/* Convert from filter format V24 to V24 (i.e., from jnl ver V24 to V27) */
+	IF_24TO24,	/* Convert from filter format V24 to V24 (i.e., from jnl ver V25 to V27) */
+	IF_24TO24,	/* Convert from filter format V24 to V24 (i.e., from jnl ver V26 to V27) */
+	IF_24TO24	/* Convert from filter format V24 to V24 (i.e., from jnl ver V27 to V27) */
 };
 
 GBLREF	unsigned int		jnl_source_datalen, jnl_dest_maxdatalen;
@@ -446,9 +438,7 @@ GBLREF	gv_key			*gv_currkey, *gv_altkey; /* for jnl_extr_init() */
 GBLREF	uchar_ptr_t		repl_filter_buff;
 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;
-#endif
 GBLREF	uint4			process_id;
 GBLREF	boolean_t		err_same_as_out;
 GBLREF	volatile boolean_t	timer_in_handler;
@@ -481,7 +471,6 @@ static struct_jrec_null	null_jnlrec;
 static seq_num		save_jnl_seqno;
 static seq_num		save_strm_seqno;
 static boolean_t	is_nontp, is_null, select_valid;
-VMS_ONLY(int decc$set_child_standard_streams(int, int, int);)
 
 void jnl_extr_init(void)
 {
@@ -489,7 +478,7 @@ void jnl_extr_init(void)
 
 	SETUP_THREADGBL_ACCESS;
 	/* Should be a non-filter related function. But for now,... Needs GBLREFs gv_currkey and transform */
-	TREF(transform) = FALSE;      /* to avoid SIG-11 in "mval2subsc" as it expects gv_target to be set up and we dont set it */
+	TREF(transform) = FALSE;      /* to avoid SIG-11 in "mval2subsc" as it expects gv_target to be set up and we don't set it */
 	GVKEYSIZE_INIT_IF_NEEDED;
 }
 
@@ -567,16 +556,13 @@ int repl_filter_init(char *filter_cmd)
 		REPL_DPRINT2("Filter argc %d\n", index);
 	}
 	)
-	UNIX_ONLY(FORK(repl_filter_pid);)
-	VMS_ONLY(repl_filter_pid = vfork();)
+	FORK(repl_filter_pid);
 	if (0 < repl_filter_pid)
 	{	/* Server */
-		UNIX_ONLY(
-			F_CLOSE(repl_srv_filter_fd[READ_END], close_res); /* SERVER: WRITE only on server -> filter pipe;
+		F_CLOSE(repl_srv_filter_fd[READ_END], close_res); /* SERVER: WRITE only on server -> filter pipe;
 								* also resets "repl_srv_filter_fd[READ_END]" to FD_INVALID */
-			F_CLOSE(repl_filter_srv_fd[WRITE_END], close_res); /* SERVER: READ only on filter -> server pipe;
+		F_CLOSE(repl_filter_srv_fd[WRITE_END], close_res); /* SERVER: READ only on filter -> server pipe;
 								* also resets "repl_srv_filter_fd[WRITE_END]" to FD_INVALID */
-		)
 		/* Make sure the write-end of the pipe is set to non-blocking. This will make sure repl_filter_send gets a
 		 * EAGAIN error in case the write side of the pipe is full and waiting for the filter process to read it.
 		 * In that case, we need to switch to reading to see if the filter process has sent any data to process.
@@ -616,35 +602,24 @@ int repl_filter_init(char *filter_cmd)
 	}
 	if (0 == repl_filter_pid)
 	{	/* Filter */
-		UNIX_ONLY(
-			F_CLOSE(repl_srv_filter_fd[WRITE_END], close_res); /* FILTER: READ only on server -> filter pipe;
-								* also resets "repl_srv_filter_fd[WRITE_END]" to FD_INVALID */
-			F_CLOSE(repl_filter_srv_fd[READ_END], close_res); /* FILTER: WRITE only on filter -> server pipe;
-								* also resets "repl_srv_filter_fd[READ_END]" to FD_INVALID */
-			/* Make the server->filter pipe stdin for filter */
-			DUP2(repl_srv_filter_fd[READ_END], 0, status);
-			assertpro(0 <= status);
-			/* Make the filter->server pipe stdout for filter */
-			DUP2(repl_filter_srv_fd[WRITE_END], 1, status);
-			assertpro(0 <= status);
-		)
-		VMS_ONLY(decc$set_child_standard_streams(repl_srv_filter_fd[READ_END], repl_filter_srv_fd[WRITE_END], -1));
+		F_CLOSE(repl_srv_filter_fd[WRITE_END], close_res); /* FILTER: READ only on server -> filter pipe;
+							* also resets "repl_srv_filter_fd[WRITE_END]" to FD_INVALID */
+		F_CLOSE(repl_filter_srv_fd[READ_END], close_res); /* FILTER: WRITE only on filter -> server pipe;
+							* also resets "repl_srv_filter_fd[READ_END]" to FD_INVALID */
+		/* Make the server->filter pipe stdin for filter */
+		DUP2(repl_srv_filter_fd[READ_END], 0, status);
+		assertpro(0 <= status);
+		/* Make the filter->server pipe stdout for filter */
+		DUP2(repl_filter_srv_fd[WRITE_END], 1, status);
+		assertpro(0 <= status);
 		/* Start the filter */
 		if (0 > EXECV(argv[0], argv))
 		{	/* exec error, close all pipe fds */
 			repl_filter_close_all_pipes();
-			VMS_ONLY(
-				/* For vfork, there is no real child process. So, both ends of both the pipes have to be closed */
-				F_CLOSE(repl_srv_filter_fd[WRITE_END], close_res);
-					/* resets "repl_srv_filter_fd[WRITE_END]" to FD_INVALID */
-				F_CLOSE(repl_filter_srv_fd[READ_END], close_res);
-					/* resets "repl_filter_srv_fd[READ_END]" to FD_INVALID */
-			)
 			gtm_putmsg_csa(CSA_ARG(NULL) VARLSTCNT(7) ERR_REPLFILTER, 0, ERR_TEXT, 2,
 					RTS_ERROR_LITERAL("Could not exec filter"), ERRNO);
 			repl_errno = EREPL_FILTERSTART_EXEC;
-			UNIX_ONLY(UNDERSCORE_EXIT(FILTERSTART_ERR);)
-			VMS_ONLY(return(FILTERSTART_ERR);) /* maintain existing for VMS */
+			UNDERSCORE_EXIT(FILTERSTART_ERR);
 		}
 	} else
 	{	/* Error in fork */
@@ -809,7 +784,6 @@ STATICFNDEF int repl_filter_recv_line(char *line, int *line_len, int max_line_le
 					break;
 				}
 			}
-#			ifdef UNIX
 			/* Before starting the `read', note down the current heartbeat counter. This is used to break from the
 			 * read if the filter program takes too long to send records back to us. Do it only if send_done is TRUE
 			 * which indicates the end of a mini-transaction or a commit record for an actual transaction.
@@ -856,11 +830,6 @@ STATICFNDEF int repl_filter_recv_line(char *line, int *line_len, int max_line_le
 			} 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))
-				;
-#			endif
 			if (0 < r_len) /* successful read */
 			{
 				/* if send is not done then need to do select/poll if we try read again */
@@ -1202,16 +1171,15 @@ void repl_filter_error(seq_num filter_seqno, int why)
  * Check for (b) is not needed if the source server is VMS since cross-endian replication does not happen on VMS. In such a case,
  * the receiver server will do the appropriate check and shutdown replication if needed.
  */
-void repl_check_jnlver_compat(UNIX_ONLY(boolean_t same_endianness))
+void repl_check_jnlver_compat(boolean_t same_endianness)
 {	/* see comment in repl_filter.h about list of filter-formats, jnl-formats and GT.M versions */
-	UNIX_ONLY(const char	*other_side;)
+	const char	*other_side;
 
 	assert(is_src_server || is_rcvr_server);
 	assert(JNL_VER_EARLIEST_REPL <= REMOTE_JNL_VER);
 	if (JNL_VER_EARLIEST_REPL > REMOTE_JNL_VER)
 		rts_error_csa(CSA_ARG(NULL) VARLSTCNT(6) ERR_UNIMPLOP, 0, ERR_TEXT, 2,
 			LEN_AND_LIT("Dual/Multi site replication not supported between these two GT.M versions"));
-#	ifdef UNIX
 	else if ((V18_JNL_VER > REMOTE_JNL_VER) && !same_endianness)
 	{	/* cross-endian replication is supported only from V5.3-003 onwards. Issue error and shutdown. */
 		if (is_src_server)
@@ -1223,7 +1191,6 @@ void repl_check_jnlver_compat(UNIX_ONLY(boolean_t same_endianness))
 			assertpro(is_src_server || is_rcvr_server);
 		rts_error_csa(CSA_ARG(NULL) VARLSTCNT(6) ERR_REPLNOXENDIAN, 4, LEN_AND_STR(other_side), LEN_AND_STR(other_side));
 	}
-#	endif
 }
 
 /* The following code defines the functions that convert one jnl format to another.
@@ -1314,7 +1281,7 @@ void repl_check_jnlver_compat(UNIX_ONLY(boolean_t same_endianness))
  *	This means, we need to have 8 more bytes in the conversion buffer for NULL type of records.
  * (d) If the null collation is different between primary and secondary (null_subs_xform) then appropriate conversion
  *     is needed
- * (e) Note that V17 did not support triggers so dont need to check for ^#t or ZTRIG or ZTWORM or LGTRIG records.
+ * (e) Note that V17 did not support triggers so don't need to check for ^#t or ZTRIG or ZTWORM or LGTRIG records.
  * Reformat accordingly.
  */
 int jnl_v17TOv24(uchar_ptr_t jnl_buff, uint4 *jnl_len, uchar_ptr_t conv_buff, uint4 *conv_len, uint4 conv_bufsiz)
@@ -1584,7 +1551,7 @@ int jnl_v24TOv17(uchar_ptr_t jnl_buff, uint4 *jnl_len, uchar_ptr_t conv_buff, ui
  * (a) struct_jrec_upd, struct_jrec_tcom and struct_jrec_null in V24 is 8 bytes more than V19 (8 byte strm_seqno).
  *	This means, we need to have 8 more bytes in the conversion buffer for NULL/TCOM/SET/KILL/ZKILL type of records.
  * (b) If the receiver side does NOT support triggers, then skip ^#t/ZTWORM journal records & reset nodeflags (if set).
- *	Note that V19 did not support ZTRIG or LGTRIG records so dont need to check for them.
+ *	Note that V19 did not support ZTRIG or LGTRIG records so don't need to check for them.
  *	If the entire transaction consists of skipped records, send a NULL record instead.
  * (c) If receiver side does support triggers, then issue error if ^#t records are found as those are not allowed in
  *	the replication stream from V62001 onwards.
@@ -1967,7 +1934,7 @@ int jnl_v24TOv19(uchar_ptr_t jnl_buff, uint4 *jnl_len, uchar_ptr_t conv_buff, ui
  * (a) struct_jrec_upd, struct_jrec_tcom and struct_jrec_null in V24 is 8 bytes more than V21 due to 8 byte strm_seqno.
  *	This means, we need to have 8 more bytes in the conversion buffer for NULL/TCOM/SET/KILL/ZKILL/ZTRIG type of records.
  * (b) If the receiver side does NOT support triggers, then skip ^#t/ZTWORM/ZTRIG journal records & reset nodeflags (if set).
- *	Note that V21 did not support LGTRIG records so dont need to check for them.
+ *	Note that V21 did not support LGTRIG records so don't need to check for them.
  *	If the entire transaction consists of skipped records, send a NULL record instead.
  * (c) If receiver side does support triggers, then issue error if ^#t records are found as those are not allowed in
  *	the replication stream from V62001 onwards.
@@ -2352,7 +2319,7 @@ int jnl_v24TOv21(uchar_ptr_t jnl_buff, uint4 *jnl_len, uchar_ptr_t conv_buff, ui
 /* Convert a transaction from jnl version V22/V23 (V5.5-000 thru V6.1-000) to V24 (V6.2-000 onwards).
  * (a) If null-subscript collation is different between the primary and the secondary
  * (b) If the remote side does NOT support triggers, then skip ^#t/ZTWORM/ZTRIG journal records & reset nodeflags (if set).
- *	Note that V22 did not support LGTRIG records so dont need to check for them.
+ *	Note that V22 did not support LGTRIG records so don't need to check for them.
  * (c) If the entire transaction consists of skipped records, send a NULL record instead.
  * (d) If receiver side does support triggers, then issue error if ^#t records are found as those are not allowed in
  *	the replication stream from V62001 onwards.
@@ -2734,7 +2701,7 @@ int jnl_v24TOv24(uchar_ptr_t jnl_buff, uint4 *jnl_len, uchar_ptr_t conv_buff, ui
 	assert(is_src_server || is_rcvr_server);
 	receiver_supports_triggers = (is_src_server ? REMOTE_TRIGGER_SUPPORT : LOCAL_TRIGGER_SUPPORT);
 	GTMTRIG_ONLY(assert(receiver_supports_triggers);)	/* if receiver is V24 format, it should have been built
-								 * with trigger support enabled since we dont either build
+								 * with trigger support enabled since we don't either build
 								 * anymore OR replicate anymore to trigger unsupported platforms
 								 * (HPPA/Tru64/VMS) from trigger-supporting Unix platforms.
 								 */
diff --git a/sr_port/repl_filter.h b/sr_port/repl_filter.h
old mode 100755
new mode 100644
index 5958fb6..9a94e89
--- a/sr_port/repl_filter.h
+++ b/sr_port/repl_filter.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	*
@@ -23,12 +23,8 @@
 /* Define the maximum jnl extract byte length of ONE line of journal extract.
  * Note that for a TP transaction that has N updates, the journal extract length needed at most is N times this value.
  */
-#ifdef UNIX
-#  define MAX_ONE_JREC_EXTRACT_BUFSIZ		10 * MAX_LOGI_JNL_REC_SIZE	/* Since we might need up to 9X + 11
-										 * of MAX_LOGI_JNL_REC_SIZE */
-#else
-#  define MAX_ONE_JREC_EXTRACT_BUFSIZ		1 * 1024 * 1024
-#endif
+#define MAX_ONE_JREC_EXTRACT_BUFSIZ	10 * MAX_LOGI_JNL_REC_SIZE	/* Since we might need up to 9X + 11
+									 * of MAX_LOGI_JNL_REC_SIZE */
 
 #define	JNL2EXTCVT_EXPAND_FACTOR	2  /* # of max-sized journal records by which jnl2extcvt expands buffer if not enough */
 #define	EXT2JNLCVT_EXPAND_FACTOR	8  /* # of max-sized journal records by which ext2jnlcvt expands buffer if not enough */
@@ -72,6 +68,9 @@ typedef int (*intlfltr_t)(uchar_ptr_t, uint4 *, uchar_ptr_t, uint4 *, uint4);
  *	V24	V24	GT.M V6.2-000	New logical trigger journal record (TLGTRIG and ULGTRIG jnl records)
  *	V24	V25	GT.M V6.2-001	No new jnl record but bump needed to replicate logical trigger jnl records (GTM-7509)
  *	V24	V26	GT.M V6.2-002	No new jnl record but bump needed because of different encryption method
+ *	V24	V27	GT.M V6.3-001	JRT_ALIGN record size reduced from min of 32 bytes to min of 16 bytes.
+ *					The extract format though did not change as we extract a 0 tn now in -detial extract.
+ *					The filter format did not change because ALIGN record is not replicated.
  */
 
 typedef enum
@@ -97,6 +96,7 @@ typedef enum
 	REPL_JNL_V24,		/* enum corresponding to journal format V24 */
 	REPL_JNL_V25,		/* enum corresponding to journal format V25 */
 	REPL_JNL_V26,		/* enum corresponding to journal format V26 */
+	REPL_JNL_V27,		/* enum corresponding to journal format V27 */
 	REPL_JNL_MAX
 } repl_jnl_t;
 
@@ -122,7 +122,7 @@ extern int jnl_v24TOv22(uchar_ptr_t jnl_buff, uint4 *jnl_len, uchar_ptr_t conv_b
 extern int jnl_v22TOv24(uchar_ptr_t jnl_buff, uint4 *jnl_len, uchar_ptr_t conv_buff, uint4 *conv_len, uint4 conv_bufsiz);
 extern int jnl_v24TOv24(uchar_ptr_t jnl_buff, uint4 *jnl_len, uchar_ptr_t conv_buff, uint4 *conv_len, uint4 conv_bufsiz);
 
-extern void repl_check_jnlver_compat(UNIX_ONLY(boolean_t same_endianness));
+extern void repl_check_jnlver_compat(boolean_t same_endianness);
 
 GBLREF	intlfltr_t repl_filter_old2cur[JNL_VER_THIS - JNL_VER_EARLIEST_REPL + 1];
 GBLREF	intlfltr_t repl_filter_cur2old[JNL_VER_THIS - JNL_VER_EARLIEST_REPL + 1];
@@ -165,6 +165,7 @@ GBLREF	intlfltr_t repl_filter_cur2old[JNL_VER_THIS - JNL_VER_EARLIEST_REPL + 1];
 #define V24_JNL_VER		24
 #define V25_JNL_VER		25
 #define V26_JNL_VER		26
+#define V27_JNL_VER		27
 
 #define	V17_NULL_RECLEN		40	/* size of a JRT_NULL record in V17/V18 jnl format */
 #define	V19_NULL_RECLEN		40	/* size of a JRT_NULL record in V19/V20 jnl format */
@@ -195,23 +196,12 @@ STATICFNDCL int repl_filter_recv_line(char *line, int *line_len, int max_line_le
 int repl_stop_filter(void);
 void repl_filter_error(seq_num filter_seqno, int why);
 
-# ifdef UNIX
-#	define	LOCAL_JNL_VER		this_side->jnl_ver
-#	define	LOCAL_TRIGGER_SUPPORT	this_side->trigger_supported
-#	define	REMOTE_JNL_VER		remote_side->jnl_ver
-#	define	REMOTE_TRIGGER_SUPPORT	remote_side->trigger_supported
-#	define	REMOTE_NULL_SUBS_XFORM	remote_side->null_subs_xform
-#	define	REMOTE_IS_CROSS_ENDIAN	remote_side->cross_endian
-# else
-	GBLREF	unsigned char		jnl_ver, remote_jnl_ver;
-	GBLREF	boolean_t		secondary_side_trigger_support;
-#	define	LOCAL_JNL_VER		jnl_ver
-#	define	LOCAL_TRIGGER_SUPPORT	secondary_side_trigger_support
-#	define	REMOTE_JNL_VER		remote_jnl_ver
-#	define	REMOTE_TRIGGER_SUPPORT	secondary_side_trigger_support
-#	define	REMOTE_NULL_SUBS_XFORM	(TREF(replgbl)).null_subs_xform
-#	define	REMOTE_IS_CROSS_ENDIAN	FALSE
-# endif
+#define	LOCAL_JNL_VER		this_side->jnl_ver
+#define	LOCAL_TRIGGER_SUPPORT	this_side->trigger_supported
+#define	REMOTE_JNL_VER		remote_side->jnl_ver
+#define	REMOTE_TRIGGER_SUPPORT	remote_side->trigger_supported
+#define	REMOTE_NULL_SUBS_XFORM	remote_side->null_subs_xform
+#define	REMOTE_IS_CROSS_ENDIAN	remote_side->cross_endian
 
 /* Helper macros for internal and external filters */
 #define APPLY_EXT_FILTER_IF_NEEDED(GTMSOURCE_FILTER, GTMSOURCE_MSGP, DATA_LEN, TOT_TR_LEN)					\
@@ -266,7 +256,6 @@ error_def(ERR_REPLRECFMT);
 error_def(ERR_REPLGBL2LONG);
 error_def(ERR_REPLNOHASHTREC);
 
-#ifdef UNIX
 # define INT_FILTER_RTS_ERROR(FILTER_SEQNO, REPL_ERRNO)										\
 {																\
 	assert((EREPL_INTLFILTER_BADREC == REPL_ERRNO)										\
@@ -284,15 +273,4 @@ error_def(ERR_REPLNOHASHTREC);
 	else	/* (EREPL_INTLFILTER_INCMPLREC == REPL_ERRNO) */								\
 		assertpro(FALSE);												\
 }
-#else
-# define INT_FILTER_RTS_ERROR(FILTER_SEQNO)					\
-{										\
-	if (EREPL_INTLFILTER_BADREC == repl_errno)				\
-		rts_error_csa(CSA_ARG(NULL) VARLSTCNT(1) ERR_REPLRECFMT);	\
-	else if (EREPL_INTLFILTER_REPLGBL2LONG == repl_errno)			\
-		rts_error_csa(CSA_ARG(NULL) VARLSTCNT(1) ERR_REPLGBL2LONG);	\
-	else	/* (EREPL_INTLFILTER_INCMPLREC == repl_errno) */		\
-		assertpro(FALSE);						\
-}
-#endif
 #endif
diff --git a/sr_port/repl_phase2_cleanup.c b/sr_port/repl_phase2_cleanup.c
new file mode 100644
index 0000000..880cb3d
--- /dev/null
+++ b/sr_port/repl_phase2_cleanup.c
@@ -0,0 +1,166 @@
+/****************************************************************
+ *								*
+ * 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 "gdsroot.h"
+#include "gtm_facility.h"
+#include "fileinfo.h"
+#include "gdsbt.h"
+#include "gdsfhead.h"
+#include "filestruct.h"
+#include "gdscc.h"
+#include "jnl.h"
+#include "repl_msg.h"
+#include "gtmsource.h"
+#include "memcoherency.h"
+#include "interlock.h"
+#include "is_proc_alive.h"
+
+GBLREF	uint4		process_id;
+
+#define	PHASE2_COMMIT_ARRAY_ITERATE_UNTIL_WRITE_COMPLETE_FALSE(csa, phs2cmt, maxCmt, currWriteaddr)	\
+MBSTART {												\
+	DEBUG_ONLY(qw_off_t	start_write_addr;)							\
+													\
+	assert(phs2cmt < maxCmt);									\
+	do												\
+	{												\
+		if (!phs2cmt->write_complete)								\
+			break;										\
+		DEBUG_ONLY(currWriteaddr += phs2cmt->tot_jrec_len;)					\
+		phs2cmt++;										\
+		if (phs2cmt == maxCmt)									\
+			break;										\
+		DEBUG_ONLY(start_write_addr = phs2cmt->start_write_addr;)				\
+		assert(currWriteaddr == start_write_addr);						\
+	} while (TRUE);											\
+} MBEND
+
+/* The below code is very similar to "jnl_phase2_cleanup" */
+void	repl_phase2_cleanup(jnlpool_addrs *jpa)
+{
+	sgmnt_addrs		*csa;
+	qw_off_t		currWriteaddr, newWriteaddr;
+	uint4			stuckPid;
+	int			index1, index2;
+	jpl_phase2_in_prog_t	*phs2cmt, *deadCmt, *begCmt, *maxCmt, *topCmt;
+	jnlpool_ctl_ptr_t	jpl;
+	boolean_t		was_latch_owner;
+
+	csa = &FILE_INFO(jpa->jnlpool_dummy_reg)->s_addrs;
+	jpl = jpa->jnlpool_ctl;
+	/* It is possible we already own the latch in case we are in timer-interrupt or process-exit code hence the below check */
+	was_latch_owner = GLOBAL_LATCH_HELD_BY_US(&jpl->phase2_commit_latch);
+	if (!was_latch_owner)
+	{	/* Return value of "grab_latch" does not need to be checked because we pass GRAB_LATCH_INDEFINITE_WAIT as timeout */
+		grab_latch(&jpl->phase2_commit_latch, GRAB_LATCH_INDEFINITE_WAIT);
+	}
+	index1 = jpl->phase2_commit_index1;
+	ASSERT_JNL_PHASE2_COMMIT_INDEX_IS_VALID(index1, JPL_PHASE2_COMMIT_ARRAY_SIZE);
+	index2 = jpl->phase2_commit_index2;
+	SHM_READ_MEMORY_BARRIER;	/* see corresponding SHM_WRITE_MEMORY_BARRIER in UPDATE_JPL_RSRV_WRITE_ADDR macro */
+	ASSERT_JNL_PHASE2_COMMIT_INDEX_IS_VALID(index2, JPL_PHASE2_COMMIT_ARRAY_SIZE);
+	phs2cmt = &jpl->phase2_commit_array[index1];
+	if (index1 != index2)
+	{
+		if (!phs2cmt->write_complete && csa->now_crit)
+		{	/* "repl_phase2_write" not complete in earliest phase2 entry. Since that is blocking us in crit,
+			 * check if the pid is alive. If not, cleanup. If you find the first blocking pid is dead, check
+			 * the next few pids too until an alive pid or phase2-complete entry shows up.
+			 */
+			deadCmt = phs2cmt;
+			assert(deadCmt->start_write_addr == jpl->write_addr);
+			if (index1 < index2)
+				maxCmt = &jpl->phase2_commit_array[index2];
+			else
+				maxCmt = &jpl->phase2_commit_array[JPL_PHASE2_COMMIT_ARRAY_SIZE];
+			assert(deadCmt < maxCmt);
+			do
+			{
+				if (deadCmt->write_complete)
+					break;
+				stuckPid = deadCmt->process_id;
+				/* Note that we can get stuck while inside "jnl_pool_write" in phase2 of commit
+				 * waiting for phase2 commit gaps in jnlpool to close enough to let us proceed with
+				 * our phase2 commit. In that case we can find our pid entry here. If so "break".
+				 */
+				if (stuckPid == process_id)
+					break;
+				JPL_TRACE_PRO(jpl, repl_phase2_cleanup_isprcalv);
+				if (is_proc_alive(stuckPid, 0))
+					break;
+				repl_phase2_salvage(jpa, jpl, deadCmt);
+				assert(deadCmt->write_complete);
+			} while (++deadCmt < maxCmt);
+			/* If "(deadCmt == maxCmt) && (index < index2)", we do not wrap around and search for dead pids in
+			 * the beginning of the array. Instead the next call to "repl_phase2_cleanup" will take care of
+			 * cleaning that section IF there are any deadCmt entries.
+			 */
+		}
+		if (phs2cmt->write_complete)
+		{	/* There is at least one phase2 that is complete and can be cleaned up */
+			DEBUG_ONLY(currWriteaddr = jpl->write_addr);
+			assert(currWriteaddr == phs2cmt->start_write_addr);
+			begCmt = &jpl->phase2_commit_array[0];
+			if (index1 < index2)
+			{	/* Easier case. No wrapping needed. */
+				maxCmt = &jpl->phase2_commit_array[index2];
+				assert(begCmt < maxCmt);
+				PHASE2_COMMIT_ARRAY_ITERATE_UNTIL_WRITE_COMPLETE_FALSE(csa, phs2cmt, maxCmt, currWriteaddr);
+				index1 = phs2cmt - begCmt;
+			} else
+			{
+				maxCmt = topCmt = &jpl->phase2_commit_array[JPL_PHASE2_COMMIT_ARRAY_SIZE];
+				PHASE2_COMMIT_ARRAY_ITERATE_UNTIL_WRITE_COMPLETE_FALSE(csa, phs2cmt, maxCmt, currWriteaddr);
+				if (phs2cmt == maxCmt)
+				{	/* Wrap around and search again */
+					if (index2)
+					{
+						phs2cmt = begCmt;
+						maxCmt = &jpl->phase2_commit_array[index2];
+						assert(currWriteaddr == phs2cmt->start_write_addr);
+						PHASE2_COMMIT_ARRAY_ITERATE_UNTIL_WRITE_COMPLETE_FALSE(csa, phs2cmt,	\
+												maxCmt, currWriteaddr);
+					}
+					index1 = ((phs2cmt == maxCmt) ? index2 : (phs2cmt - begCmt));
+				} else
+					index1 = phs2cmt - begCmt;
+			}
+			if (phs2cmt < maxCmt)
+				newWriteaddr = phs2cmt->start_write_addr;
+			else
+			{
+				assert(phs2cmt == maxCmt);
+				if (phs2cmt == begCmt)
+				{	/* i.e. phs2cmt == begCmt == maxCmt. That is, begCmt and maxCmt are equal.
+					 * Because of the "assert(begCmt < maxCmt)" assert in the "if (index1 < index2)" block
+					 * above, we are guaranteed, we did not go down that code-block. In the else block,
+					 * we did initialize topCmt so we can safely use that here.
+					 */
+					phs2cmt = topCmt;
+				}
+				phs2cmt--;
+				newWriteaddr = phs2cmt->start_write_addr + phs2cmt->tot_jrec_len;
+			}
+			assert((index1 == index2) || (newWriteaddr == jpl->phase2_commit_array[index1].start_write_addr));
+			SET_JPL_WRITE_ADDR(jpl, newWriteaddr);
+			ASSERT_JNL_PHASE2_COMMIT_INDEX_IS_VALID(index1, JPL_PHASE2_COMMIT_ARRAY_SIZE);
+			SHM_WRITE_MEMORY_BARRIER;
+			jpl->phase2_commit_index1 = index1;
+		}
+	}
+	if (!was_latch_owner)
+		rel_latch(&jpl->phase2_commit_latch);
+}
diff --git a/sr_port/repl_phase2_salvage.c b/sr_port/repl_phase2_salvage.c
new file mode 100644
index 0000000..eb7afab
--- /dev/null
+++ b/sr_port/repl_phase2_salvage.c
@@ -0,0 +1,99 @@
+/****************************************************************
+ *								*
+ * 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 "gdsroot.h"
+#include "gtm_facility.h"
+#include "fileinfo.h"
+#include "gdsbt.h"
+#include "gdsfhead.h"
+#include "filestruct.h"
+#include "gdscc.h"
+#include "jnl.h"
+#include "repl_msg.h"
+#include "gtmsource.h"
+#include "jnl_get_checksum.h"
+#ifdef DEBUG
+#include "is_proc_alive.h"
+#endif
+
+error_def(ERR_JNLPOOLPHS2SALVAGE);
+
+/* The below code is very similar to "jnl_phase2_salvage" except that this salvages jnl records in jnlpool */
+void	repl_phase2_salvage(jnlpool_addrs *jpa, jnlpool_ctl_ptr_t jpl, jpl_phase2_in_prog_t *deadCmt)
+{
+	struct_jrec_null	null_rec;
+	qw_off_t		start_write_addr, rsrv_write_addr;
+	uint4			jnlpool_size, write;
+	uint4			dstlen, rlen;
+	uchar_ptr_t		jnlrecptr;
+	jnldata_hdr_ptr_t	jnl_header;
+	sm_uc_ptr_t		jnldata_base;
+
+	assert(jpl == jpa->jnlpool_ctl);
+	assert((&FILE_INFO(jpa->jnlpool_dummy_reg)->s_addrs)->now_crit);
+	assert(!is_proc_alive(deadCmt->process_id, 0));
+	/* This commit entry was added by UPDATE_JPL_RSRV_WRITE_ADDR in t_end/tp_tend. Just like "jnl_phase2_salvage", we
+	 * replace the reserved space for logical journal records in the jnlpool with one JRT_NULL record. But unlike
+	 * "jnl_phase2_salvage", the rest of the reserved space is not filled with JRT_ALIGN records. Instead we just
+	 * fix the source server to check if the first record it read from the pool is a NULL record and if so ignore
+	 * everything else except the NULL record.
+	 */
+	assert(NULL_RECLEN <= deadCmt->tot_jrec_len);
+	start_write_addr = deadCmt->start_write_addr;
+	rsrv_write_addr = jpl->rsrv_write_addr;
+	assert(start_write_addr < rsrv_write_addr);
+	assert(deadCmt->jnl_seqno);
+	assert(FALSE == deadCmt->write_complete);
+	assert(deadCmt->tot_jrec_len <= (rsrv_write_addr - start_write_addr));
+	jnlpool_size = jpl->jnlpool_size;
+	if ((rsrv_write_addr - start_write_addr) <= jnlpool_size)
+	{	/* The reserved space for this seqno is still somewhere in the journal pool (has not yet overflown the pool).
+		 * So fill the space with a JRT_NULL record.
+		 */
+		send_msg_csa(CSA_ARG(NULL) VARLSTCNT(8) ERR_JNLPOOLPHS2SALVAGE, 6, deadCmt->process_id,
+			DB_LEN_STR(jpa->jnlpool_dummy_reg), &deadCmt->jnl_seqno, &start_write_addr, deadCmt->tot_jrec_len);
+		null_rec.prefix.jrec_type = JRT_NULL;
+		null_rec.prefix.forwptr = NULL_RECLEN;
+		null_rec.prefix.pini_addr = 0;			/* this field does not matter in replication */
+		null_rec.prefix.time = 0;			/* this field does not matter in replication */
+		null_rec.prefix.checksum = INIT_CHECKSUM_SEED;	/* this field does not matter in replication */
+		null_rec.prefix.tn = TN_INVALID;		/* this field does not matter in replication */
+		assert(deadCmt->jnl_seqno);
+		null_rec.jnl_seqno = deadCmt->jnl_seqno;
+		null_rec.strm_seqno = deadCmt->strm_seqno;
+		null_rec.filler = 0;
+		null_rec.suffix.backptr = NULL_RECLEN;
+		null_rec.suffix.suffix_code = JNL_REC_SUFFIX_CODE;
+		write = (start_write_addr % jnlpool_size);
+		jnldata_base = (sm_uc_ptr_t)jpl + JNLDATA_BASE_OFF; /* Cannot use jpa->jnldata_base as it might not be initialized
+								     * for online rollback (does not go through "jnlpool_init").
+								     */
+		jnl_header = (jnldata_hdr_ptr_t)(jnldata_base + write);
+		jnl_header->jnldata_len = deadCmt->tot_jrec_len;
+		jnl_header->prev_jnldata_len = deadCmt->prev_jrec_len;
+		write += SIZEOF(jnldata_hdr_struct);
+		dstlen = jnlpool_size - write;
+		rlen = NULL_RECLEN;
+		jnlrecptr = (uchar_ptr_t)&null_rec;
+		assert(rlen < jnlpool_size);
+		if (rlen <= dstlen)		/* dstlen & srclen >= rlen  (most frequent case) */
+			memcpy(jnldata_base + write, &null_rec, rlen);
+		else				/* dstlen < rlen <= jnlpool_size */
+		{
+			memcpy(jnldata_base + write, jnlrecptr, dstlen);
+			memcpy(jnldata_base, jnlrecptr + dstlen, rlen - dstlen);
+		}
+	}
+	deadCmt->write_complete = TRUE;	/* signal dead pid's jnl write is now complete */
+}
diff --git a/sr_port/repl_sort_tr_buff.c b/sr_port/repl_sort_tr_buff.c
index 657b299..553c355 100644
--- a/sr_port/repl_sort_tr_buff.c
+++ b/sr_port/repl_sort_tr_buff.c
@@ -1,6 +1,7 @@
 /****************************************************************
  *								*
- *	Copyright 2010, 2014 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	*
@@ -71,11 +72,11 @@ void repl_sort_tr_buff(uchar_ptr_t tr_buff, uint4 tr_bufflen)
 			return;
 		}
 	}
-	PRO_ONLY(
-		/* A single region TP transaction is always sorted. So, for pro, return without addition sorting */
-		if (1 == participants)
-			return;
-	)
+#	ifndef DEBUG
+	/* A single region TP transaction is always sorted. So, for pro, return without addition sorting */
+	if (1 == participants)
+		return;
+#	endif
 	already_sorted = TRUE;
 	num_records = cur_rec_idx = reg_idx = balanced = 0;
 	if (max_participants < participants)
@@ -85,7 +86,7 @@ void repl_sort_tr_buff(uchar_ptr_t tr_buff, uint4 tr_bufflen)
 		max_participants = participants;
 		reg_jrec_info_array = malloc(SIZEOF(reg_jrec_info_t) * max_participants);
 	}
-	while(JREC_PREFIX_SIZE <= tlen)
+	while (JREC_PREFIX_SIZE <= tlen)
 	{
 		assert(0 == ((UINTPTR_T)tb % SIZEOF(uint4)));
 		prefix = (jrec_prefix *)tb;
@@ -118,11 +119,9 @@ void repl_sort_tr_buff(uchar_ptr_t tr_buff, uint4 tr_bufflen)
 					reg_jrec_info_array[reg_idx - 1].end = (long)(tb - tr_buff);
 				reg_idx++;
 			}
-			DEBUG_ONLY(
-				/* update_num within a region SHOULD be sorted */
-				assert(prev_updnum_this_reg <= cur_updnum);
-				prev_updnum_this_reg = cur_updnum;
-			)
+			/* update_num within a region SHOULD be sorted */
+			assert(prev_updnum_this_reg <= cur_updnum);
+			DEBUG_ONLY(prev_updnum_this_reg = cur_updnum;)
 			prev_updnum = cur_updnum;
 		} else
 		{	/* TCOM records does not have update_num. */
diff --git a/sr_port/repl_tr_good.c b/sr_port/repl_tr_good.c
old mode 100755
new mode 100644
index 23fab47..aaa0dda
--- a/sr_port/repl_tr_good.c
+++ b/sr_port/repl_tr_good.c
@@ -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	*
@@ -42,7 +43,7 @@ boolean_t repl_tr_good(uchar_ptr_t tr, int tr_len, seq_num seqno)
 		reclen  = jrec->prefix.forwptr;
 		if (  !IS_VALID_RECTYPE(jrec)
 		    || !IS_REPLICATED(rectype)
-		    || (reclen < MIN_JNLREC_SIZE || reclen > tr_len)
+		    || ((MIN_JNLREC_SIZE > reclen) || reclen > tr_len)
 		    || !IS_VALID_LINKS(jrec)
 		    || !IS_VALID_SUFFIX(jrec))
 		{
diff --git a/sr_port/resolve_ref.c b/sr_port/resolve_ref.c
index 02a4480..816f2f3 100755
--- a/sr_port/resolve_ref.c
+++ b/sr_port/resolve_ref.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	*
@@ -62,11 +62,6 @@ int resolve_ref(int errknt)
 		{	/* OC_LIT --> OC_LITC wherever OC_LIT is actually used, i.e. not a dead end */
 			dqloop(&t_orig, exorder, curtrip)
 			{
-				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)
 				{	/* Do a few literal optimizations typically done later in alloc_reg. It's convenient to
 					 * check for OC_LIT parameters here, before we start sliding OC_LITC opcodes in the way.
@@ -102,6 +97,14 @@ int resolve_ref(int errknt)
 							continue;
 						}
 						break;
+					case OC_FNTEXT:
+						if (resolve_optimize(curtrip))	/* only deals with $TEXT(), but could do more */
+						{
+							curtrip = curtrip->exorder.bl;	/* Backup to rescan change to curtrip */
+							continue;
+						}	/* WARNING fallthrough*/
+					default:
+						break;
 				}
 				for (j = curtrip->operand, ref = curtrip; j < ARRAYTOP(ref->operand); )
 				{	/* Iterate over all parameters of the current triple */
diff --git a/sr_port/restrict.c b/sr_port/restrict.c
new file mode 100644
index 0000000..7a470e1
--- /dev/null
+++ b/sr_port/restrict.c
@@ -0,0 +1,187 @@
+/****************************************************************
+ *								*
+ * 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 <errno.h>
+#include <grp.h>
+
+#include "mdef.h"
+#include "gtmio.h"
+#include "gtm_common_defs.h"
+#include "gtm_stdio.h"
+#include "gtm_string.h"
+#include "gtm_limits.h"
+#include "gtm_strings.h"
+#include "gtm_malloc.h"
+#include "gtm_permissions.h"
+#include "send_msg.h"
+#include "restrict.h"
+
+#define RESTRICT_FILENAME		"restrict.txt"
+#define RESTRICT_BREAK			"BREAK"
+#define RESTRICT_ZBREAK			"ZBREAK"
+#define RESTRICT_ZEDIT			"ZEDIT"
+#define RESTRICT_ZSYSTEM		"ZSYSTEM"
+#define RESTRICT_PIPEOPEN		"PIPE_OPEN"
+#define RESTRICT_TRIGMOD		"TRIGGER_MOD"
+#define RESTRICT_CENABLE		"CENABLE"
+#define RESTRICT_DSE			"DSE"
+#define RESTRICT_DIRECT_MODE		"DIRECT_MODE"
+#define RESTRICT_ZCMDLINE		"ZCMDLINE"
+#define MAX_READ_SZ			1024	/* Restrict Mnemonic shouldn't exceed this limit */
+#define MAX_FACILITY_LEN		64
+#define MAX_GROUP_LEN			64
+#define STRINGIFY(S)			#S
+#define BOUNDED_FMT(LIMIT,TYPE)		"%" STRINGIFY(LIMIT) TYPE
+#define FACILITY_FMTSTR			BOUNDED_FMT(MAX_FACILITY_LEN, "[A-Za-z0-9_]")
+#define GROUP_FMTSTR			BOUNDED_FMT(MAX_GROUP_LEN, "[A-Za-z0-9_]")
+
+GBLDEF	struct restrict_facilities	restrictions;
+GBLDEF	boolean_t			restrict_initialized;
+
+#ifdef DEBUG
+GBLREF	boolean_t			gtm_dist_ok_to_use;
+#endif
+GBLREF	char				gtm_dist[GTM_PATH_MAX];
+
+error_def(ERR_RESTRICTSYNTAX);
+error_def(ERR_TEXT);
+
+void restrict_init(void)
+{
+	char		rfpath[GTM_PATH_MAX], linebuf[MAX_READ_SZ+1], *lbp, facility[MAX_FACILITY_LEN+1], group[MAX_GROUP_LEN];
+	int		save_errno, fields, status, lineno;
+	FILE		*rfp;
+	boolean_t	restrict_one, restrict_all = FALSE;
+	struct group	grp, *grpres;
+	char		*grpbuf = NULL;
+	size_t		grpbufsz;
+
+	assert(!restrict_initialized);
+	assert(gtm_dist_ok_to_use);
+	SNPRINTF(rfpath, GTM_PATH_MAX, "%s/%s", gtm_dist, RESTRICT_FILENAME);
+	if (-1 == ACCESS(rfpath, W_OK))
+	{	/* Write access implies no restrictions. Otherwise try reading the file for facilities to restrict. */
+		save_errno = errno;
+		if ((EACCES == save_errno) || (EROFS == save_errno))
+		{	/* The file exists, but we don't have write permissions. Try to read it to determine restricted facilities.
+			 * Other errors indicate that the file is unavailable for some reason not associated with permissions,
+			 * e.g. missing, so no restrictions.
+			 */
+			Fopen(rfp, rfpath, "r");
+			if (NULL == rfp)
+			{	/* Normally, this could mean that the file didn't exist, but since ACCESS() gave us either
+				 * EACCES or EROFS above, the file exists, and the current error means we have no read
+				 * access. No read access means restrict everything.
+				 */
+				restrict_all = TRUE;
+			} else
+			{	/* Read the file, line by line. */
+				lineno = 0;
+				do
+				{
+					FGETS_FILE(linebuf, MAX_READ_SZ, rfp, lbp);
+					if (NULL != lbp)
+					{
+						lineno++;
+						fields = SSCANF(linebuf, FACILITY_FMTSTR " : " GROUP_FMTSTR, facility, group);
+						if (0 == fields)
+							continue;	/* Ignore blank lines */
+						else if (1 == fields)
+							restrict_one = TRUE;
+						else if (2 == fields)
+						{
+							if (NULL == grpbuf)
+							{
+								SYSCONF(_SC_GETGR_R_SIZE_MAX, grpbufsz);
+								grpbuf = malloc(grpbufsz);
+							}
+							assert(NULL != grpbuf);
+							status = getgrnam_r(group, &grp, grpbuf, grpbufsz, &grpres);
+							if (0 == status)
+							{
+								if (NULL == grpres)
+								{	/* Treat error in group lookup as parse error. */
+									send_msg_csa(CSA_ARG(NULL) VARLSTCNT(9)
+											ERR_RESTRICTSYNTAX, 3,
+											LEN_AND_STR(rfpath), lineno, ERR_TEXT, 2,
+											LEN_AND_LIT("Unknown group"));
+									restrict_all = TRUE;
+									break;
+								} else if ((GETEGID() == grp.gr_gid) || GID_IN_GID_LIST(grp.gr_gid))
+									restrict_one = FALSE;
+								else
+									restrict_one = TRUE;
+							} else
+							{	/* Treat error in group lookup as parse error. */
+								send_msg_csa(CSA_ARG(NULL) VARLSTCNT(12) ERR_RESTRICTSYNTAX, 3,
+										LEN_AND_STR(rfpath), lineno, ERR_SYSCALL, 5,
+										RTS_ERROR_LITERAL("getgrnam_r"), CALLFROM, status);
+								restrict_all = TRUE;
+								break;
+							}
+						} else
+						{
+							restrict_all = TRUE;	/* Parse error - restrict everything */
+							break;
+						}
+
+						if (0 == STRNCASECMP(facility, RESTRICT_BREAK, SIZEOF(RESTRICT_BREAK)))
+							restrictions.break_op = restrict_one;
+						else if (0 == STRNCASECMP(facility, RESTRICT_ZBREAK, SIZEOF(RESTRICT_ZBREAK)))
+							restrictions.zbreak_op = restrict_one;
+						else if (0 == STRNCASECMP(facility, RESTRICT_ZEDIT, SIZEOF(RESTRICT_ZEDIT)))
+							restrictions.zedit_op = restrict_one;
+						else if (0 == STRNCASECMP(facility, RESTRICT_ZSYSTEM, SIZEOF(RESTRICT_ZSYSTEM)))
+							restrictions.zsystem_op = restrict_one;
+						else if (0 == STRNCASECMP(facility, RESTRICT_PIPEOPEN, SIZEOF(RESTRICT_PIPEOPEN)))
+							restrictions.pipe_open = restrict_one;
+						else if (0 == STRNCASECMP(facility, RESTRICT_TRIGMOD, SIZEOF(RESTRICT_TRIGMOD)))
+							restrictions.trigger_mod = restrict_one;
+						else if (0 == STRNCASECMP(facility, RESTRICT_CENABLE, SIZEOF(RESTRICT_CENABLE)))
+							restrictions.cenable = restrict_one;
+						else if (0 == STRNCASECMP(facility, RESTRICT_DSE, SIZEOF(RESTRICT_DSE)))
+							restrictions.dse = restrict_one;
+						else if (0 == STRNCASECMP(facility, RESTRICT_DIRECT_MODE,
+								SIZEOF(RESTRICT_DIRECT_MODE)))
+							restrictions.dmode = restrict_one;
+						else if (0 == STRNCASECMP(facility, RESTRICT_ZCMDLINE, SIZEOF(RESTRICT_ZCMDLINE)))
+							restrictions.zcmdline = restrict_one;
+						else
+						{	/* Parse error - restrict everything */
+							send_msg_csa(CSA_ARG(NULL) VARLSTCNT(5) ERR_RESTRICTSYNTAX, 3,
+									LEN_AND_STR(rfpath), lineno);
+							restrict_all = TRUE;
+							break;
+						}
+					}
+				} while (!restrict_all && !feof(rfp));
+				FCLOSE(rfp, status);
+				if (NULL != grpbuf)
+					free(grpbuf);
+			}
+		}
+		if (restrict_all)
+		{
+			restrictions.break_op = TRUE;
+			restrictions.zbreak_op = TRUE;
+			restrictions.zedit_op = TRUE;
+			restrictions.zsystem_op = TRUE;
+			restrictions.pipe_open = TRUE;
+			restrictions.trigger_mod = TRUE;
+			restrictions.cenable = TRUE;
+			restrictions.dse = TRUE;
+			restrictions.dmode = TRUE;
+			restrictions.zcmdline = TRUE;
+		}
+	}
+	restrict_initialized = TRUE;
+}
diff --git a/sr_port/restrict.h b/sr_port/restrict.h
new file mode 100644
index 0000000..0787ee0
--- /dev/null
+++ b/sr_port/restrict.h
@@ -0,0 +1,33 @@
+/****************************************************************
+ *								*
+ * 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.	*
+ *								*
+ ****************************************************************/
+
+#define RESTRICTED(FACILITY)											\
+		(!restrict_initialized ? (restrict_init(), restrictions.FACILITY) : restrictions.FACILITY)
+
+struct restrict_facilities
+{
+	boolean_t	break_op;
+	boolean_t	zbreak_op;
+	boolean_t	zedit_op;
+	boolean_t	zsystem_op;
+	boolean_t	pipe_open;
+	boolean_t	trigger_mod;
+	boolean_t	cenable;
+	boolean_t	dse;
+	boolean_t	dmode;
+	boolean_t	zcmdline;
+};
+
+GBLREF	struct restrict_facilities	restrictions;
+GBLREF	boolean_t			restrict_initialized;
+
+void restrict_init(void);
diff --git a/sr_port/sec_shr_blk_build.c b/sr_port/sec_shr_blk_build.c
old mode 100755
new mode 100644
index 7541149..08d2401
--- a/sr_port/sec_shr_blk_build.c
+++ b/sr_port/sec_shr_blk_build.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	*
@@ -22,41 +23,17 @@
 #include "gdscc.h"
 #include "min_max.h"		/* needed for gdsblkops.h */
 #include "gdsblkops.h"
-#include "probe.h"
-#if 	defined(__alpha) && defined(__VMS)
-#include "gtmsecshr.h"
-#endif
 #include "sec_shr_blk_build.h"
+#include "secshr_db_clnup.h"
 
 int sec_shr_blk_build(sgmnt_addrs *csa, sgmnt_data_ptr_t csd, boolean_t is_bg,
 			cw_set_element *cse, sm_uc_ptr_t base_addr, trans_num ctn)
 {
 	blk_segment	*seg, *stop_ptr, *array;
 	unsigned char	*ptr;
-	boolean_t	do_accounting;
 
 	array = (blk_segment *)cse->upd_addr;
 	assert(csa->read_write);
-	if (csa->now_crit)	/* csa->now_crit can be FALSE if we are finishing bg_update_phase2 part of the commit */
-		do_accounting = TRUE;	/* used by SECSHR_ACCOUNTING macro */
-	if (!(GTM_PROBE(SIZEOF(blk_segment), array, READ)))
-	{
-		SECSHR_ACCOUNTING(4);
-		SECSHR_ACCOUNTING(__LINE__);
-		SECSHR_ACCOUNTING((INTPTR_T)cse->upd_addr);
-		SECSHR_ACCOUNTING(SIZEOF(blk_segment));
-		assert(FALSE);
-		return FALSE;
-	}
-	if (!(GTM_PROBE(SIZEOF(blk_hdr), base_addr, WRITE)))
-	{
-		SECSHR_ACCOUNTING(4);
-		SECSHR_ACCOUNTING(__LINE__);
-		SECSHR_ACCOUNTING((INTPTR_T)base_addr);
-		SECSHR_ACCOUNTING(SIZEOF(blk_hdr));
-		assert(FALSE);
-		return FALSE;
-	}
 	/* block transaction number needs to be modified first. see comment in gvcst_blk_build as to why */
 	((blk_hdr_ptr_t)base_addr)->bver = GDSVCURR;
 	assert(csa->now_crit || (ctn < csd->trans_hist.curr_tn));
@@ -70,38 +47,8 @@ int sec_shr_blk_build(sgmnt_addrs *csa, sgmnt_data_ptr_t csd, boolean_t is_bg,
 		ptr = base_addr + SIZEOF(blk_hdr);
 		for (seg = array + 1, stop_ptr = (blk_segment *)array->addr;  seg <= stop_ptr;  seg++)
 		{
-			if (!(GTM_PROBE(SIZEOF(blk_segment), seg, READ)))
-			{
-				SECSHR_ACCOUNTING(4);
-				SECSHR_ACCOUNTING(__LINE__);
-				SECSHR_ACCOUNTING((INTPTR_T)seg);
-				SECSHR_ACCOUNTING(SIZEOF(blk_segment));
-				assert(FALSE);
-				return FALSE;
-			}
 			if (!seg->len)
-				continue;	/* GTM_PROBE on a zero length returns FALSE so check for it explicitly here */
-			if (!(GTM_PROBE(seg->len, seg->addr, READ)))
-			{
-				SECSHR_ACCOUNTING(5);
-				SECSHR_ACCOUNTING(__LINE__);
-				SECSHR_ACCOUNTING((INTPTR_T)seg);
-				SECSHR_ACCOUNTING((INTPTR_T)seg->addr);
-				SECSHR_ACCOUNTING(seg->len);
-				assert(FALSE);
-				return FALSE;
-			}
-			if (!(GTM_PROBE(seg->len, ptr, WRITE)))
-			{
-				SECSHR_ACCOUNTING(6);
-				SECSHR_ACCOUNTING(__LINE__);
-				SECSHR_ACCOUNTING((INTPTR_T)seg);
-				SECSHR_ACCOUNTING((INTPTR_T)ptr);
-				SECSHR_ACCOUNTING((INTPTR_T)seg->addr);
-				SECSHR_ACCOUNTING(seg->len);
-				assert(FALSE);
-				return FALSE;
-			}
+				continue;
 			DBG_BG_PHASE2_CHECK_CR_IS_PINNED(csa, seg);
 			memmove(ptr, seg->addr, seg->len);
 			ptr += seg->len;
@@ -111,39 +58,9 @@ int sec_shr_blk_build(sgmnt_addrs *csa, sgmnt_data_ptr_t csd, boolean_t is_bg,
 		ptr = base_addr + array->len;
 		for  (seg = (blk_segment*)array->addr, stop_ptr = array;  seg > stop_ptr;  seg--)
 		{
-			if (!(GTM_PROBE(SIZEOF(blk_segment), seg, READ)))
-			{
-				SECSHR_ACCOUNTING(4);
-				SECSHR_ACCOUNTING(__LINE__);
-				SECSHR_ACCOUNTING((INTPTR_T)seg);
-				SECSHR_ACCOUNTING(SIZEOF(blk_segment));
-				assert(FALSE);
-				return FALSE;
-			}
 			if (!seg->len)
-				continue;	/* GTM_PROBE on a zero length returns FALSE so check for it explicitly here */
-			if (!(GTM_PROBE(seg->len, seg->addr, READ)))
-			{
-				SECSHR_ACCOUNTING(5);
-				SECSHR_ACCOUNTING(__LINE__);
-				SECSHR_ACCOUNTING((INTPTR_T)seg);
-				SECSHR_ACCOUNTING((INTPTR_T)seg->addr);
-				SECSHR_ACCOUNTING(seg->len);
-				assert(FALSE);
-				return FALSE;
-			}
+				continue;
 			ptr -= seg->len;
-			if (!(GTM_PROBE(seg->len, ptr, WRITE)))
-			{
-				SECSHR_ACCOUNTING(6);
-				SECSHR_ACCOUNTING(__LINE__);
-				SECSHR_ACCOUNTING((INTPTR_T)seg);
-				SECSHR_ACCOUNTING((INTPTR_T)ptr);
-				SECSHR_ACCOUNTING((INTPTR_T)seg->addr);
-				SECSHR_ACCOUNTING(seg->len);
-				assert(FALSE);
-				return FALSE;
-			}
 			DBG_BG_PHASE2_CHECK_CR_IS_PINNED(csa, seg);
 			memmove(ptr, seg->addr, seg->len);
 		}
diff --git a/sr_port/sec_shr_map_build.c b/sr_port/sec_shr_map_build.c
index 3e28e94..1ea7ab6 100755
--- a/sr_port/sec_shr_map_build.c
+++ b/sr_port/sec_shr_map_build.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,7 +20,6 @@
 #include "gdsfhead.h"
 #include "gdscc.h"
 #include "gdsbml.h"
-#include "probe.h"
 #include "sec_shr_map_build.h"
 #include "min_max.h"
 #include "bit_set.h"
@@ -49,31 +48,10 @@ int sec_shr_map_build(sgmnt_addrs *csa, uint4 *array, unsigned char *base_addr,
 	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))
-	{
-		assert(FALSE);
-		return FALSE;
-	}
-	if (!(GTM_PROBE(NODE_LOCAL_SIZE_DBS, csa->nl, WRITE)))
-	{
-		assert(FALSE);
-		return FALSE;
-	}
-	if (!GTM_PROBE(SIZEOF(sgmnt_data), csa->hdr, READ))
-	{
-		assert(FALSE);
-		return FALSE;
-	}
 	DETERMINE_BML_FUNC(bml_func, cs, csa);
 	DEBUG_ONLY(prev_bitnum = -1;)
 	for (;;)
 	{
-		if (!GTM_PROBE(SIZEOF(*array), array, READ))
-		{
-			assert(FALSE);
-			return FALSE;
-		}
 		bitnum = *array;
 		assert((uint4)bitnum < bplmap);	/* check that bitnum is positive and within 0 to bplmap */
 		if (0 == bitnum)
@@ -85,11 +63,6 @@ int sec_shr_map_build(sgmnt_addrs *csa, uint4 *array, unsigned char *base_addr,
 		DEBUG_ONLY(prev_bitnum = (int4)bitnum);
 		setbit = bitnum * BML_BITS_PER_BLK;
 		ptr = base_addr + setbit / 8;
-		if (!GTM_PROBE(SIZEOF(*ptr), ptr, WRITE))
-		{
-			assert(FALSE);
-			return FALSE;
-		}
 		setbit &= 7;
 		if (bml_busy == bml_func)
 		{
diff --git a/sr_port/secshr_db_clnup.c b/sr_port/secshr_db_clnup.c
index 9198d7f..d3b3f46 100644
--- a/sr_port/secshr_db_clnup.c
+++ b/sr_port/secshr_db_clnup.c
@@ -30,7 +30,6 @@
 #include "copy.h"
 #include "interlock.h"
 #include "jnl.h"
-#include "probe.h"
 #include "buddy_list.h"		/* needed for tp.h */
 #include "hashtab_int4.h"	/* needed for tp.h */
 #include "tp.h"
@@ -60,29 +59,9 @@
 #include "db_snapshot.h"
 #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
- * (privileged image that runs in kernel mode). See "Creating User Written System Sevice" chapter of the "Programming Concepts"
- * OpenVMS manual and the "Shareable Images Cookbook" available from the OpenVMS Wizard's page. SYS$EXAMPLES:uwss*.* is also a
- * good reference.
- *
- ** DO NOT use modulo (%) operation. If % is used, GTMSECSHR links with LIBOTS.EXE - an external shared image. This will result
- *  in "-SYSTEM-F-NOSHRIMG, privileged shareable image cannot have outbound calls" errors when GTMSECSHR is invoked. We might as
- *  well avoid division too.
- *
- ** The only library/system calls allowed are SYS$ calls.
- *
- ** No I/O allowed - any device, including operator console.
- *
- ** Always PROBE memory before accessing it. If not, should SECSHR access invalid memory (out of bounds for instance) the machine
- *  will crash (BUGCHECK in VMS parlance). Remember, SECSHR is running in kernel mode!
- *
- ** Both secshr_db_clnup.c and sec_shr_blk_build.c are compiled with /prefix=except=memmove. If any of the other modules used
- *  memmove, they would need special treatment as well.
- */
+#include "dpgbldir.h"		/* for "get_next_gdr" */
+#include "t_abort.h"
 
 #define FLUSH 1
 
@@ -90,103 +69,49 @@
 #define	WCBLOCKED_WBUF_DQD_LIT		"wcb_secshr_db_clnup_wbuf_dqd"
 #define	WCBLOCKED_PHASE2_CLNUP_LIT	"wcb_secshr_db_clnup_phase2_clnup"
 
-/* IMPORTANT : SECSHR_PROBE_REGION sets csa */
-#define	SECSHR_PROBE_REGION(reg)									\
-	if (!GTM_PROBE(SIZEOF(gd_region), (reg), READ))							\
-		continue; /* would be nice to notify the world of a problem but where and how?? */	\
-	if (!reg->open || reg->was_open)								\
-		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 (!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? */	\
-	if (!GTM_PROBE(SIZEOF(GDS_INFO), (reg)->dyn.addr->file_cntl->file_info, READ))			\
-		continue; /* would be nice to notify the world of a problem but where and how? */	\
-	csa = &(FILE_INFO((reg)))->s_addrs;								\
-	if (!GTM_PROBE(SIZEOF(sgmnt_addrs), csa, WRITE))						\
-		continue; /* would be nice to notify the world of a problem but where and how? */	\
-	assert(reg->read_only && !csa->read_write || !reg->read_only && csa->read_write);
-
 #ifdef DEBUG_CHECK_LATCH
 #  define DEBUG_LATCH(x) x
 #else
 #  define DEBUG_LATCH(x)
 #endif
 
-#  define SALVAGE_UNIX_LATCH_DBCRIT(X, is_exiting, wcblocked)								\
-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	\
-	 * in PIN_CACHE_RECORD macro in t_end/tp_tend.									\
-	 */														\
-	uint4 pid;													\
-															\
-	if ((pid = (X)->u.parts.latch_pid) == rundown_process_id)							\
-	{														\
-		if (is_exiting)												\
-		{													\
-			SET_LATCH_GLOBAL(X, LOCK_AVAILABLE);								\
-			DEBUG_LATCH(util_out_print("Latch cleaned up", FLUSH));						\
-		}													\
-	} 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 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);							\
+#define	RELEASE_LATCH_IF_OWNER_AND_EXITING(X, is_exiting)			\
+MBSTART {									\
+	if (is_exiting && ((X)->u.parts.latch_pid == process_id))		\
+	{									\
+		SET_LATCH_GLOBAL(X, LOCK_AVAILABLE);				\
+		DEBUG_LATCH(util_out_print("Latch cleaned up", FLUSH));		\
+	}									\
 } MBEND
 
-GBLDEF gd_addr_fn_ptr	get_next_gdr_addrs;
-GBLDEF cw_set_element	*cw_set_addrs;
-GBLDEF sgm_info		**first_sgm_info_addrs;
-GBLDEF sgm_info		**first_tp_si_by_ftok_addrs;
-GBLDEF unsigned char	*cw_depth_addrs;
-GBLDEF uint4		rundown_process_id;
-GBLDEF uint4		rundown_image_count;
-GBLDEF int4		rundown_os_page_size;
-GBLDEF gd_region	**jnlpool_reg_addrs;
-GBLDEF inctn_opcode_t	*inctn_opcode_addrs;
-GBLDEF inctn_detail_t	*inctn_detail_addrs;
-GBLDEF uint4		*dollar_tlevel_addrs;
-GBLDEF uint4		*update_trans_addrs;
-GBLDEF sgmnt_addrs	**cs_addrs_addrs;
-GBLDEF sgmnt_addrs 	**kip_csa_addrs;
-GBLDEF boolean_t	*need_kip_incr_addrs;
-GBLDEF trans_num	*start_tn_addrs;
-
-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;
+GBLREF	boolean_t		need_kip_incr;
+GBLREF	cw_set_element		cw_set[];
+GBLREF	gd_region		*gv_cur_region;		/* for the LOCK_HIST macro in the RELEASE_BUFF_UPDATE_LOCK macro */
+GBLREF	inctn_detail_t		inctn_detail;			/* holds detail to fill in to inctn jnl record */
+GBLREF	inctn_opcode_t		inctn_opcode;
+GBLREF	jnlpool_addrs		jnlpool;
 GBLREF	node_local_ptr_t	locknl;			/* set explicitly before invoking RELEASE_BUFF_UPDATE_LOCK macro */
-GBLREF	int4			strm_index;
-GBLREF	jnl_gbls_t		jgbl;
-GBLREF	cache_rec_ptr_t		cr_array[]; /* Maximum number of blocks that can be in transaction */
+GBLREF	sgm_info		*first_sgm_info;	/* List of all regions (unsorted) in TP transaction */
+GBLREF	sgm_info		*first_tp_si_by_ftok;	/* List of READ or UPDATED regions sorted on ftok order */
+GBLREF	sgm_info		*sgm_info_ptr;
+GBLREF	sgmnt_addrs 		*kip_csa;
+GBLREF	short			crash_count;
+GBLREF	trans_num		start_tn;
+GBLREF	uint4			process_id;
+GBLREF	uint4			update_trans;
+GBLREF	unsigned char		cw_set_depth;
 GBLREF	unsigned int		cr_array_index;
 GBLREF	sgmnt_addrs		*cs_addrs;
+GBLREF	volatile int4		crit_count;
+GBLREF	int4			strm_index;
+GBLREF	jnl_fence_control	jnl_fence_ctl;
 
 #ifdef DEBUG
 GBLREF	volatile boolean_t	in_wcs_recover; /* TRUE if in "wcs_recover" */
+GBLREF	boolean_t		dse_running;
+GBLREF	jnl_gbls_t		jgbl;
+GBLREF	cache_rec_ptr_t		cr_array[]; /* Maximum number of blocks that can be in transaction */
 #endif
 
 error_def(ERR_WCBLOCKED);
@@ -198,50 +123,125 @@ typedef enum
 	REG_COMMIT_COMPLETE	 /* indicates that GT.M has already committed all cw-set-elements for this region */
 } commit_type;
 
-boolean_t	secshr_tp_get_cw(cw_set_element *cs, int depth, cw_set_element **cs1);
+/* secshr_db_clnup can be called with one of the following three values for "secshr_state"
+ *
+ * 	a) NORMAL_TERMINATION   --> We are called from the exit-handler for precautionary cleanup.
+ * 				    We should NEVER be in the midst of a database update in this case.
+ * 	b) COMMIT_INCOMPLETE    --> We are called from t_commit_cleanup.
+ * 				    We should ALWAYS be in the midst of a database update in this case.
+ * 	c) ABNORMAL_TERMINATION --> This is currently VMS ONLY. This process received a STOP/ID.
+ * 				    We can POSSIBLY be in the midst of a database update in this case.
+ * 				    When UNIX boxes allow kernel extensions, it can then handle "kill -9".
+ *
+ * If we are in the midst of a database update, then depending on where we are in the commit logic
+ * 	we need to ROLL-BACK (undo the partial commit) or ROLL-FORWARD (complete the partial commit) the database update.
+ * t_commit_cleanup handles the ROLL-BACK and secshr_db_clnup handles the ROLL-FORWARD
+ *
+ * For all error conditions in the database commit logic, t_commit_cleanup gets control first.
+ * If then determines whether to do a ROLL-BACK or a ROLL-FORWARD.
+ * If a ROLL-BACK needs to be done, then t_commit_cleanup handles it all by itself and we will not come here.
+ * If a ROLL-FORWARD needs to be done, then t_commit_cleanup invokes secshr_db_clnup.
+ * 	In this case, secshr_db_clnup will be called with a "secshr_state" value of "COMMIT_INCOMPLETE".
+ *
+ * Irrespective of whether we are in the midst of a database commit or not, t_commit_cleanup does not get control.
+ * Since the process can POSSIBLY be in the midst of a database update while it was STOP/IDed,
+ * 	the logic for determining whether it is a ROLL-BACK or a ROLL-FORWARD needs to also be in secshr_db_clnup.
+ * If it is determined that a ROLL-FORWARD needs to be done, secshr_db_clnup takes care of it by itself.
+ * But if a ROLL-BACK needs to be done, then secshr_db_clnup DOES NOT invoke t_commit_cleanup.
+ * Instead it sets cnl->wc_blocked to TRUE thereby ensuring the next process that gets CRIT does a cache recovery
+ * 	which will take care of doing more than the ROLL-BACK that t_commit_cleanup would have otherwise done.
+ *
+ * In order to understand how a ROLL-BACK or ROLL-FORWARD decision is made, the commit flow needs to be understood first.
+ * The commit logic flow in t_end & tp_tend can be captured as follows.
+ * Note that
+ *	a) In t_end there is only one region in the "For each region" loop. And "si->update_trans" == "update_trans".
+ *	b) All jnlpool steps below apply only if replication is turned ON.
+ *	c) For MM, the jnl and db commits happen inside crit i.e. no phase2 outside crit like BG.
+ *
+ * (CMT01) Get crit on all regions (UPDATED & NON-UPDATED)
+ * (CMT02) Get crit on jnlpool
+ * (CMT03) Reserve space in JNLPOOL for journal records (UPDATE_JPL_RSRV_WRITE_ADDR macro)
+ *         For each UPDATED region
+ *         {
+ * (CMT04)     csd->trans_hist.early_tn = csd->trans_hist.curr_tn + 1;
+ * (CMT05)     csa->t_commit_crit = T_COMMIT_CRIT_PHASE0;
+ *         }
+ *         For each UPDATED & JOURNALED region
+ *         {
+ * (CMT06)     Reserve space in JNLBUFF for journal records PHASE1 (UPDATE_JRS_RSRV_FREEADDR macro)
+ *         }
+ * (CMT06a) If (MM or (BG && jnlbuff-overflow)) Do Step CMT16 here instead of later
+ * (CMT06b) If (MM) Do Step CMT17 here instead of later
+ * (CMT07) jnlpool_ctl->jnl_seqno++; jnlpool_ctl->strm_seqno[]++ if supplementary; (SET_JNL_SEQNO macro)
+ *         For each UPDATED region
+ *         {
+ * (CMT08)     csa->t_commit_crit = T_COMMIT_CRIT_PHASE1; cnl->update_underway_tn = csd->trans_hist.curr_tn;
+ * (CMT09)     If replication is ON, csd->reg_seqno = jnlpool_ctl->jnl_seqno + 1; csd->strm_reg_seqno[] = xxx
+ * (CMT10)     Commit all cw-set-elements of this region PHASE1 (inside crit)	// bg_update_phase1 or mm_update
+ * (CMT10a)    If (BG && (bitmap cw-set-element of this region)) commit it PHASE2 (inside crit)	// bg_update_phase2
+ * (CMT11)     si->update_trans |= UPDTRNS_TCOMMIT_STARTED_MASK;
+ * (CMT12)     csd->trans_hist.curr_tn++;
+ * (CMT13)     csa->t_commit_crit = T_COMMIT_CRIT_PHASE2;
+ * (CMT14)     Release crit on region
+ *         }
+ * (CMT15) Release crit on jnlpool
+ *         For each UPDATED & JOURNALED region
+ * (CMT16)     If (BG) Write journal records in JNLBUFF & JNLPOOL. PHASE2 (outside crit). Mark write complete in JNLBUFF.
+ * (CMT17) If (BG) Mark journal record write complete in JNLPOOL.
+ *         For each participating region being UPDATED
+ *         {
+ * (CMT18)     Commit all cw-set-elements of this region PHASE2 (outside crit)	// bg_update_phase2
+ * (CMT19)     csa->t_commit_crit = FALSE;
+ *         }
+ *
+ * If a transaction has proceeded to Step (CMT08) for at least one region, then "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.
+ * This is for the case where the process encounters an error in the midst of commit. In this case, we are guaranteed
+ * a clean recovery by secshr_db_clnup() & wcs_recover(). Database integrity is guaranteed.
+ * But if the process in the midst of commit is abnormally killed (e.g. kill -9), then "mutex_salvage",
+ * "jnl_phase2_salvage" and "repl_phase2_salvage" try to cleanup various pieces of the leftover mess but
+ * we are not guaranteed db integrity (i.e. CMT18 cannot be currently easily redone by a different process).
+ */
 
 void secshr_db_clnup(enum secshr_db_state secshr_state)
 {
 	unsigned char		*chain_ptr;
 	char			*wcblocked_ptr;
-	uint4			dlr_tlevel;
-	boolean_t		is_bg, jnlpool_reg, do_accounting, first_time = TRUE, is_exiting;
-	boolean_t		kip_csa_usable, needkipincr;
-	uint4			upd_trans; /* a copy of the global variable "update_trans" which is needed for VMS STOP/ID case */
+	boolean_t		is_bg, do_accounting, first_time = TRUE, is_exiting;
 	boolean_t		tp_update_underway = FALSE;	/* set to TRUE if TP commit was in progress or complete */
 	boolean_t		non_tp_update_underway = FALSE;	/* set to TRUE if non-TP commit was in progress or complete */
 	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 */
+	boolean_t		donot_reset_data_invalid;	/* set to TRUE in case cr->data_invalid was TRUE in phase2 */
 	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_addr			*gd_hdr;
 	gd_region		*reg, *reg_top, *save_gv_cur_region;
 	jnl_buffer_ptr_t	jbp;
 	off_chain		chain;
-	sgm_info		*si, *firstsgminfo;
-	sgmnt_addrs		*csa, *csaddrs;
+	sgm_info		*si, *save_si;
+	sgmnt_addrs		*csa, *tmp_csa, *repl_csa;
 	sgmnt_data_ptr_t	csd;
 	node_local_ptr_t	cnl;
 	sm_uc_ptr_t		blk_ptr;
 	blk_hdr_ptr_t		blk_hdr_ptr;
 	jnlpool_ctl_ptr_t	jpl;
-	jnldata_hdr_ptr_t	jh;
-	uint4			cumul_jnl_rec_len, jsize, new_write, imgcnt;
 	pid_t			pid;
 	sm_uc_ptr_t		bufstart;
 	int4			bufindx;	/* should be the same type as "csd->bt_buckets" */
 	commit_type		this_reg_commit_type;	/* indicate the type of commit of a given region in a TP transaction */
-	gv_namehead		*gvt = NULL, *gvtarget;
+	gv_namehead		*gvtarget;
 	srch_blk_status		*t1;
 	trans_num		currtn;
 	int4			n;
 	snapshot_context_ptr_t	lcl_ss_ctx;
 	cache_rec_ptr_t		snapshot_cr;
 	uint4			blk_size;
+	jbuf_rsrv_struct_t	*jrs;
+	seq_num			strm_seqno;
 #	ifdef DEBUG
 	cache_rec_ptr_t		*crArray;
 	unsigned int		crArrayIndex;
@@ -249,150 +249,46 @@ void secshr_db_clnup(enum secshr_db_state secshr_state)
 	DCL_THREADGBL_ACCESS;
 
 	SETUP_THREADGBL_ACCESS;
-	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"
-	 *
-	 * 	a) NORMAL_TERMINATION   --> We are called from the exit-handler for precautionary cleanup.
-	 * 				    We should NEVER be in the midst of a database update in this case.
-	 * 	b) COMMIT_INCOMPLETE    --> We are called from t_commit_cleanup.
-	 * 				    We should ALWAYS be in the midst of a database update in this case.
-	 * 	c) ABNORMAL_TERMINATION --> This is currently VMS ONLY. This process received a STOP/ID.
-	 * 				    We can POSSIBLY be in the midst of a database update in this case.
-	 * 				    When UNIX boxes allow kernel extensions, this can be made to handle "kill -9" too.
-	 *
-	 * If we are in the midst of a database update, then depending on the stage of the commit we are in,
-	 * 	we need to ROLL-BACK (undo the partial commit) or ROLL-FORWARD (complete the partial commit) the database update.
-	 *
-	 * t_commit_cleanup handles the ROLL-BACK and secshr_db_clnup handles the ROLL-FORWARD
-	 *
-	 * For all error conditions in the database commit logic, t_commit_cleanup gets control first.
-	 * If then determines whether to do a ROLL-BACK or a ROLL-FORWARD.
-	 * If a ROLL-BACK needs to be done, then t_commit_cleanup handles it all by itself and we will not come here.
-	 * If a ROLL-FORWARD needs to be done, then t_commit_cleanup invokes secshr_db_clnup.
-	 * 	In this case, secshr_db_clnup will be called with a "secshr_state" value of "COMMIT_INCOMPLETE".
-	 *
-	 * In case of a STOP/ID in VMS, secshr_db_clnup is directly invoked with a "secshr_state" value of "ABNORMAL_TERMINATION".
-	 * Irrespective of whether we are in the midst of a database commit or not, t_commit_cleanup does not get control.
-	 * Since the process can POSSIBLY be in the midst of a database update while it was STOP/IDed,
-	 * 	the logic for determining whether it is a ROLL-BACK or a ROLL-FORWARD needs to also be in secshr_db_clnup.
-	 * If it is determined that a ROLL-FORWARD needs to be done, secshr_db_clnup takes care of it by itself.
-	 * But if a ROLL-BACK needs to be done, then secshr_db_clnup DOES NOT invoke t_commit_cleanup.
-	 * Instead it sets cnl->wc_blocked to TRUE thereby ensuring the next process that gets CRIT does a cache recovery
-	 * 	which will take care of doing more than the ROLL-BACK that t_commit_cleanup would have otherwise done.
-	 *
-	 * The logic for determining if it is a ROLL-BACK or ROLL-FORWARD is explained below.
-	 * The commit logic flow in tp_tend and t_end can be captured as follows. Note that in t_end there is only one region.
-	 *
-	 *  1) Get crit on all regions
-	 *  2) Get crit on jnlpool
-	 *  3) jnlpool_ctl->early_write_addr += delta;
-	 *       For each participating region being UPDATED
-	 *       {
-	 *  4)     csd->trans_hist.early_tn++;
-	 *         Write journal records
-	 *  5)     csa->hdr->reg_seqno = jnlpool_ctl->jnl_seqno + 1;
-	 *       }
-	 *       For each participating region being UPDATED
-	 *       {
-	 *  6)	    csa->t_commit_crit = T_COMMIT_CRIT_PHASE1;
-	 *             For every cw-set-element of this region
-	 *             {
-	 *  6a)          Commit this particular block PHASE1 (inside crit).
-	 *             }
-	 *  7)       csa->t_commit_crit = T_COMMIT_CRIT_PHASE2;
-	 *  8)     csd->trans_hist.curr_tn++;
-	 *       }
-	 *  9) jnlpool_ctl->write_addr = jnlpool_ctl->early_write_addr;
-	 * 10) jnlpool_ctl->jnl_seqno++;
-	 * 11) Release crit on all db regions
-	 * 12) Release crit on jnlpool
-	 *       For each participating region being UPDATED
-	 *       {
-	 *             For every cw-set-element of this region
-	 *             {
-	 * 13)           Commit this particular block PHASE2 (outside crit).
-	 * 14)           cs->mode = gds_t_committed;
-	 *             }
-	 * 15)       csa->t_commit_crit = FALSE;
-	 *       }
-	 *
-	 * If a TP transaction has proceeded to step (6) for at least one region, then "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.
-	 *
-	 * 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.
-	 */
-	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;
-	else
-	{	/* init_secshr_addrs did not even complete before we got a terminating signal so no database actions to clean up */
-		assert(NULL == start_tn_addrs);
-		assert(is_exiting);
-		return;
-	}
-	if (GTM_PROBE(SIZEOF(*dollar_tlevel_addrs), dollar_tlevel_addrs, READ))
-		dlr_tlevel = *dollar_tlevel_addrs;
-	else
-	{
-		assert(FALSE);
-		dlr_tlevel = FALSE;
-	}
-	if (dlr_tlevel && GTM_PROBE(SIZEOF(*first_tp_si_by_ftok_addrs), first_tp_si_by_ftok_addrs, READ))
+	is_exiting = (NORMAL_TERMINATION == secshr_state);
+	currtn = start_tn;
+	if (dollar_tlevel)
 	{	/* Determine update_underway for TP transaction. A similar check is done in t_commit_cleanup as well.
 		 * Regions are committed in the ftok order using "first_tp_si_by_ftok". Also crit is released on each region
 		 * as the commit completes. Take that into account while determining if update is underway.
 		 */
-		for (si = *first_tp_si_by_ftok_addrs; NULL != si; si = si->next_tp_si_by_ftok)
+		for (si = first_tp_si_by_ftok; NULL != si; si = si->next_tp_si_by_ftok)
 		{
-			if (GTM_PROBE(SIZEOF(sgm_info), si, READ))
+			if (UPDTRNS_TCOMMIT_STARTED_MASK & si->update_trans)
+			{	/* Two possibilities.
+				 *	(a) case of duplicate set not creating any cw-sets but updating db curr_tn++.
+				 *	(b) Have completed commit for this region and have released crit on this region.
+				 *		(in a potentially multi-region TP transaction).
+				 * In either case, update is underway and the transaction cannot be rolled back.
+				 */
+				tp_update_underway = TRUE;
+				update_underway = TRUE;
+				break;
+			}
+			if (NULL != si->first_cw_set)
 			{
-				assert(GTM_PROBE(SIZEOF(cw_set_element), si->first_cw_set, READ) || (NULL == si->first_cw_set));
-				if (UPDTRNS_TCOMMIT_STARTED_MASK & si->update_trans)
-				{	/* Two possibilities.
-					 *	(a) case of duplicate set not creating any cw-sets but updating db curr_tn++.
-					 *	(b) Have completed commit for this region and have released crit on this region.
-					 *		(in a potentially multi-region TP transaction).
-					 * In either case, update is underway and the transaction cannot be rolled back.
-					 */
+				csa = si->tp_csa;
+				assert(NULL != csa);
+				if (T_UPDATE_UNDERWAY(csa))
+				{
 					tp_update_underway = TRUE;
 					update_underway = TRUE;
 					break;
 				}
-				if (GTM_PROBE(SIZEOF(cw_set_element), si->first_cw_set, READ))
-				{	/* Note that SECSHR_PROBE_REGION does a "continue" if any probes fail. */
-					csa = si->tp_csa;
-					if (!GTM_PROBE(SIZEOF(sgmnt_addrs), csa, READ))
-						continue;
-					if (T_UPDATE_UNDERWAY(csa))
-					{
-						tp_update_underway = TRUE;
-						update_underway = TRUE;
-						break;
-					}
-				}
-			} else
-			{
-				assert(FALSE);
-				break;
 			}
 		}
-	}
-	if (!dlr_tlevel)
-	{	/* determine update_underway for non-TP transaction */
-		upd_trans = FALSE;
-		if (GTM_PROBE(SIZEOF(*update_trans_addrs), update_trans_addrs, READ))
-			upd_trans = *update_trans_addrs;
-		csaddrs = NULL;
-		if (GTM_PROBE(SIZEOF(*cs_addrs_addrs), cs_addrs_addrs, READ))
-			csaddrs = *cs_addrs_addrs;
-		if (GTM_PROBE(SIZEOF(sgmnt_addrs), csaddrs, READ))
+	} else
+	{	/* Determine update_underway for non-TP transaction */
+		if (NULL != cs_addrs)
 		{
-			if (csaddrs->now_crit && (UPDTRNS_TCOMMIT_STARTED_MASK & upd_trans) || T_UPDATE_UNDERWAY(csaddrs))
+			assert(!(cs_addrs->now_crit && (UPDTRNS_TCOMMIT_STARTED_MASK & update_trans))
+									|| T_UPDATE_UNDERWAY(cs_addrs));
+			if (T_UPDATE_UNDERWAY(cs_addrs))
 			{
 				non_tp_update_underway = TRUE;	/* non-tp update was underway */
 				update_underway = TRUE;
@@ -403,136 +299,86 @@ void secshr_db_clnup(enum secshr_db_state secshr_state)
 	 * (as otherwise t_commit_cleanup would not have called us)
 	 */
 	assert((COMMIT_INCOMPLETE != secshr_state) || update_underway);
-	for (gd_header = (*get_next_gdr_addrs)(NULL);  NULL != gd_header;  gd_header = (*get_next_gdr_addrs)(gd_header))
+	for (gd_hdr = get_next_gdr(NULL); NULL != gd_hdr; gd_hdr = get_next_gdr(gd_hdr))
 	{
-		if (!GTM_PROBE(SIZEOF(gd_addr), gd_header, READ))
-			break;	/* if gd_header is accessible */
-		for (reg = gd_header->regions, reg_top = reg + gd_header->n_regions;  reg < reg_top;  reg++)
+		for (reg = gd_hdr->regions, reg_top = reg + gd_hdr->n_regions;  reg < reg_top;  reg++)
 		{
-			SECSHR_PROBE_REGION(reg);	/* SECSHR_PROBE_REGION sets csa */
+			if (!reg->open || reg->was_open)
+				continue;
+			if (!IS_REG_BG_OR_MM(reg))
+				continue;
+			csa = REG2CSA(reg);
+			if (NULL == csa)
+				continue;
+			assert((reg->read_only && !csa->read_write) || (!reg->read_only && csa->read_write));
 			csd = csa->hdr;
-			if (!GTM_PROBE(SIZEOF(sgmnt_data), csd, WRITE))
-			{
-				assert(FALSE);
-				continue; /* would be nice to notify the world of a problem but where and how? */
-			}
+			assert(NULL != csd);
 			cnl = csa->nl;
-			if (!GTM_PROBE(NODE_LOCAL_SIZE_DBS, cnl, WRITE))
-			{
-				assert(FALSE);
-				continue; /* would be nice to notify the world of a problem but where and how? */
-			}
+			assert(NULL != cnl);
 			is_bg = (csd->acc_meth == dba_bg);
 			do_accounting = FALSE;	/* used by SECSHR_ACCOUNTING macro */
-			/* do SECSHR_ACCOUNTING only if holding crit (to avoid another process' normal termination call
-			 * to secshr_db_clnup from overwriting whatever important information we wrote. if we are in
-			 * crit, for the next process to overwrite us it needs to get crit which in turn will invoke
-			 * wcs_recover which in turn will send whatever we wrote to the operator log).
-			 * also cannot update csd if MM and read-only. take care of that too. */
+			/* Do SECSHR_ACCOUNTING only if holding crit. This is so we avoid another process' normal termination call
+			 * to "secshr_db_clnup" from overwriting whatever important information we wrote. If we are in crit,
+			 * for the next process to overwrite us it needs to get crit which in turn will invoke wcs_recover
+			 * which in turn will send whatever we wrote (using SECSHR_ACCOUNTING) to the syslog).
+			 * Also cannot update csd if MM and read-only. take care of that too.
+			 */
 			if (csa->now_crit && (csa->read_write || is_bg))
 			{	/* start accounting */
 				cnl->secshr_ops_index = 0;
 				do_accounting = TRUE;	/* used by SECSHR_ACCOUNTING macro */
 			}
-			SECSHR_ACCOUNTING(4);	/* 4 is the number of arguments following including self */
-			SECSHR_ACCOUNTING(__LINE__);
-			SECSHR_ACCOUNTING(rundown_process_id);
-			SECSHR_ACCOUNTING(secshr_state);
-			if (csa->ti != &csd->trans_hist)
-			{
-				SECSHR_ACCOUNTING(4);
-				SECSHR_ACCOUNTING(__LINE__);
-				SECSHR_ACCOUNTING((INTPTR_T)csa->ti);
-				SECSHR_ACCOUNTING((INTPTR_T)&csd->trans_hist);
-				csa->ti = &csd->trans_hist;	/* better to correct and proceed than to stop */
-			}
-			SECSHR_ACCOUNTING(3);	/* 3 is the number of arguments following including self */
-			SECSHR_ACCOUNTING(__LINE__);
-			SECSHR_ACCOUNTING(csd->trans_hist.curr_tn);
+			SECSHR_ACCOUNTING(do_accounting, 5);	/* 5 is the number of arguments following including self */
+			SECSHR_ACCOUNTING(do_accounting, __LINE__);
+			SECSHR_ACCOUNTING(do_accounting, process_id);
+			SECSHR_ACCOUNTING(do_accounting, secshr_state);
+			SECSHR_ACCOUNTING(do_accounting, csd->trans_hist.curr_tn);
+			csa->ti = &csd->trans_hist;	/* correct it in case broken */
 			if (is_exiting)
 			{	/* If we hold any latches in the node_local area, release them. Note we do not check
-				   db_latch here because it is never used by the compare and swap logic but rather
-				   the aswp logic. Since it is only used for the 3 state cache record lock and
-				   separate recovery exists for it, we do not do anything with it here.
-				*/
-				SALVAGE_UNIX_LATCH(&cnl->wc_var_lock, is_exiting);
-				if (ABNORMAL_TERMINATION == secshr_state)
-				{
-					if (csa->timer)
-					{
-						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)
-					{
-						assert(0 < cnl->ref_cnt);
-						csa->ref_cnt--;
-						assert(!csa->ref_cnt);
-						PROBE_DECR_CNT(&cnl->ref_cnt, &cnl->wc_var_lock);
-					}
-				}
+				 * db_latch here because it is never used by the compare and swap logic but rather
+				 * the aswp logic. Since it is only used for the 3 state cache record lock and
+				 * separate recovery exists for it, we do not do anything with it here.
+				 */
+				RELEASE_LATCH_IF_OWNER_AND_EXITING(&cnl->wc_var_lock, is_exiting);
+				assert(ABNORMAL_TERMINATION != secshr_state);
+				/* Note: In case of "kill -9", cnl->wcs_timers & cnl->ref_cnt will stay uncleaned */
 				if ((csa->in_wtstart) && (0 < cnl->in_wtstart))
 				{
-					PROBE_DECR_CNT(&cnl->in_wtstart, &cnl->wc_var_lock);
+					DECR_CNT(&cnl->in_wtstart, &cnl->wc_var_lock);
 					assert(0 < cnl->intent_wtstart);
 					if (0 < cnl->intent_wtstart)
-						PROBE_DECR_CNT(&cnl->intent_wtstart, &cnl->wc_var_lock);
+						DECR_CNT(&cnl->intent_wtstart, &cnl->wc_var_lock);
 				}
 				csa->in_wtstart = FALSE;	/* Let wcs_wtstart run for exit processing */
-				if (cnl->wcsflu_pid == rundown_process_id)
+				if (cnl->wcsflu_pid == process_id)
 					cnl->wcsflu_pid = 0;
 			}
 			set_wc_blocked = FALSE;
 			if (is_bg)
 			{
-				if ((0 == cnl->sec_size) || !GTM_PROBE(cnl->sec_size, cnl, WRITE))
-				{
-					SECSHR_ACCOUNTING(3);
-					SECSHR_ACCOUNTING(__LINE__);
-					SECSHR_ACCOUNTING(cnl->sec_size);
-					assert(FALSE);
-					continue;
-				}
+				assert(cnl->sec_size);
 				cache_state = csa->acc_meth.bg.cache_state;
-				if (!GTM_PROBE(SIZEOF(cache_que_heads), cache_state, WRITE))
-				{
-					SECSHR_ACCOUNTING(3);
-					SECSHR_ACCOUNTING(__LINE__);
-					SECSHR_ACCOUNTING((INTPTR_T)cache_state);
-					assert(FALSE);
-					continue;
-				}
-				SALVAGE_UNIX_LATCH(&cache_state->cacheq_active.latch, is_exiting);
+				RELEASE_LATCH_IF_OWNER_AND_EXITING(&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))
-				{
-					SECSHR_ACCOUNTING(3);
-					SECSHR_ACCOUNTING(__LINE__);
-					SECSHR_ACCOUNTING((INTPTR_T)start_cr);
-					assert(FALSE);
-					continue;
-				}
 				cr_top = start_cr + max_bts;
 				if (is_exiting)
 				{
 #					ifdef DEBUG
-					if (gtm_white_box_test_case_enabled && (reg == gd_header->regions)
+					if (gtm_white_box_test_case_enabled && (reg == gd_hdr->regions)
 						&& (WBTEST_SIGTSTP_IN_T_QREAD == gtm_white_box_test_case_number))
 					{
 						assert((NULL != TREF(block_now_locked))
-							&& ((TREF(block_now_locked))->r_epid == rundown_process_id));
+							&& ((TREF(block_now_locked))->r_epid == process_id));
 					}
 #					endif
 					if (NULL != (cr = TREF(block_now_locked)))	/* done by region to ensure access */
 					{	/* The following is potentially thread-specific rather than process-specific */
 						TREF(block_now_locked) = NULL;
-						SALVAGE_UNIX_LATCH(&cr->rip_latch, is_exiting);
-						if ((cr->r_epid == rundown_process_id) && (0 == cr->dirty) && (0 == cr->in_cw_set))
+						RELEASE_LATCH_IF_OWNER_AND_EXITING(&cr->rip_latch, is_exiting);
+						if ((cr->r_epid == process_id) && (0 == cr->dirty) && (0 == cr->in_cw_set))
 						{	/* increment cycle for blk number changes (for tp_hist) */
 							cr->cycle++;
 							cr->blk = CR_BLKEMPTY;
@@ -550,185 +396,164 @@ void secshr_db_clnup(enum secshr_db_state secshr_state)
 			 * ftok ordered linked list ("first_tp_si_by_ftok") so we can safely use this.
 			 */
 			if (tp_update_underway)
-			{	/* this is constructed to deal with the issue of reg != si->gv_cur_region
-				 * due to the possibility of multiple global directories pointing to regions
-				 * that resolve to the same physical file; was_open prevents processing the segment
-				 * more than once, so this code matches on the file rather than the region to make sure
-				 * that it gets processed at least once */
-				for (si = *first_tp_si_by_ftok_addrs; NULL != si; si = si->next_tp_si_by_ftok)
+			{	/* This is constructed to deal with the issue of reg != si->gv_cur_region due to the possibility
+				 * of multiple global directories pointing to regions that resolve to the same physical file;
+				 * was_open prevents processing the segment more than once, so this code matches on the file
+				 * rather than the region to make sure that it gets processed at least once.
+				 */
+				for (si = first_tp_si_by_ftok; NULL != si; si = si->next_tp_si_by_ftok)
 				{
-					if (!GTM_PROBE(SIZEOF(sgm_info), si, READ))
-					{
-						SECSHR_ACCOUNTING(3);
-						SECSHR_ACCOUNTING(__LINE__);
-						SECSHR_ACCOUNTING((INTPTR_T)si);
-						assert(FALSE);
-						break;
-					} else if (!GTM_PROBE(SIZEOF(gd_region), si->gv_cur_region, READ))
-					{
-						SECSHR_ACCOUNTING(3);
-						SECSHR_ACCOUNTING(__LINE__);
-						SECSHR_ACCOUNTING((INTPTR_T)si->gv_cur_region);
-						assert(FALSE);
-						continue;
-					} else if (!GTM_PROBE(SIZEOF(gd_segment), si->gv_cur_region->dyn.addr, READ))
-					{
-						SECSHR_ACCOUNTING(3);
-						SECSHR_ACCOUNTING(__LINE__);
-						SECSHR_ACCOUNTING((INTPTR_T)si->gv_cur_region->dyn.addr);
-						assert(FALSE);
-						continue;
-					} else if (si->gv_cur_region->dyn.addr->file_cntl == reg->dyn.addr->file_cntl)
+					if (FILE_CNTL(si->gv_cur_region) == FILE_CNTL(reg))
 					{
 						cs = si->first_cw_set;
-						if (cs && GTM_PROBE(SIZEOF(cw_set_element), cs, READ))
-						{
-							while (cs->high_tlevel)
-							{
-								if (GTM_PROBE(SIZEOF(cw_set_element),
-											cs->high_tlevel, READ))
-									cs = cs->high_tlevel;
-								else
-								{
-									SECSHR_ACCOUNTING(3);
-									SECSHR_ACCOUNTING(__LINE__);
-									SECSHR_ACCOUNTING((INTPTR_T)cs->high_tlevel);
-									assert(FALSE);
-									first_cw_set = cs = NULL;
-									break;
-								}
-							}
-						}
+						TRAVERSE_TO_LATEST_CSE(cs);
 						first_cw_set = cs;
 						break;
 					}
 				}
-			} else if (!dlr_tlevel && csa->t_commit_crit)
-			{
-				if (!GTM_PROBE(SIZEOF(unsigned char), cw_depth_addrs, READ))
+			} else if (!dollar_tlevel && T_UPDATE_UNDERWAY(csa))
+			{	/* We have reached Step (CMT08). ROLL-FORWARD the commit unconditionally */
+				if (0 != cw_set_depth)
 				{
-					SECSHR_ACCOUNTING(3);
-					SECSHR_ACCOUNTING(__LINE__);
-					SECSHR_ACCOUNTING((INTPTR_T)cw_depth_addrs);
-					assert(FALSE);
-				} else
-				{	/* csa->t_commit_crit being TRUE is a clear cut indication that we have
-					 * reached stage (6). ROLL-FORWARD the commit unconditionally.
-					 */
-					if (0 != *cw_depth_addrs)
-					{
-						first_cw_set = cs = cw_set_addrs;
-						cs_top = cs + *cw_depth_addrs;
-					}
-					/* else is the case where we had a duplicate set that did not update any cw-set */
-					assert(!tp_update_underway);
-					assert(non_tp_update_underway);	/* should have already determined update is underway */
-					/* 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.
-					 */
-					assertpro(non_tp_update_underway);
-					non_tp_update_underway = TRUE;	/* just in case */
-					update_underway = TRUE;		/* just in case */
+					first_cw_set = cs = cw_set;
+					cs_top = cs + cw_set_depth;
 				}
+				/* else is the case where we had a duplicate set that did not update any cw-set */
+				assert(!tp_update_underway);
+				assert(non_tp_update_underway);	/* should have already determined update is underway */
+				/* 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.
+				 */
+				assertpro(non_tp_update_underway);
+				non_tp_update_underway = TRUE;	/* just in case */
+				update_underway = TRUE;		/* just in case */
 			}
 			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)
+			/* It is possible that we were in the midst of a non-TP commit for this region at or past Step (CMT13)
 			 * but first_cw_set is NULL. This is a case of duplicate SET with zero cw_set_depth. In this case,
-			 * 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.
+			 * don't have any cw-set-elements to commit. The only thing remaining to do is Step (CMT14) through
+			 * Step (CMT17) which is 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));	/* 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((FALSE == csa->t_commit_crit) || (T_COMMIT_CRIT_PHASE0 == csa->t_commit_crit)
+				|| (T_COMMIT_CRIT_PHASE1 == csa->t_commit_crit) || (T_COMMIT_CRIT_PHASE2 == csa->t_commit_crit));
 			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))
+			do     /* have a dummy loop to be able to use "break" for various codepaths below */
 			{
-				SECSHR_ACCOUNTING(6);
-				SECSHR_ACCOUNTING(__LINE__);
-				SECSHR_ACCOUNTING(csa->now_crit);
-				SECSHR_ACCOUNTING(csa->t_commit_crit);
-				SECSHR_ACCOUNTING(csd->trans_hist.early_tn);
-				SECSHR_ACCOUNTING(csd->trans_hist.curr_tn);
-				assert(non_tp_update_underway || tp_update_underway);
+				if (!csa->now_crit && !csa->t_commit_crit)
+					break;	/* Skip processing region in case of a multi-region TP transaction
+						 * where this region is already committed.
+						 */
+				SECSHR_ACCOUNTING(do_accounting, 6);
+				SECSHR_ACCOUNTING(do_accounting, __LINE__);
+				SECSHR_ACCOUNTING(do_accounting, csa->now_crit);
+				SECSHR_ACCOUNTING(do_accounting, csa->t_commit_crit);
+				SECSHR_ACCOUNTING(do_accounting, csd->trans_hist.early_tn);
+				SECSHR_ACCOUNTING(do_accounting, csd->trans_hist.curr_tn);
+				assert(non_tp_update_underway || tp_update_underway || ((NULL == first_cw_set) && is_exiting));
 				assert(!non_tp_update_underway || !tp_update_underway);
-				if (is_bg)
-				{
-					clru = (cache_rec_ptr_t)GDS_ANY_REL2ABS(csa, cnl->cur_lru_cache_rec_off);
-					lcnt = 0;
-				}
 				assert((T_COMMIT_CRIT_PHASE2 == csa->t_commit_crit) || csa->now_crit);
 				if (T_COMMIT_CRIT_PHASE1 == csa->t_commit_crit)
 				{	/* in PHASE1 so hold crit AND have noted down valid value in csa->prev_free_blks */
 					/* for normal termination we should not have been in the midst of commit */
-					assert((NORMAL_TERMINATION != secshr_state) || WBTEST_ENABLED(WBTEST_SLEEP_IN_WCS_WTSTART));
+					assert(!is_exiting || WBTEST_ENABLED(WBTEST_SLEEP_IN_WCS_WTSTART));
 					assert(csa->now_crit);
 					csd->trans_hist.free_blocks = csa->prev_free_blks;
 				}
-				SECSHR_ACCOUNTING(tp_update_underway ? 6 : 7);
-				SECSHR_ACCOUNTING(__LINE__);
-				SECSHR_ACCOUNTING((INTPTR_T)first_cw_set);
-				SECSHR_ACCOUNTING(tp_update_underway);
-				SECSHR_ACCOUNTING(non_tp_update_underway);
+				SECSHR_ACCOUNTING(do_accounting, tp_update_underway ? 6 : 7);
+				SECSHR_ACCOUNTING(do_accounting, __LINE__);
+				SECSHR_ACCOUNTING(do_accounting, (INTPTR_T)first_cw_set);
+				SECSHR_ACCOUNTING(do_accounting, tp_update_underway);
+				SECSHR_ACCOUNTING(do_accounting, non_tp_update_underway);
 				if (!tp_update_underway)
 				{
-					SECSHR_ACCOUNTING((INTPTR_T)cs_top);
-					SECSHR_ACCOUNTING(*cw_depth_addrs);
+					SECSHR_ACCOUNTING(do_accounting, (INTPTR_T)cs_top);
+					SECSHR_ACCOUNTING(do_accounting, cw_set_depth);
+					jrs = TREF(nontp_jbuf_rsrv);
 				} else
 				{
-					SECSHR_ACCOUNTING(si->cw_set_depth);
+					SECSHR_ACCOUNTING(do_accounting, si->cw_set_depth);
 					this_reg_commit_type = REG_COMMIT_UNSTARTED; /* assume GT.M did no commits in this region */
+					jrs = si->jbuf_rsrv_ptr;
 					/* Note that "this_reg_commit_type" is uninitialized if "tp_update_underway" is not TRUE
-					 * so should always be used within an "if (tp_update_underway)" */
+					 * so should always be used within an "if (tp_update_underway)".
+					 */
+				}
+				if (NEED_TO_FINISH_JNL_PHASE2(jrs))
+					FINISH_JNL_PHASE2_IN_JNLBUFF(csa, jrs);	/* Roll forward CMT16 */
+				if (NULL == first_cw_set)
+				{	/* This is a duplicate set (update_trans is TRUE, but cw_set is NULL).
+					 * OR we hold crit and are exiting. There is nothing to commit to the db.
+					 * Now that we finished jnl record writing, break.
+					 */
+					break;
+				}
+				if (is_bg)
+				{
+					clru = (cache_rec_ptr_t)GDS_ANY_REL2ABS(csa, cnl->cur_lru_cache_rec_off);
+					lcnt = 0;
 				}
 				/* 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 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;
-				else
+					if (dollar_tlevel && (T_COMMIT_CRIT_PHASE0 == csa->t_commit_crit))
+					{	/* This region is part of a TP transaction where another region got an error
+						 * inside PHASE1 but this region is still in PHASE0 (since this region is
+						 * later in the "first_tp_si_by_ftok" list order). Finish CMT08 & CMT09
+						 * stages for this region.
+						 */
+						cnl->update_underway_tn = currtn;	/* Roll forward CMT08 */
+						/* Note csa->t_commit_crit = T_COMMIT_CRIT_PHASE1 is also set in CMT08
+						 * but we do not do that here as that confuses code below and is anyways
+						 * a process-private flag that is not needed otherwise below.
+						 */
+						if (jnl_fence_ctl.replication && REPL_ALLOWED(csa))
+						{	/* Indication that this is an update to a replicated region
+							 * that bumps the journal seqno. So finish CMT09.
+							 * Note: In "tp_tend", the variable "supplementary" is TRUE if
+							 * "jnl_fence_ctl.strm_seqno" is non-zero. We use that here since
+							 * the local variable "supplementary" is not available here.
+							 */
+							strm_seqno = GET_STRM_SEQ60(jnl_fence_ctl.strm_seqno);
+#							ifdef DEBUG
+							assert(!jnl_fence_ctl.strm_seqno
+								|| ((INVALID_SUPPL_STRM != strm_index)
+									&& (GET_STRM_INDEX(jnl_fence_ctl.strm_seqno)
+													== strm_index)));
+							assert(jnlpool.jnlpool_dummy_reg->open);
+							repl_csa = REG2CSA(jnlpool.jnlpool_dummy_reg);
+							assert(repl_csa->now_crit);
+							/* see jnlpool_init() for relationship between critical and jpl */
+							jpl = (jnlpool_ctl_ptr_t)((sm_uc_ptr_t)repl_csa->critical
+											- JNLPOOL_CTL_SIZE);
+							assert(jpl->jnl_seqno == (jnl_fence_ctl.token + 1));
+							assert(!jnl_fence_ctl.strm_seqno
+									|| (jpl->strm_seqno[strm_index] == (strm_seqno + 1)));
+#							endif
+							SET_REG_SEQNO(csa, jnl_fence_ctl.token + 1, jnl_fence_ctl.strm_seqno,	\
+								strm_index, strm_seqno + 1, SKIP_ASSERT_FALSE); /* Step CMT09 */
+						}
+					}
+				} else
 				{
-					if (tp_update_underway)		/* otherwise currtn initialized above from start_tn_addrs */
+					if (tp_update_underway)		/* otherwise currtn initialized above from start_tn */
 						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))
+				for ( ; (tp_update_underway && (NULL != cs)) || (!tp_update_underway && (cs < cs_top));
+									cs = tp_update_underway ? orig_cs->next_cw_set : (cs + 1))
 				{
-					dont_reset_data_invalid = FALSE;
+					donot_reset_data_invalid = FALSE;
 					if (tp_update_underway)
 					{
 						orig_cs = cs;
-						if (cs && GTM_PROBE(SIZEOF(cw_set_element), cs, READ))
-						{
-							while (cs->high_tlevel)
-							{
-								if (GTM_PROBE(SIZEOF(cw_set_element),
-											cs->high_tlevel, READ))
-									cs = cs->high_tlevel;
-								else
-								{
-									SECSHR_ACCOUNTING(3);
-									SECSHR_ACCOUNTING(__LINE__);
-									SECSHR_ACCOUNTING((INTPTR_T)cs->high_tlevel);
-									assert(FALSE);
-									cs = NULL;
-									break;
-								}
-							}
-						}
-					}
-					if (!GTM_PROBE(SIZEOF(cw_set_element), cs, WRITE))
-					{
-						SECSHR_ACCOUNTING(3);
-						SECSHR_ACCOUNTING(__LINE__);
-						SECSHR_ACCOUNTING((INTPTR_T)cs);
-						assert(FALSE);
-						break;
+						TRAVERSE_TO_LATEST_CSE(cs);
 					}
 					if (gds_t_committed < cs->mode)
 					{
@@ -768,20 +593,19 @@ void secshr_db_clnup(enum secshr_db_state secshr_state)
 											get_new_free_element(si->new_buff_list);
 								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 */
 								if (FALSE == sec_shr_blk_build(csa, csd, is_bg, cs, blk_ptr,
 												currtn))
 								{
-									SECSHR_ACCOUNTING(10);
-									SECSHR_ACCOUNTING(__LINE__);
-									SECSHR_ACCOUNTING((INTPTR_T)cs);
-									SECSHR_ACCOUNTING(cs->blk);
-									SECSHR_ACCOUNTING(cs->level);
-									SECSHR_ACCOUNTING(cs->done);
-									SECSHR_ACCOUNTING(cs->forward_process);
-									SECSHR_ACCOUNTING(cs->first_copy);
-									SECSHR_ACCOUNTING((INTPTR_T)cs->upd_addr);
-									SECSHR_ACCOUNTING((INTPTR_T)cs->new_buff);
+									SECSHR_ACCOUNTING(do_accounting, 10);
+									SECSHR_ACCOUNTING(do_accounting, __LINE__);
+									SECSHR_ACCOUNTING(do_accounting, (INTPTR_T)cs);
+									SECSHR_ACCOUNTING(do_accounting, cs->blk);
+									SECSHR_ACCOUNTING(do_accounting, cs->level);
+									SECSHR_ACCOUNTING(do_accounting, cs->done);
+									SECSHR_ACCOUNTING(do_accounting, cs->forward_process);
+									SECSHR_ACCOUNTING(do_accounting, cs->first_copy);
+									SECSHR_ACCOUNTING(do_accounting, (INTPTR_T)cs->upd_addr);
+									SECSHR_ACCOUNTING(do_accounting, (INTPTR_T)cs->new_buff);
 									assert(FALSE);
 									continue;
 								} else if (cs->ins_off != 0)
@@ -791,13 +615,13 @@ void secshr_db_clnup(enum secshr_db_state secshr_state)
 										|| (cs->ins_off
 										 < (SIZEOF(blk_hdr) + SIZEOF(rec_hdr))))
 									{
-										SECSHR_ACCOUNTING(7);
-										SECSHR_ACCOUNTING(__LINE__);
-										SECSHR_ACCOUNTING((INTPTR_T)cs);
-										SECSHR_ACCOUNTING(cs->blk);
-										SECSHR_ACCOUNTING(cs->index);
-										SECSHR_ACCOUNTING(cs->ins_off);
-										SECSHR_ACCOUNTING(
+										SECSHR_ACCOUNTING(do_accounting, 7);
+										SECSHR_ACCOUNTING(do_accounting, __LINE__);
+										SECSHR_ACCOUNTING(do_accounting, (INTPTR_T)cs);
+										SECSHR_ACCOUNTING(do_accounting, cs->blk);
+										SECSHR_ACCOUNTING(do_accounting, cs->index);
+										SECSHR_ACCOUNTING(do_accounting, cs->ins_off);
+										SECSHR_ACCOUNTING(do_accounting,	\
 											((blk_hdr *)blk_ptr)->bsiz);
 										assert(FALSE);
 										continue;
@@ -812,23 +636,13 @@ void secshr_db_clnup(enum secshr_db_state secshr_state)
 										|| (&first_cw_set[cs->index] < cs));
 									chain.cw_index = cs->index;
 									chain.next_off = cs->next_off;
-									if (!(GTM_PROBE(SIZEOF(int4), chain_ptr, WRITE)))
-									{
-										SECSHR_ACCOUNTING(5);
-										SECSHR_ACCOUNTING(__LINE__);
-										SECSHR_ACCOUNTING((INTPTR_T)cs);
-										SECSHR_ACCOUNTING(cs->ins_off);
-										SECSHR_ACCOUNTING((INTPTR_T)chain_ptr);
-										assert(FALSE);
-										continue;
-									}
 									GET_LONGP(chain_ptr, &chain);
 									cs->ins_off = cs->next_off = 0;
 								}
 								cs->done = TRUE;
 								assert(NULL != cs->blk_target);
-								assert(NULL == gvt);
-								CERT_BLK_IF_NEEDED(certify_all_blocks, reg, cs, cs->new_buff, gvt);
+								CERT_BLK_IF_NEEDED(certify_all_blocks, reg,
+											cs, cs->new_buff, ((gv_namehead *)NULL));
 							}
 						}
 						cs->old_mode = (int4)cs->mode;
@@ -859,22 +673,11 @@ 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 != old_mode));
+						assert(!dollar_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))
-							{
-								SECSHR_ACCOUNTING(4);
-								SECSHR_ACCOUNTING(__LINE__);
-								SECSHR_ACCOUNTING((INTPTR_T)cs);
-								SECSHR_ACCOUNTING((INTPTR_T)cr);
-								assert(FALSE);
-							} else if (rundown_process_id == cr->in_tend)
-							{	/* Not sure how this is possible */
-								assert(FALSE);
-							}
-						} else
+							assert(process_id != cr->in_tend);
+						else
 						{	/* 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
@@ -892,7 +695,7 @@ void secshr_db_clnup(enum secshr_db_state secshr_state)
 					 */
 					set_wc_blocked = TRUE;
 					/* for normal termination we should not have been in the midst of commit */
-					assert((NORMAL_TERMINATION != secshr_state) || WBTEST_ENABLED(WBTEST_SLEEP_IN_WCS_WTSTART));
+					assert(!is_exiting || WBTEST_ENABLED(WBTEST_SLEEP_IN_WCS_WTSTART));
 					if (tp_update_underway)
 					{	/* Since the current cse has not been committed, this is a partial
 						 * GT.M commit in this region even if we have already seen committed cses.
@@ -913,24 +716,22 @@ void secshr_db_clnup(enum secshr_db_state secshr_state)
 									clru = start_cr;
 								assert(!clru->stopped);
 								if (!clru->stopped && (0 == clru->dirty)
-									&& (0 == clru->in_cw_set)
-									&& (!clru->in_tend)
-									&& (-1 == clru->read_in_progress)
-									&& GTM_PROBE(blk_size,
-										GDS_ANY_REL2ABS(csa, clru->buffaddr), WRITE))
+										&& (0 == clru->in_cw_set)
+										&& (!clru->in_tend)
+										&& (-1 == clru->read_in_progress))
 									break;
 							}
 							if (lcnt >= max_bts)
-							{
-								SECSHR_ACCOUNTING(9);
-								SECSHR_ACCOUNTING(__LINE__);
-								SECSHR_ACCOUNTING((INTPTR_T)cs);
-								SECSHR_ACCOUNTING(cs->blk);
-								SECSHR_ACCOUNTING(cs->tn);
-								SECSHR_ACCOUNTING(cs->level);
-								SECSHR_ACCOUNTING(cs->done);
-								SECSHR_ACCOUNTING(cs->forward_process);
-								SECSHR_ACCOUNTING(cs->first_copy);
+							{	/* Did not find space in global buffers to finish commit */
+								SECSHR_ACCOUNTING(do_accounting, 9);
+								SECSHR_ACCOUNTING(do_accounting, __LINE__);
+								SECSHR_ACCOUNTING(do_accounting, (INTPTR_T)cs);
+								SECSHR_ACCOUNTING(do_accounting, cs->blk);
+								SECSHR_ACCOUNTING(do_accounting, cs->tn);
+								SECSHR_ACCOUNTING(do_accounting, cs->level);
+								SECSHR_ACCOUNTING(do_accounting, cs->done);
+								SECSHR_ACCOUNTING(do_accounting, cs->forward_process);
+								SECSHR_ACCOUNTING(do_accounting, cs->first_copy);
 								assert(FALSE);
 								continue;
 							}
@@ -949,11 +750,9 @@ void secshr_db_clnup(enum secshr_db_state secshr_state)
 							{	/* Not a bitmap block, update clue history to reflect new cr */
 								assert((0 <= cs->level) && (MAX_BT_DEPTH > cs->level));
 								gvtarget = cs->blk_target;
-								assert((MAX_BT_DEPTH + 1)
-									== (SIZEOF(gvtarget->hist.h)
-										/ SIZEOF(gvtarget->hist.h[0])));
+								assert((MAX_BT_DEPTH + 1) == ARRAYSIZE(gvtarget->hist.h));
 								if ((0 <= cs->level) && (MAX_BT_DEPTH > cs->level)
-									&& GTM_PROBE(SIZEOF(gv_namehead), gvtarget, WRITE)
+									&& (NULL != gvtarget)
 									&& (0 != gvtarget->clue.end))
 								{
 									t1 = &gvtarget->hist.h[cs->level];
@@ -972,17 +771,8 @@ void secshr_db_clnup(enum secshr_db_state secshr_state)
 							 * phase2 yet. Use the picked out "cr" and finish phase2.
 							 */
 							cr = cs->cr;
-							if (!GTM_PROBE(SIZEOF(cache_rec), cr, WRITE))
-							{
-								SECSHR_ACCOUNTING(4);
-								SECSHR_ACCOUNTING(__LINE__);
-								SECSHR_ACCOUNTING((INTPTR_T)cs);
-								SECSHR_ACCOUNTING((INTPTR_T)cr);
-								assert(FALSE);
-								continue;
-							}
-							assert(rundown_process_id == cr->in_tend);
-							assert(rundown_process_id == cr->in_cw_set);
+							assert(process_id == cr->in_tend);
+							assert(process_id == cr->in_cw_set);
 							assert(cr->blk == cs->cr->blk);
 							if (cr->data_invalid)
 							{	/* Buffer is already in middle of update. Since blk builds are
@@ -992,16 +782,16 @@ void secshr_db_clnup(enum secshr_db_state secshr_state)
 								 * chance of resulting in a clean block. Make sure data_invalid
 								 * flag is set until the next cache-recovery (wcs_recover will
 								 * send a DBDANGER syslog message for this block to alert of
-								 * potential database damage) by setting dont_reset_data_invalid.
+								 * potential database damage) by setting donot_reset_data_invalid.
 								 */
-								SECSHR_ACCOUNTING(6);
-								SECSHR_ACCOUNTING(__LINE__);
-								SECSHR_ACCOUNTING((INTPTR_T)cs);
-								SECSHR_ACCOUNTING((INTPTR_T)cr);
-								SECSHR_ACCOUNTING(cr->blk);
-								SECSHR_ACCOUNTING(cr->data_invalid);
+								SECSHR_ACCOUNTING(do_accounting, 6);
+								SECSHR_ACCOUNTING(do_accounting, __LINE__);
+								SECSHR_ACCOUNTING(do_accounting, (INTPTR_T)cs);
+								SECSHR_ACCOUNTING(do_accounting, (INTPTR_T)cr);
+								SECSHR_ACCOUNTING(do_accounting, cr->blk);
+								SECSHR_ACCOUNTING(do_accounting, cr->data_invalid);
 								assert(FALSE);
-								dont_reset_data_invalid = TRUE;
+								donot_reset_data_invalid = TRUE;
 							}
 						}
 						/* Check if online backup is in progress and if there is a before-image to write.
@@ -1055,9 +845,7 @@ void secshr_db_clnup(enum secshr_db_state secshr_state)
 								if (gds_t_acquired == cs->mode)
 								{
 									if (GDSV4 == csd->desired_db_format)
-									{
 										INCR_BLKS_TO_UPGRD(csa, csd, 1);
-									}
 								} else
 								{
 #									ifdef DEBUG
@@ -1068,12 +856,12 @@ void secshr_db_clnup(enum secshr_db_state secshr_state)
 									 * block, then that cr's ondsk_blkver matches with the cs.
 									 * db_csh_get uses the global variable cs_addrs to determine
 									 * the region. So make it uptodate temporarily holding its
-									 * value in the local variable csaddrs.
+									 * value in the local variable tmp_csa.
 									 */
-									csaddrs = cs_addrs;	/* save cs_addrs in local */
+									tmp_csa = cs_addrs;	/* save cs_addrs in local */
 									cs_addrs = csa;		/* set cs_addrs for db_csh_get */
 									actual_cr = db_csh_get(cs->blk);
-									cs_addrs = csaddrs;	/* restore cs_addrs */
+									cs_addrs = tmp_csa;	/* restore cs_addrs */
 									/* 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
@@ -1110,52 +898,24 @@ void secshr_db_clnup(enum secshr_db_state secshr_state)
 					} else
 					{	/* access method is MM */
 						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(blk_size);
-							SECSHR_ACCOUNTING((INTPTR_T)(MM_BASE_ADDR(csa)));
-							assert(FALSE);
-							continue;
-						}
 					}
-					/* The following block of code rolls forward steps (6a) and/or (13) of the commit */
+					/* The following block of code rolls forward Step (CMT10) and/or Step (CMT18) */
 					if (cs->mode == gds_t_writemap)
 					{
-						if (!GTM_PROBE(blk_size, cs->old_block, READ))
-						{
-							SECSHR_ACCOUNTING(11);
-							SECSHR_ACCOUNTING(__LINE__);
-							SECSHR_ACCOUNTING((INTPTR_T)cs);
-							SECSHR_ACCOUNTING(cs->blk);
-							SECSHR_ACCOUNTING(cs->tn);
-							SECSHR_ACCOUNTING(cs->level);
-							SECSHR_ACCOUNTING(cs->done);
-							SECSHR_ACCOUNTING(cs->forward_process);
-							SECSHR_ACCOUNTING(cs->first_copy);
-							SECSHR_ACCOUNTING((INTPTR_T)cs->old_block);
-							SECSHR_ACCOUNTING(blk_size);
-							assert(FALSE);
-							continue;
-						}
 						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__);
-							SECSHR_ACCOUNTING((INTPTR_T)cs);
-							SECSHR_ACCOUNTING(cs->blk);
-							SECSHR_ACCOUNTING(cs->tn);
-							SECSHR_ACCOUNTING(cs->level);
-							SECSHR_ACCOUNTING(cs->done);
-							SECSHR_ACCOUNTING(cs->forward_process);
-							SECSHR_ACCOUNTING(cs->first_copy);
-							SECSHR_ACCOUNTING((INTPTR_T)cs->upd_addr);
-							SECSHR_ACCOUNTING((INTPTR_T)blk_ptr);
+							SECSHR_ACCOUNTING(do_accounting, 11);
+							SECSHR_ACCOUNTING(do_accounting, __LINE__);
+							SECSHR_ACCOUNTING(do_accounting, (INTPTR_T)cs);
+							SECSHR_ACCOUNTING(do_accounting, cs->blk);
+							SECSHR_ACCOUNTING(do_accounting, cs->tn);
+							SECSHR_ACCOUNTING(do_accounting, cs->level);
+							SECSHR_ACCOUNTING(do_accounting, cs->done);
+							SECSHR_ACCOUNTING(do_accounting, cs->forward_process);
+							SECSHR_ACCOUNTING(do_accounting, cs->first_copy);
+							SECSHR_ACCOUNTING(do_accounting, (INTPTR_T)cs->upd_addr);
+							SECSHR_ACCOUNTING(do_accounting, (INTPTR_T)blk_ptr);
 							assert(FALSE);
 							continue;
 						}
@@ -1165,16 +925,16 @@ void secshr_db_clnup(enum secshr_db_state secshr_state)
 						{
 							if (FALSE == sec_shr_blk_build(csa, csd, is_bg, cs, blk_ptr, currtn))
 							{
-								SECSHR_ACCOUNTING(10);
-								SECSHR_ACCOUNTING(__LINE__);
-								SECSHR_ACCOUNTING((INTPTR_T)cs);
-								SECSHR_ACCOUNTING(cs->blk);
-								SECSHR_ACCOUNTING(cs->level);
-								SECSHR_ACCOUNTING(cs->done);
-								SECSHR_ACCOUNTING(cs->forward_process);
-								SECSHR_ACCOUNTING(cs->first_copy);
-								SECSHR_ACCOUNTING((INTPTR_T)cs->upd_addr);
-								SECSHR_ACCOUNTING((INTPTR_T)blk_ptr);
+								SECSHR_ACCOUNTING(do_accounting, 10);
+								SECSHR_ACCOUNTING(do_accounting, __LINE__);
+								SECSHR_ACCOUNTING(do_accounting, (INTPTR_T)cs);
+								SECSHR_ACCOUNTING(do_accounting, cs->blk);
+								SECSHR_ACCOUNTING(do_accounting, cs->level);
+								SECSHR_ACCOUNTING(do_accounting, cs->done);
+								SECSHR_ACCOUNTING(do_accounting, cs->forward_process);
+								SECSHR_ACCOUNTING(do_accounting, cs->first_copy);
+								SECSHR_ACCOUNTING(do_accounting, (INTPTR_T)cs->upd_addr);
+								SECSHR_ACCOUNTING(do_accounting, (INTPTR_T)blk_ptr);
 								assert(FALSE);
 								continue;
 							} else if (cs->ins_off)
@@ -1184,20 +944,21 @@ void secshr_db_clnup(enum secshr_db_state secshr_state)
 									|| (cs->ins_off < (SIZEOF(blk_hdr)
 										+ SIZEOF(rec_hdr)))
 									|| (0 > (short)cs->index)
-									|| ((cs - cw_set_addrs) <= cs->index))
+									|| ((cs - cw_set) <= cs->index))
 								{
-									SECSHR_ACCOUNTING(7);
-									SECSHR_ACCOUNTING(__LINE__);
-									SECSHR_ACCOUNTING((INTPTR_T)cs);
-									SECSHR_ACCOUNTING(cs->blk);
-									SECSHR_ACCOUNTING(cs->index);
-									SECSHR_ACCOUNTING(cs->ins_off);
-									SECSHR_ACCOUNTING(((blk_hdr *)blk_ptr)->bsiz);
+									SECSHR_ACCOUNTING(do_accounting, 7);
+									SECSHR_ACCOUNTING(do_accounting, __LINE__);
+									SECSHR_ACCOUNTING(do_accounting, (INTPTR_T)cs);
+									SECSHR_ACCOUNTING(do_accounting, cs->blk);
+									SECSHR_ACCOUNTING(do_accounting, cs->index);
+									SECSHR_ACCOUNTING(do_accounting, cs->ins_off);
+									SECSHR_ACCOUNTING(do_accounting,		\
+											((blk_hdr *)blk_ptr)->bsiz);
 									assert(FALSE);
 									continue;
 								}
 								PUT_LONG((blk_ptr + cs->ins_off),
-								 ((cw_set_element *)(cw_set_addrs + cs->index))->blk);
+									((cw_set_element *)(cw_set + cs->index))->blk);
 								if (((nxt = cs + 1) < cs_top)
 									&& (gds_t_write_root == nxt->mode))
 								{
@@ -1206,22 +967,22 @@ void secshr_db_clnup(enum secshr_db_state secshr_state)
 										|| (nxt->ins_off < (SIZEOF(blk_hdr)
 											 + SIZEOF(rec_hdr)))
 										|| (0 > (short)nxt->index)
-										|| ((cs - cw_set_addrs) <= nxt->index))
+										|| ((cs - cw_set) <= nxt->index))
 									{
-										SECSHR_ACCOUNTING(7);
-										SECSHR_ACCOUNTING(__LINE__);
-										SECSHR_ACCOUNTING((INTPTR_T)nxt);
-										SECSHR_ACCOUNTING(cs->blk);
-										SECSHR_ACCOUNTING(nxt->index);
-										SECSHR_ACCOUNTING(nxt->ins_off);
-										SECSHR_ACCOUNTING(
+										SECSHR_ACCOUNTING(do_accounting, 7);
+										SECSHR_ACCOUNTING(do_accounting, __LINE__);
+										SECSHR_ACCOUNTING(do_accounting, (INTPTR_T)nxt);
+										SECSHR_ACCOUNTING(do_accounting, cs->blk);
+										SECSHR_ACCOUNTING(do_accounting, nxt->index);
+										SECSHR_ACCOUNTING(do_accounting, nxt->ins_off);
+										SECSHR_ACCOUNTING(do_accounting,
 											((blk_hdr *)blk_ptr)->bsiz);
 										assert(FALSE);
 										continue;
 									}
 									PUT_LONG((blk_ptr + nxt->ins_off),
 										 ((cw_set_element *)
-										 (cw_set_addrs + nxt->index))->blk);
+										 (cw_set + nxt->index))->blk);
 								}
 							}
 						} else
@@ -1231,16 +992,16 @@ void secshr_db_clnup(enum secshr_db_state secshr_state)
 								if (FALSE == sec_shr_blk_build(csa, csd, is_bg, cs, blk_ptr,
 												currtn))
 								{
-									SECSHR_ACCOUNTING(10);
-									SECSHR_ACCOUNTING(__LINE__);
-									SECSHR_ACCOUNTING((INTPTR_T)cs);
-									SECSHR_ACCOUNTING(cs->blk);
-									SECSHR_ACCOUNTING(cs->level);
-									SECSHR_ACCOUNTING(cs->done);
-									SECSHR_ACCOUNTING(cs->forward_process);
-									SECSHR_ACCOUNTING(cs->first_copy);
-									SECSHR_ACCOUNTING((INTPTR_T)cs->upd_addr);
-									SECSHR_ACCOUNTING((INTPTR_T)blk_ptr);
+									SECSHR_ACCOUNTING(do_accounting, 10);
+									SECSHR_ACCOUNTING(do_accounting, __LINE__);
+									SECSHR_ACCOUNTING(do_accounting, (INTPTR_T)cs);
+									SECSHR_ACCOUNTING(do_accounting, cs->blk);
+									SECSHR_ACCOUNTING(do_accounting, cs->level);
+									SECSHR_ACCOUNTING(do_accounting, cs->done);
+									SECSHR_ACCOUNTING(do_accounting, cs->forward_process);
+									SECSHR_ACCOUNTING(do_accounting, cs->first_copy);
+									SECSHR_ACCOUNTING(do_accounting, (INTPTR_T)cs->upd_addr);
+									SECSHR_ACCOUNTING(do_accounting, (INTPTR_T)blk_ptr);
 									assert(FALSE);
 									continue;
 								}
@@ -1252,13 +1013,13 @@ void secshr_db_clnup(enum secshr_db_state secshr_state)
 										|| (cs->ins_off
 										 < (SIZEOF(blk_hdr) + SIZEOF(rec_hdr))))
 									{
-										SECSHR_ACCOUNTING(7);
-										SECSHR_ACCOUNTING(__LINE__);
-										SECSHR_ACCOUNTING((INTPTR_T)cs);
-										SECSHR_ACCOUNTING(cs->blk);
-										SECSHR_ACCOUNTING(cs->index);
-										SECSHR_ACCOUNTING(cs->ins_off);
-										SECSHR_ACCOUNTING(
+										SECSHR_ACCOUNTING(do_accounting, 7);
+										SECSHR_ACCOUNTING(do_accounting, __LINE__);
+										SECSHR_ACCOUNTING(do_accounting, (INTPTR_T)cs);
+										SECSHR_ACCOUNTING(do_accounting, cs->blk);
+										SECSHR_ACCOUNTING(do_accounting, cs->index);
+										SECSHR_ACCOUNTING(do_accounting, cs->ins_off);
+										SECSHR_ACCOUNTING(do_accounting,	\
 											((blk_hdr *)blk_ptr)->bsiz);
 										assert(FALSE);
 										continue;
@@ -1286,28 +1047,31 @@ void secshr_db_clnup(enum secshr_db_state secshr_state)
 								{
 									GET_LONGP(&chain, chain_ptr);
 									if ((1 == chain.flag)
-									   && ((chain_ptr - blk_ptr + SIZEOF(block_id))
-										  <= ((blk_hdr *)blk_ptr)->bsiz)
-									   && (chain.cw_index < si->cw_set_depth)
-									   && (FALSE != secshr_tp_get_cw(
-									      first_cw_set, chain.cw_index, &cs_ptr)))
+										&& ((chain_ptr - blk_ptr + SIZEOF(block_id))
+											<= ((blk_hdr *)blk_ptr)->bsiz)
+										&& (chain.cw_index < si->cw_set_depth))
 									{
+										save_si = sgm_info_ptr;
+										sgm_info_ptr = si;	/* needed by "tp_get_cw" */
+										tp_get_cw(first_cw_set, chain.cw_index, &cs_ptr);
+										sgm_info_ptr = save_si;
 										PUT_LONG(chain_ptr, cs_ptr->blk);
 										if (0 == chain.next_off)
 											break;
 									} else
 									{
-										SECSHR_ACCOUNTING(11);
-										SECSHR_ACCOUNTING(__LINE__);
-										SECSHR_ACCOUNTING((INTPTR_T)cs);
-										SECSHR_ACCOUNTING(cs->blk);
-										SECSHR_ACCOUNTING(cs->index);
-										SECSHR_ACCOUNTING((INTPTR_T)blk_ptr);
-										SECSHR_ACCOUNTING((INTPTR_T)chain_ptr);
-										SECSHR_ACCOUNTING(chain.next_off);
-										SECSHR_ACCOUNTING(chain.cw_index);
-										SECSHR_ACCOUNTING(si->cw_set_depth);
-										SECSHR_ACCOUNTING(
+										SECSHR_ACCOUNTING(do_accounting, 11);
+										SECSHR_ACCOUNTING(do_accounting, __LINE__);
+										SECSHR_ACCOUNTING(do_accounting, (INTPTR_T)cs);
+										SECSHR_ACCOUNTING(do_accounting, cs->blk);
+										SECSHR_ACCOUNTING(do_accounting, cs->index);
+										SECSHR_ACCOUNTING(do_accounting, (INTPTR_T)blk_ptr);
+										SECSHR_ACCOUNTING(do_accounting,	\
+												(INTPTR_T)chain_ptr);
+										SECSHR_ACCOUNTING(do_accounting, chain.next_off);
+										SECSHR_ACCOUNTING(do_accounting, chain.cw_index);
+										SECSHR_ACCOUNTING(do_accounting, si->cw_set_depth);
+										SECSHR_ACCOUNTING(do_accounting,	\
 											((blk_hdr *)blk_ptr)->bsiz);
 										assert(FALSE);
 										break;
@@ -1319,9 +1083,7 @@ void secshr_db_clnup(enum secshr_db_state secshr_state)
 					if (0 > cs->reference_cnt)
 					{	/* blocks were freed up */
 						assert(non_tp_update_underway);
-						assert((&inctn_opcode == inctn_opcode_addrs)
-							&& (&inctn_detail == inctn_detail_addrs)
-							&& ((inctn_bmp_mark_free_gtm == inctn_opcode)
+						assert(((inctn_bmp_mark_free_gtm == inctn_opcode)
 								|| (inctn_bmp_mark_free_mu_reorg == inctn_opcode)
 								|| (inctn_blkmarkfree == inctn_opcode)
 								|| dse_running));
@@ -1329,16 +1091,10 @@ void secshr_db_clnup(enum secshr_db_state secshr_state)
 						 * 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).
 						 */
-						if ((NULL != inctn_opcode_addrs)
-							&& (GTM_PROBE(SIZEOF(*inctn_opcode_addrs), inctn_opcode_addrs, READ))
-							&& ((inctn_bmp_mark_free_gtm == *inctn_opcode_addrs)
-								|| (inctn_bmp_mark_free_mu_reorg == *inctn_opcode_addrs))
-							&& (NULL != inctn_detail_addrs)
-							&& (GTM_PROBE(SIZEOF(*inctn_detail_addrs), inctn_detail_addrs, READ))
-							&& (0 != inctn_detail_addrs->blknum_struct.blknum))
-						{
+						if (((inctn_bmp_mark_free_gtm == inctn_opcode)
+								|| (inctn_bmp_mark_free_mu_reorg == inctn_opcode))
+								&& (0 != inctn_detail.blknum_struct.blknum))
 							DECR_BLKS_TO_UPGRD(csa, csd, 1);
-						}
 					}
 					assert(!cs->reference_cnt || (T_COMMIT_CRIT_PHASE2 != csa->t_commit_crit));
 					if (csa->now_crit)
@@ -1356,67 +1112,68 @@ void secshr_db_clnup(enum secshr_db_state secshr_state)
 					}
 					cs->old_mode = (int4)cs->mode;
 					assert(0 < cs->old_mode);
-					cs->mode = gds_t_committed;	/* rolls forward step (14) */
-					assert(NULL == gvt);
-					CERT_BLK_IF_NEEDED(certify_all_blocks, reg, cs, blk_ptr, gvt);
-					if (is_bg && (rundown_process_id == cr->in_tend))
+					cs->mode = gds_t_committed;	/* rolls forward Step (CMT18) */
+					/* 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.
+					 */
+					CERT_BLK_IF_NEEDED(certify_all_blocks, reg, cs, blk_ptr, ((gv_namehead *)NULL));
+					if (is_bg && (process_id == cr->in_tend))
 					{	/* 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.
 						 */
-						if (!dont_reset_data_invalid)
+						if (!donot_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".
-							 */
-							/* Avoid using gv_cur_region in the LOCK_HIST macro that is
-							 * used by the RELEASE_BUFF_UPDATE_LOCK macro by setting locknl
+						/* Release write interlock. The following code is very similar to that
+						 * at the end of the function "bg_update_phase2".
+						 */
+						/* 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));
+							/* cache-record was not dirty BEFORE this update.
+							 * insert this in the active queue.
 							 */
-							locknl = cnl;
-							if (!cr->tn)
+							n = INSQTI((que_ent_ptr_t)&cr->state_que,
+									(que_head_ptr_t)&cache_state->cacheq_active);
+							if (INTERLOCK_FAIL == n)
 							{
-								cr->jnl_addr = cs->jnl_freeaddr;
-								assert(LATCH_SET == WRITE_LATCH_VAL(cr));
-								/* cache-record was not dirty BEFORE this update.
-								 * insert this in the active queue.
-								 */
-								n = INSQTI((que_ent_ptr_t)&cr->state_que,
-										(que_head_ptr_t)&cache_state->cacheq_active);
-								if (INTERLOCK_FAIL == n)
-								{
-									SECSHR_ACCOUNTING(7);
-									SECSHR_ACCOUNTING(__LINE__);
-									SECSHR_ACCOUNTING((INTPTR_T)cr);
-									SECSHR_ACCOUNTING(cr->blk);
-									SECSHR_ACCOUNTING(n);
-									SECSHR_ACCOUNTING(cache_state->cacheq_active.fl);
-									SECSHR_ACCOUNTING(cache_state->cacheq_active.bl);
-									assert(FALSE);
-								}
-								ADD_ENT_TO_ACTIVE_QUE_CNT(cnl);
+								SECSHR_ACCOUNTING(do_accounting, 7);
+								SECSHR_ACCOUNTING(do_accounting, __LINE__);
+								SECSHR_ACCOUNTING(do_accounting, (INTPTR_T)cr);
+								SECSHR_ACCOUNTING(do_accounting, cr->blk);
+								SECSHR_ACCOUNTING(do_accounting, n);
+								SECSHR_ACCOUNTING(do_accounting, cache_state->cacheq_active.fl);
+								SECSHR_ACCOUNTING(do_accounting, cache_state->cacheq_active.bl);
+								assert(FALSE);
 							}
-							RELEASE_BUFF_UPDATE_LOCK(cr, n, &cnl->db_latch);
-							/* "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))
+							ADD_ENT_TO_ACTIVE_QUE_CNT(cnl);
+						}
+						RELEASE_BUFF_UPDATE_LOCK(cr, n, &cnl->db_latch);
+						/* "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))
+						{
+							n = INSQHI((que_ent_ptr_t)&cr->state_que,
+									(que_head_ptr_t)&cache_state->cacheq_active);
+							if (INTERLOCK_FAIL == n)
 							{
-								n = INSQHI((que_ent_ptr_t)&cr->state_que,
-										(que_head_ptr_t)&cache_state->cacheq_active);
-								if (INTERLOCK_FAIL == n)
-								{
-									SECSHR_ACCOUNTING(7);
-									SECSHR_ACCOUNTING(__LINE__);
-									SECSHR_ACCOUNTING((INTPTR_T)cr);
-									SECSHR_ACCOUNTING(cr->blk);
-									SECSHR_ACCOUNTING(n);
-									SECSHR_ACCOUNTING(cache_state->cacheq_active.fl);
-									SECSHR_ACCOUNTING(cache_state->cacheq_active.bl);
-									assert(FALSE);
-								}
+								SECSHR_ACCOUNTING(do_accounting, 7);
+								SECSHR_ACCOUNTING(do_accounting, __LINE__);
+								SECSHR_ACCOUNTING(do_accounting, (INTPTR_T)cr);
+								SECSHR_ACCOUNTING(do_accounting, cr->blk);
+								SECSHR_ACCOUNTING(do_accounting, n);
+								SECSHR_ACCOUNTING(do_accounting, cache_state->cacheq_active.fl);
+								SECSHR_ACCOUNTING(do_accounting, cache_state->cacheq_active.bl);
+								assert(FALSE);
 							}
 						}
 						RESET_CR_IN_TEND_AFTER_PHASE2_COMMIT(cr); /* resets cr->in_tend & cr->in_cw_set
@@ -1457,23 +1214,11 @@ void secshr_db_clnup(enum secshr_db_state secshr_state)
 					assert((REG_COMMIT_COMPLETE == this_reg_commit_type)
 						|| (REG_COMMIT_PARTIAL == this_reg_commit_type)
 						|| (REG_COMMIT_UNSTARTED == this_reg_commit_type));
-					/* We have already checked that "si" is READABLE. Check that it is WRITABLE since
-					 * we might need to set "si->kip_csa" in the PROBE_INCR_KIP macro.
-					 */
-					if (GTM_PROBE(SIZEOF(sgm_info), si, WRITE))
-					{
-						kip_csa_usable = TRUE;
-						/* Take this opportunity to reset si->cr_array_index */
-						si->cr_array_index = 0;
-					} else
-					{
-						kip_csa_usable = FALSE;
-						assert(FALSE);
-					}
+					si->cr_array_index = 0; /* Take this opportunity to reset si->cr_array_index */
 					if (REG_COMMIT_COMPLETE != this_reg_commit_type)
 					{
-						if (kip_csa_usable && (NULL != si->kill_set_head) && (NULL == si->kip_csa))
-							PROBE_INCR_KIP(csd, csa, si->kip_csa);
+						if ((NULL != si->kill_set_head) && (NULL == si->kip_csa))
+							INCR_KIP(csd, csa, si->kip_csa);
 					} else
 						assert((NULL == si->kill_set_head) || (NULL != si->kip_csa));
 					assert((NULL == si->kill_set_head) || (NULL != si->kip_csa));
@@ -1481,30 +1226,19 @@ void secshr_db_clnup(enum secshr_db_state secshr_state)
 				{	/* 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
+					/* Note that kip_csa 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.
 					 */
-					kip_csa_usable =
-						(GTM_PROBE(SIZEOF(*kip_csa_addrs), kip_csa_addrs, WRITE))
-							? TRUE : FALSE;
-					assert(kip_csa_usable);
-					if (GTM_PROBE(SIZEOF(*need_kip_incr_addrs), need_kip_incr_addrs, WRITE))
-						needkipincr = *need_kip_incr_addrs;
-					else
+					if (need_kip_incr && (NULL == kip_csa))
 					{
-						needkipincr = FALSE;
-						assert(FALSE);
-					}
-					if (needkipincr && kip_csa_usable && (NULL == *kip_csa_addrs))
-					{
-						PROBE_INCR_KIP(csd, csa, *kip_csa_addrs);
-						*need_kip_incr_addrs = FALSE;
+						INCR_KIP(csd, csa, kip_csa);
+						need_kip_incr = FALSE;
 					}
 					if (MUSWP_INCR_ROOT_CYCLE == TREF(in_mu_swap_root_state))
 						cnl->root_search_cycle++;
 				}
-			}	/* if (NULL != first_cw_set) */
+			} while (FALSE);
 			/* If the process is about to exit AND any kills are in progress (bitmap freeup phase of kill), mark
 			 * kill_in_prog as abandoned. Non-TP and TP maintain kill_in_prog information in different structures
 			 * so access them appropriately. Note that even for a TP transaction, the bitmap freeup happens as a
@@ -1512,86 +1246,48 @@ void secshr_db_clnup(enum secshr_db_state secshr_state)
 			 * Thankfully first_sgm_info is guaranteed to be non-NULL in the case of a TP transaction that is
 			 * temporarily running its bitmap freeup phase as a non-TP transaction. And for true non-TP
 			 * transactions, first_sgm_info is guaranteed to be NULL. So we use this for the determination.
-			 * But this global variable value is obtained by dereferencing first_sgm_info_addrs (due to the way
-			 * GTMSECSHR runs as a separate privileged image in VMS). If the probe of first_sgm_info_addrs does
-			 * not succeed (due to some corruption), then we have no clue about the nullness of first_sgm_info.
-			 * Therefore we also check for dlr_tlevel also since if that is TRUE, we are guaranteed it is a TP
-			 * transaction irrespective of the value of first_sgm_info. Note that we store the value of the global
-			 * variable first_sgm_info in a local variable firsgsgminfo (slightly different name) for clarity sake.
 			 */
 			if (is_exiting)
 			{
-				if (GTM_PROBE(SIZEOF(*first_sgm_info_addrs), first_sgm_info_addrs, READ))
-					firstsgminfo = *first_sgm_info_addrs;
-				else
-				{
-					assert(FALSE);
-					firstsgminfo = NULL;
-				}
-				if (dlr_tlevel || (NULL != firstsgminfo))
+				if (NULL != first_sgm_info)
 				{
 					si = csa->sgm_info_ptr;
 					/* Note that it is possible "si" is NULL in case of a GTM-E-MEMORY error in gvcst_init.
 					 * Handle that accordingly in the code below.
 					 */
-					kip_csa_usable = (GTM_PROBE(SIZEOF(sgm_info), si, WRITE)) ? TRUE : FALSE;
 					/* Since the kill process cannot be completed, we need to decerement KIP count
 					 * and increment the abandoned_kills count.
 					 */
-					if (kip_csa_usable && (NULL != si->kill_set_head) && (NULL != si->kip_csa))
+					if ((NULL != si->kill_set_head) && (NULL != si->kip_csa))
 					{
 						assert(csa == si->kip_csa);
-						PROBE_DECR_KIP(csd, csa, si->kip_csa);
-						PROBE_INCR_ABANDONED_KILLS(csd, csa);
+						DECR_KIP(csd, csa, si->kip_csa);
+						INCR_ABANDONED_KILLS(csd, csa);
 					} else
 						assert((NULL == si) || (NULL == si->kill_set_head) || (NULL == si->kip_csa));
-				} else if (!dlr_tlevel)
+				} else if (!dollar_tlevel)
 				{
-					kip_csa_usable =
-						(GTM_PROBE(SIZEOF(*kip_csa_addrs), kip_csa_addrs, WRITE))
-						? TRUE : FALSE;
-					assert(kip_csa_usable);
-					if (kip_csa_usable && (NULL != *kip_csa_addrs) && (csa == *kip_csa_addrs))
+					if ((NULL != kip_csa) && (csa == kip_csa))
 					{
-						assert(0 < (*kip_csa_addrs)->hdr->kill_in_prog);
-						PROBE_DECR_KIP(csd, csa, *kip_csa_addrs);
-						PROBE_INCR_ABANDONED_KILLS(csd, csa);
+						assert(0 < kip_csa->hdr->kill_in_prog);
+						DECR_KIP(csd, csa, kip_csa);
+						INCR_ABANDONED_KILLS(csd, csa);
 					}
 				}
 			}
-			if (JNL_ENABLED(csd))
+			if (JNL_ENABLED(csd) && is_exiting)
 			{
-				if (GTM_PROBE(SIZEOF(jnl_private_control), csa->jnl, WRITE))
-				{
-					jbp = csa->jnl->jnl_buff;
-					if (GTM_PROBE(SIZEOF(jnl_buffer), jbp, WRITE) && is_exiting)
-					{
-						SALVAGE_UNIX_LATCH(&jbp->fsync_in_prog_latch, is_exiting);
-						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;
-							}
-							RELEASE_SWAPLOCK(&jbp->io_in_prog_latch);
-						}
-						if (jbp->blocked == rundown_process_id)
-						{
-							assert(csa->now_crit);
-							jbp->blocked = 0;
-						}
-					}
-				} else
+				jbp = csa->jnl->jnl_buff;
+				RELEASE_LATCH_IF_OWNER_AND_EXITING(&jbp->fsync_in_prog_latch, is_exiting);
+				if (jbp->io_in_prog_latch.u.parts.latch_pid == process_id)
+					RELEASE_SWAPLOCK(&jbp->io_in_prog_latch);
+				if (jbp->blocked == process_id)
 				{
-					SECSHR_ACCOUNTING(4);
-					SECSHR_ACCOUNTING(__LINE__);
-					SECSHR_ACCOUNTING((INTPTR_T)csa->jnl);
-					SECSHR_ACCOUNTING(SIZEOF(jnl_private_control));
-					assert(FALSE);
+					assert(csa->now_crit);
+					jbp->blocked = 0;
 				}
 			}
-			if (is_exiting && csa->freeze && csd->freeze == rundown_process_id && !csa->persistent_freeze)
+			if (is_exiting && csa->freeze && csd->freeze == process_id && !csa->persistent_freeze)
 			{
 				csd->image_count = 0;
 				csd->freeze = 0;
@@ -1622,69 +1318,55 @@ void secshr_db_clnup(enum secshr_db_state secshr_state)
 					BG_TRACE_PRO_ANY(csa, wcb_secshr_db_clnup_phase2_clnup);
 				}
 				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));
+					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)
-				PROBE_DECR_WCS_PHASE2_COMMIT_PIDCNT(csa, cnl);
+				DECR_WCS_PHASE2_COMMIT_PIDCNT(csa, cnl);
 			if (csa->now_crit)
 			{
 				if (csd->trans_hist.curr_tn == csd->trans_hist.early_tn - 1)
 				{	/* there can be at most one region in non-TP with different curr_tn and early_tn */
 					assert(!non_tp_update_underway || first_time);
 					/* for normal termination we should not have been in the midst of commit */
-					assert((NORMAL_TERMINATION != secshr_state)
-						|| WBTEST_ENABLED(WBTEST_JNL_CREATE_FAIL)
+					assert(!is_exiting || WBTEST_ENABLED(WBTEST_JNL_CREATE_FAIL)
 						|| 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) */
+						INCREMENT_CURR_TN(csd);	/* roll forward Step (CMT12) */
 					else
 						csd->trans_hist.early_tn = csd->trans_hist.curr_tn;
 				}
 				assert(csd->trans_hist.early_tn == csd->trans_hist.curr_tn);
-				if (GTM_PROBE(CRIT_SPACE(NUM_CRIT_ENTRY(csd)), csa->critical, WRITE))
-				{
-					/* ONLINE ROLLBACK can come here holding crit ONLY due to commit errors but NOT during
-					 * process exiting as secshr_db_clnup during process exiting is always preceded by
-					 * mur_close_files which does the rel_crit anyways. Assert that.
+				/* ONLINE ROLLBACK can come here holding crit ONLY due to commit errors but NOT during
+				 * process exiting as secshr_db_clnup during process exiting is always preceded by
+				 * mur_close_files which does the rel_crit anyways. Assert that.
+				 */
+				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.
 					 */
-					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.
-						 */
-						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;
-						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
-				{
-					SECSHR_ACCOUNTING(6);
-					SECSHR_ACCOUNTING(__LINE__);
-					SECSHR_ACCOUNTING((INTPTR_T)cnl);
-					SECSHR_ACCOUNTING(NODE_LOCAL_SIZE_DBS);
-					SECSHR_ACCOUNTING((INTPTR_T)csa->critical);
-					SECSHR_ACCOUNTING(CRIT_SPACE(NUM_CRIT_ENTRY(csd)));
-					assert(FALSE);
+					assert(0 == crit_count);
+					crit_count++;	/* prevent interrupts */
+					CRIT_TRACE(crit_ops_rw); /* see gdsbt.h for comment on placement */
+					if (cnl->in_crit == process_id)
+						cnl->in_crit = 0;
+					csa->hold_onto_crit = FALSE;
+					DEBUG_ONLY(locknl = cnl;)	/* for DEBUG_ONLY LOCK_HIST macro */
+					mutex_unlockw(reg, crash_count);/* roll forward Step (CMT14) */
+					assert(!csa->now_crit);
+					DEBUG_ONLY(locknl = NULL;)	/* restore "locknl" to default value */
+					crit_count = 0;
+					UNSUPPORTED_PLATFORM_CHECK;
 				}
 			}
-			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))
+			csa->t_commit_crit = FALSE; /* ensure we don't process this region again (rolls forward Step (CMT19)) */
+			if (is_exiting && (NULL != csa->shmpool_buffer))
 			{
-				if ((pid = csa->shmpool_buffer->shmpool_crit_latch.u.parts.latch_pid) == rundown_process_id)
+				if ((pid = csa->shmpool_buffer->shmpool_crit_latch.u.parts.latch_pid) == process_id)
 				{
 					if (is_exiting)
 					{	/* Tiz our lock. Force recovery to run and release */
@@ -1696,112 +1378,59 @@ void secshr_db_clnup(enum secshr_db_state secshr_state)
 				} else if (0 != pid && FALSE == is_proc_alive(pid, 0))
 				{
 					/* Attempt to make it our lock so we can set blocked */
-					if (COMPSWAP_LOCK(&csa->shmpool_buffer->shmpool_crit_latch, pid, imgcnt,
-							  rundown_process_id, rundown_image_count))
+					if (COMPSWAP_LOCK(&csa->shmpool_buffer->shmpool_crit_latch, pid, 0, process_id, 0))
 					{	/* Now our lock .. set blocked and release.  */
 						csa->shmpool_buffer->shmpool_blocked = TRUE;
 						BG_TRACE_PRO_ANY(csa, shmpool_blkd_by_sdc);
 						DEBUG_LATCH(util_out_print("Orphaned latch cleaned up", TRUE));
-						COMPSWAP_UNLOCK(&csa->shmpool_buffer->shmpool_crit_latch, rundown_process_id,
-								rundown_image_count, LOCK_AVAILABLE, 0);
+						COMPSWAP_UNLOCK(&csa->shmpool_buffer->shmpool_crit_latch, process_id,
+								0, LOCK_AVAILABLE, 0);
 					} /* Else someone else took care of it */
 				}
 			}
 			/* All releases done now. Double check latch is really cleared */
-			if (GTM_PROBE(CRIT_SPACE(NUM_CRIT_ENTRY(csd)), csa->critical, WRITE))
-			{
-				/* as long as csa->hold_onto_crit is FALSE, we should have released crit if we held it at entry */
-				assert(!csa->now_crit || csa->hold_onto_crit);
-				SALVAGE_UNIX_LATCH_DBCRIT(&csa->critical->semaphore, is_exiting, cnl->wc_blocked);
-				SALVAGE_UNIX_LATCH(&csa->critical->crashcnt_latch, is_exiting);
-				SALVAGE_UNIX_LATCH(&csa->critical->prochead.latch, is_exiting);
-				SALVAGE_UNIX_LATCH(&csa->critical->freehead.latch, is_exiting);
-			}
+			assert(NULL != csa->critical);
+			/* as long as csa->hold_onto_crit is FALSE, we should have released crit if we held it at entry */
+			assert(!csa->now_crit || csa->hold_onto_crit);
+			/* Note: Do not release crit if we still hold it. As we want the next process to grab crit to invoke
+			 * "mutex_salvage" (to cleanup stuff) in case we terminate while holding crit. Hence the below line
+			 * is commented out.
+			 *
+			 * RELEASE_LATCH_IF_OWNER_AND_EXITING(&csa->critical->semaphore, is_exiting);
+			 */
+			RELEASE_LATCH_IF_OWNER_AND_EXITING(&csa->critical->crashcnt_latch, is_exiting);
+			RELEASE_LATCH_IF_OWNER_AND_EXITING(&csa->critical->prochead.latch, is_exiting);
+			RELEASE_LATCH_IF_OWNER_AND_EXITING(&csa->critical->freehead.latch, is_exiting);
 		}	/* For all regions */
 	}	/* For all glds */
-	if (jnlpool_reg_addrs && (GTM_PROBE(SIZEOF(*jnlpool_reg_addrs), jnlpool_reg_addrs, READ)))
-	{	/* although there is only one jnlpool reg, SECSHR_PROBE_REGION macro might do a "continue" and hence the for loop */
-		for (reg = *jnlpool_reg_addrs, jnlpool_reg = TRUE; jnlpool_reg && reg; jnlpool_reg = FALSE) /* only jnlpool reg */
+	if ((NULL != (reg = jnlpool.jnlpool_dummy_reg)) && reg->open)
+	{
+		csa = REG2CSA(reg);
+		if (csa->now_crit)
 		{
-			SECSHR_PROBE_REGION(reg);	/* SECSHR_PROBE_REGION sets csa */
-			if (csa->now_crit)
+			jpl = REPLCSA2JPL(csa);
+			cnl = csa->nl;
+			/* ONLINE ROLLBACK can come here holding crit ONLY due to commit errors but NOT during
+			 * process exiting as secshr_db_clnup during process exiting is always preceded by
+			 * mur_close_files which does the rel_crit anyways. Assert that.
+			 */
+			assert(!csa->hold_onto_crit || !jgbl.onlnrlbk || !is_exiting);
+			if (!csa->hold_onto_crit || is_exiting)
 			{
-				jpl = (jnlpool_ctl_ptr_t)((sm_uc_ptr_t)csa->critical - JNLPOOL_CTL_SIZE); /* see jnlpool_init() for
-													   * relationship between
-													   * critical and jpl */
-				if (GTM_PROBE(SIZEOF(jnlpool_ctl_struct), jpl, WRITE))
-				{
-					if ((jpl->early_write_addr > jpl->write_addr) && (update_underway))
-					{	/* we need to update journal pool to reflect the increase in jnl-seqno */
-						cumul_jnl_rec_len = (uint4)(jpl->early_write_addr - jpl->write_addr);
-						jh = (jnldata_hdr_ptr_t)((sm_uc_ptr_t)jpl + JNLDATA_BASE_OFF + jpl->write);
-						if (GTM_PROBE(SIZEOF(*jh), jh, WRITE) && 0 != (jsize = jpl->jnlpool_size))
-						{	/* Below chunk of code mirrors  what is done in t_end/tp_tend */
-							/* 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;
-							if (INVALID_SUPPL_STRM != strm_index)
-							{	/* Need to also update supplementary stream seqno */
-								assert(0 <= strm_index);
-								/* assert(strm_index < ARRAYSIZE(tjpl->strm_seqno)); */
-								ASSERT_INST_FILE_HDR_HAS_HISTREC_FOR_STRM(strm_index);
-								jpl->strm_seqno[strm_index]++;
-							}
-							jpl->lastwrite_len = cumul_jnl_rec_len;
-							SHM_WRITE_MEMORY_BARRIER;
-							/* Emulate
-							 * jpl->write = (jpl->write + cumul_jnl_rec_len) % jsize;
-							 * See note in DOs and DONTs about using % operator
-							 */
-							for (new_write = jpl->write + cumul_jnl_rec_len;
-								new_write >= jsize;
-								new_write -= jsize)
-								;
-							jpl->write = new_write;
-							jpl->write_addr += cumul_jnl_rec_len;
-							jpl->jnl_seqno++;
-							/* End atomic stmts */
-							/* the above takes care of rolling forward steps (9) and (10) of the
-							 * commit flow */
-						}
-					}
-#ifdef DEBUG
-					else if (jpl->early_write_addr > jpl->write_addr)
-					{   /* PRO code will do the right thing by overwriting that exact space in the jnlpool with
-					     * the current transaction's journal records. For dbg though, it is better if
-					     * secshr_db_clnup (which is invoked as part of exit handling) does the cleanup.
-					     */
-						assert(!update_underway);
-						jpl->early_write_addr = jpl->write_addr;
-					}
-#endif
-				}
-				cnl = csa->nl;
-				if ((GTM_PROBE(NODE_LOCAL_SIZE_DBS, cnl, WRITE)) &&
-					(GTM_PROBE(JNLPOOL_CRIT_SPACE, csa->critical, WRITE)))
-				{
-					/* ONLINE ROLLBACK can come here holding crit ONLY due to commit errors but NOT during
-					 * process exiting as secshr_db_clnup during process exiting is always preceded by
-					 * mur_close_files which does the rel_crit anyways. Assert that.
-					 */
-					assert(!csa->hold_onto_crit || !jgbl.onlnrlbk || !is_exiting);
-					if (!csa->hold_onto_crit || is_exiting)
-					{
-						CRIT_TRACE(crit_ops_rw); /* see gdsbt.h for comment on placement */
-						if (cnl->in_crit == rundown_process_id)
-							cnl->in_crit = 0;
-						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 */
-					}
-				}
+				CRIT_TRACE(crit_ops_rw); /* see gdsbt.h for comment on placement */
+				if (cnl->in_crit == process_id)
+					cnl->in_crit = 0;
+				csa->hold_onto_crit = FALSE;
+				DEBUG_ONLY(locknl = cnl;)	/* for DEBUG_ONLY LOCK_HIST macro */
+				mutex_unlockw(reg, 0);		/* roll forward Step (CMT15) */
+				assert(!csa->now_crit);
+				DEBUG_ONLY(locknl = NULL;)	/* restore "locknl" to default value */
 			}
-			/* as long as csa->hold_onto_crit is FALSE, we should have released crit if we held it at entry */
-			assert(!csa->now_crit || csa->hold_onto_crit);
 		}
+		/* as long as csa->hold_onto_crit is FALSE, we should have released crit if we held it at entry */
+		assert(!csa->now_crit || csa->hold_onto_crit);
+		assert(jnlpool.jnlpool_dummy_reg == reg);
+		FINISH_JNL_PHASE2_IN_JNLPOOL_IF_NEEDED(TRUE, jnlpool);	/* Roll forward CMT17 */
 	}
 	if (is_exiting)
 	{	/* It is possible we are exiting while in the middle of a transaction (e.g. called through "deferred_signal_handler"
@@ -1819,33 +1448,3 @@ void secshr_db_clnup(enum secshr_db_state secshr_state)
 	}
 	return;
 }
-
-boolean_t	secshr_tp_get_cw(cw_set_element *cs, int depth, cw_set_element **cs1)
-{
-	int	iter;
-
-	*cs1 = cs;
-	for (iter = 0; iter < depth; iter++)
-	{
-		if (!(GTM_PROBE(SIZEOF(cw_set_element), *cs1, READ)))
-		{
-			*cs1 = NULL;
-			return FALSE;
-		}
-		*cs1 = (*cs1)->next_cw_set;
-	}
-	if (*cs1 && GTM_PROBE(SIZEOF(cw_set_element), *cs1, READ))
-	{
-		while ((*cs1)->high_tlevel)
-		{
-			if (GTM_PROBE(SIZEOF(cw_set_element), (*cs1)->high_tlevel, READ))
-				*cs1 = (*cs1)->high_tlevel;
-			else
-			{
-				*cs1 = NULL;
-				return FALSE;
-			}
-		}
-	}
-	return TRUE;
-}
diff --git a/sr_port/secshr_db_clnup.h b/sr_port/secshr_db_clnup.h
old mode 100755
new mode 100644
index e2740f8..8788800
--- a/sr_port/secshr_db_clnup.h
+++ b/sr_port/secshr_db_clnup.h
@@ -1,6 +1,7 @@
 /****************************************************************
  *								*
- *	Copyright 2004 Sanchez Computer Associates, 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	*
@@ -21,4 +22,15 @@ enum secshr_db_state
 
 void secshr_db_clnup(enum secshr_db_state state);
 
+/* SECSHR_ACCOUNTING macro assumes csa->nl is dereferencible and does accounting if variable "DO_ACCOUNTING" is set to TRUE */
+#define		SECSHR_ACCOUNTING(DO_ACCOUNTING, VALUE)							\
+MBSTART {												\
+	if (DO_ACCOUNTING)										\
+	{												\
+		if (csa->nl->secshr_ops_index < SECSHR_OPS_ARRAY_SIZE)					\
+			csa->nl->secshr_ops_array[csa->nl->secshr_ops_index] = (gtm_uint64_t)(VALUE);	\
+		csa->nl->secshr_ops_index++;								\
+	}												\
+} MBEND
+
 #endif
diff --git a/sr_port/shmpool.c b/sr_port/shmpool.c
index df6ac9c..3b0c22b 100755
--- a/sr_port/shmpool.c
+++ b/sr_port/shmpool.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	*
@@ -268,8 +268,8 @@ void shmpool_abandoned_blk_chk(gd_region *reg, boolean_t force)
 	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.
-	   2) Verify that the block is in a valid state (needs pid set, process should exist)
+	   1) What the block thinks it is (free, backup or reformat)
+	   2) Verify that the block is in a valid (valid_data) OR "in-flight" state (in use by an existing process)
 	   3) Invalid state blocks are considered abandoned and put on the free queue.
 	*/
 	for (sblkh_p = (shmpool_blk_hdr_ptr_t)(sbufh_p + 1), blks = sbufh_p->total_blks;
@@ -278,8 +278,9 @@ void shmpool_abandoned_blk_chk(gd_region *reg, boolean_t force)
 	{	/* For each block not free, check if it is assigned to a process and if so if that process exists.
 		   If not or if the block is already free, put on the free queue after a thorough cleaning.
 		*/
-		if (SHMBLK_FREE == sblkh_p->blktype
-		    || 0 == sblkh_p->holder_pid || !is_proc_alive(sblkh_p->holder_pid, sblkh_p->image_count))
+		if ((SHMBLK_FREE == sblkh_p->blktype)
+		    || (0 == sblkh_p->holder_pid)
+		    || ((FALSE == sblkh_p->valid_data) && (!is_proc_alive(sblkh_p->holder_pid, sblkh_p->image_count))))
 		{	/* Make sure block is clean (orphaned blocks might not be) and queue on free. */
 			sblkh_p->holder_pid = 0;
 			sblkh_p->valid_data = FALSE;
diff --git a/sr_port/sleep_cnt.h b/sr_port/sleep_cnt.h
index ebd9254..b2540ca 100644
--- a/sr_port/sleep_cnt.h
+++ b/sr_port/sleep_cnt.h
@@ -47,11 +47,10 @@
 #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 MAX_WTSTART_FINI_SLEEPS	(4 * SLEEP_ONE_MIN * MAXSLPTIME)/* After this many sleeps (each 1 msec in duration)
+								 * without progress, request cache recovery.
+								 */
 #define	PHASE2_COMMIT_WAIT	SLEEP_ONE_MIN
-#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 */
@@ -77,6 +76,16 @@
 						 * than (4 * LOCK_TRIES_PER_SEC) allows a faster remainder using AND
 						 * so use that instead.
 						 */
+#define	LOCK_CASLATCH_CHKINTVL_USEC	16384 * 128	/* This is used in callers that sleep for 1 micro-sec every 4 iterations
+							 * (instead of the usual 1 millisecond). Here too we want the caslatch
+							 * check to be done every ~4 seconds. One might be tempted to make
+							 * this 1000 * LOCK_CASLATCH_CHKINTVL, but in practice this is expected
+							 * to end up taking up a lot more time than ~4 seconds so we stick
+							 * with this approximation which is a perfect 2-power as well as ~10
+							 * times lesser so is expected to take ~.4 seconds but might be closer
+							 * to 1 second in practice which is considered okay. Might need some
+							 * experimentation and fine-tuning.
+							 */
 
 /* To compute the maximum duration of an inner spinloop, the following macro can be
  * used. The theory behind this macro is that the basic definition of LOCK_SPINS is
diff --git a/sr_port/stp_gcol_src.h b/sr_port/stp_gcol_src.h
index 10af08a..661aa79 100644
--- a/sr_port/stp_gcol_src.h
+++ b/sr_port/stp_gcol_src.h
@@ -62,6 +62,7 @@
 #include "opcode.h"
 #include "glvn_pool.h"
 #include "iormdef.h"
+#include "localvarmonitor.h"
 
 #ifndef STP_MOVE
 GBLDEF int	indr_stp_low_reclaim_passes = 0;
@@ -103,9 +104,10 @@ GBLREF int4			LVGC_interval;				/* dead data GC done every LVGC_interval stringp
 GBLREF boolean_t		suspend_lvgcol;
 GBLREF hash_table_str		*complits_hashtab;
 GBLREF mval			*alias_retarg;
+GBLREF io_pair			*io_std_device;
 GTMTRIG_ONLY(GBLREF mval 	dollar_ztwormhole;)
 DEBUG_ONLY(GBLREF   boolean_t	ok_to_UNWIND_in_exit_handling;)
-UNIX_ONLY(GBLREF io_pair	*io_std_device;)
+
 
 OS_PAGE_SIZE_DECLARE
 
@@ -114,25 +116,17 @@ static mstr			**topstr, **array, **arraytop;
 error_def(ERR_STPEXPFAIL);
 
 /* See comment inside LV_NODE_KEY_STPG_ADD macro for why the ASSERT_LV_NODE_MSTR_EQUIVALENCE macro does what it does */
-#ifdef UNIX
-# define	ASSERT_LV_NODE_MSTR_EQUIVALENCE									\
-{														\
+#define ASSERT_LV_NODE_MSTR_EQUIVALENCE										\
+MBSTART {													\
 	assert(OFFSETOF(lvTreeNode, key_len) - OFFSETOF(lvTreeNode, key_mvtype) == OFFSETOF(mstr, len));	\
 	assert(SIZEOF(((lvTreeNode *)NULL)->key_len) == SIZEOF(((mstr *)NULL)->len));				\
 	assert(OFFSETOF(lvTreeNode, key_addr) - OFFSETOF(lvTreeNode, key_mvtype) == OFFSETOF(mstr, addr));	\
 	assert(SIZEOF(((lvTreeNode *)NULL)->key_addr) == SIZEOF(((mstr *)NULL)->addr));				\
-}
-#elif defined(VMS)
-# define	ASSERT_LV_NODE_MSTR_EQUIVALENCE									\
-{														\
-	assert(SIZEOF(((lvTreeNode *)NULL)->key_len) == SIZEOF(((mstr *)NULL)->len));				\
-	assert(OFFSETOF(lvTreeNode, key_addr) - OFFSETOF(lvTreeNode, key_len) == OFFSETOF(mstr, addr));		\
-	assert(SIZEOF(((lvTreeNode *)NULL)->key_addr) == SIZEOF(((mstr *)NULL)->addr));				\
-}
-#endif
+} MBEND
 
 #define	LV_NODE_KEY_STPG_ADD(NODE)											\
-{	/* NODE is of type "lvTreeNode *" or "lvTreeNodeNum *".								\
+MBSTART {														\
+	/* NODE is of type "lvTreeNode *" or "lvTreeNodeNum *".								\
 	 * Only if it is a "lvTreeNode *" (MV_STR bit is set in this case only)						\
 	 * should we go ahead with the STPG_ADD.									\
 	 */														\
@@ -157,7 +151,7 @@ error_def(ERR_STPEXPFAIL);
 		UNIX_ONLY(MSTR_STPG_ADD((mstr *)(void *)&NODE->key_mvtype));						\
 		VMS_ONLY(MSTR_STPG_ADD((mstr *)(void *)&NODE->key_len));						\
 	}														\
-}
+} MBEND
 
 #define	MVAL_STPG_ADD(MVAL1)							\
 {										\
@@ -538,6 +532,8 @@ void stp_gcol(size_t space_asked)	/* BYPASSOK */
 		DBGRFCT((stderr, "stp_gcol: lvgcol check bypassed for lack of aliasness\n"));
 	}
 #	endif	/* DEBUG_REFCNT */
+	if (IS_LVMON_ACTIVE && (stringpool.base == rts_stringpool.base))
+		lvmon_pull_values(1);			/* Pull set of values into index 1 if rts stringpool */
 #	endif	/* !STP_MOVE */
 	assert(stringpool.free >= stringpool.base);
 	assert(stringpool.free <= stringpool.top);
@@ -658,15 +654,6 @@ void stp_gcol(size_t space_asked)	/* BYPASSOK */
 			for (xnewvar = symtab->xnew_var_list; xnewvar; xnewvar = xnewvar->next)
 				MSTR_STPG_ADD(&xnewvar->key.var_name);
 		}
-#		ifdef VMS
-		if (NULL != (TREF(rt_name_tbl)).base)
-		{	/* Keys for $TEXT source hash table can live in stringpool */
-			for (tabent_mname = (TREF(rt_name_tbl)).base, topent_mname = (TREF(rt_name_tbl)).top;
-			    tabent_mname < topent_mname; tabent_mname++)
-				if (HTENT_VALID_MNAME(tabent_mname, routine_source, rsptr))
-					MSTR_STPG_ADD(&tabent_mname->key.var_name);
-		}
-#		endif
 		if (x = comline_base)
 			for (index = MAX_RECALL; index > 0 && x->len; index--, x++)
 			{	/* These strings are guaranteed to be in the stringpool so use MSTR_STPG_PUT macro directly
@@ -682,7 +669,7 @@ void stp_gcol(size_t space_asked)	/* BYPASSOK */
 		ZWRHTAB_GC(zwrhtab);
 		for (l = io_root_log_name; NULL != l; l = l->next)
 		{
-			if ((NULL != l->iod) && (n_io_dev_types == l->iod->type))
+			if ((NULL == l->iod) || (n_io_dev_types == l->iod->type))
 			{
 				assert(FALSE);
 				continue;       /* skip it on pro */
@@ -690,14 +677,10 @@ void stp_gcol(size_t space_asked)	/* BYPASSOK */
 			if ((IO_ESC != l->dollar_io[0]) && (l->iod->trans_name == l))
 			{
 				MSTR_STPG_ADD(&l->iod->error_handler);
-#				ifdef UNIX
-				/* if this is on UNIX and it is a split $principal, protect
-				 * error_handler defined on the output side
-				 */
+				/* If this is a split $principal, protect error_handler defined on the output side */
 				if ((l->iod->pair.in != l->iod->pair.out)
 				    && (l->iod->pair.out == io_std_device->out))
 					MSTR_STPG_ADD(&l->iod->pair.out->error_handler);
-#				endif
 				rm_ptr = (rm == l->iod->type) ? (d_rm_struct *)l->iod->dev_sp : NULL;
 				if (NULL != rm_ptr)
 				{	/* Protect the IVs and KEYs as needed. */
@@ -1102,6 +1085,11 @@ void stp_gcol(size_t space_asked)	/* BYPASSOK */
 	assert(stringpool.invokestpgcollevel <= stringpool.top);
 #	ifndef STP_MOVE
 	assert(stringpool.top - stringpool.free >= space_asked);
-#	endif
+	if (IS_LVMON_ACTIVE && (stringpool.base == rts_stringpool.base))
+	{	/* Do monitoring only for runtime stringpool */
+		lvmon_pull_values(2);				/* Pull values of monitored vars into index 2 */
+		lvmon_compare_value_slots(1, 2);		/* Make sure they are the same */
+	}
+#	endif	/* !STP_MOVE */
 	return;
 }
diff --git a/sr_port/stx_error.c b/sr_port/stx_error.c
index d7378eb..a43ee04 100755
--- a/sr_port/stx_error.c
+++ b/sr_port/stx_error.c
@@ -83,6 +83,12 @@ void stx_error_va(int in_error, va_list args)
 	 *	b) shift_side_effects
 	 *	c) source_error_found
 	 */
+	if (TREF(xecute_literal_parse))
+	{
+		ins_errtriple(in_error);
+		TREF(source_error_found) = TRUE;
+		return;
+	}
 	is_stx_warn = (CGP_PARSE == cg_phase) && IS_STX_WARN(in_error) GTMTRIG_ONLY( && !TREF(trigger_compile_and_link));
 	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;
diff --git a/sr_port/symbinit.c b/sr_port/symbinit.c
index f77f7f9..4436e09 100644
--- a/sr_port/symbinit.c
+++ b/sr_port/symbinit.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	*
@@ -45,7 +46,9 @@ int4 symbinit(void)
 	stack_frame	*fp, *fp_prev, *fp_fix;
 	symval		*ptr;
 	unsigned char	*l_syms, *msp_save, *old_sp, *top;
+	DCL_THREADGBL_ACCESS;
 
+	SETUP_THREADGBL_ACCESS;
 	if (frame_pointer->type & SFT_COUNT)
 	{
 		temp_size = frame_pointer->rvector->temp_size;
@@ -172,6 +175,7 @@ int4 symbinit(void)
 	DBGRFCT((stderr,"symbinit: Allocated new symbol table at 0x"lvaddr" pushing old symbol table on M stack (0x"lvaddr")\n",
 		 ptr, curr_symval));
 	curr_symval = ptr;
+	(TREF(curr_symval_cycle))++;				/* curr_symval is changing - update cycle */
 	mv_st_ent->mv_st_cont.mvs_stab = ptr;
 	return shift_size;
 }
diff --git a/sr_port/t_begin.c b/sr_port/t_begin.c
old mode 100755
new mode 100644
index 6ffa8dc..832550f
--- a/sr_port/t_begin.c
+++ b/sr_port/t_begin.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,8 +56,8 @@ error_def(ERR_MMREGNOACCESS);
 
 void t_begin(uint4 err, uint4 upd_trans) 	/* err --> error code for current gvcst_routine */
 {
-	srch_blk_status	*s;
-	trans_num	histtn;
+	srch_blk_status		*s;
+	trans_num		histtn;
 	DCL_THREADGBL_ACCESS;
 
 	SETUP_THREADGBL_ACCESS;
diff --git a/sr_port/t_begin_crit.c b/sr_port/t_begin_crit.c
old mode 100755
new mode 100644
index 64dcccf..04b71c6
--- a/sr_port/t_begin_crit.c
+++ b/sr_port/t_begin_crit.c
@@ -42,7 +42,7 @@ GBLREF	volatile int4		fast_lock_count;
 
 void	t_begin_crit(uint4 err)	/* err - error code for current gvcst_routine */
 {
-	boolean_t	was_crit;
+	boolean_t		was_crit;
 	DCL_THREADGBL_ACCESS;
 
 	SETUP_THREADGBL_ACCESS;
diff --git a/sr_port/t_commit_cleanup.c b/sr_port/t_commit_cleanup.c
old mode 100755
new mode 100644
index 67988e6..154e572
--- a/sr_port/t_commit_cleanup.c
+++ b/sr_port/t_commit_cleanup.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,12 +12,6 @@
 
 #include "mdef.h"
 
-#ifdef UNIX
-#include "aswp.h"
-#elif defined(VMS)
-#include <descrip.h>
-#endif
-
 #include "gdsroot.h"
 #include "gdsbt.h"
 #include "gdskill.h"
@@ -41,6 +35,7 @@
 #include "gtmsource.h"		/* for jnlpool_addrs structure definition */
 #include "send_msg.h"
 #include "have_crit.h"
+#include "aswp.h"
 
 GBLREF	cache_rec_ptr_t		cr_array[]; /* Maximum number of blocks that can be in transaction */
 GBLREF	unsigned int		cr_array_index;
@@ -52,7 +47,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	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;
@@ -61,9 +56,8 @@ GBLREF	uint4			process_id;
 GBLREF	unsigned int		t_tries;
 GBLREF	boolean_t		unhandled_stale_timer_pop;
 GBLREF	uint4			update_trans;
-#ifdef UNIX
 GBLREF	jnl_gbls_t		jgbl;
-#endif
+GBLREF	boolean_t		dse_running;
 
 error_def(ERR_DBCOMMITCLNUP);
 
@@ -88,35 +82,77 @@ error_def(ERR_DBCOMMITCLNUP);
 	}								\
 }
 
-#define	RESET_REG_SEQNO_IF_NEEDED(csa, jpl_csa)					\
-{										\
-	if (reg_seqno_reset)							\
-	{									\
-		assert(csa->hdr->reg_seqno <= (jnlpool_ctl->jnl_seqno + 1));	\
-		assert(csa->now_crit && jpl_csa->now_crit);			\
-		csa->hdr->reg_seqno = jnlpool_ctl->jnl_seqno;			\
-	}									\
-}
+#define	T_COMMIT_CLEANUP_DB(CR_ARRAY, CR_ARRAY_INDEX, CS_ADDRS, UPDATE_TRANS, JNLPOOL_CTL, JGBL, RELEASE_CRIT, GV_CUR_REGION)	\
+MBSTART {															\
+	cache_rec_ptr_t		*crArray;											\
+	sgmnt_addrs		*csa;												\
+	sgmnt_data_ptr_t	csd;												\
+	jnl_buffer_ptr_t	jbp;												\
+	int			index1, index2;											\
+	jbuf_phase2_in_prog_t	*lastJbufCmt;											\
+																\
+	crArray = CR_ARRAY;													\
+	UNPIN_CR_ARRAY_ON_RETRY(crArray, CR_ARRAY_INDEX);									\
+	assert(!CR_ARRAY_INDEX);												\
+	csa = CS_ADDRS;														\
+	assert(!csa->t_commit_crit);												\
+	assert(!csa->now_crit || (csa->ti->curr_tn == csa->ti->early_tn));							\
+	ASSERT_JNL_SEQNO_FILEHDR_JNLPOOL(csa->hdr, JNLPOOL_CTL); /* debug-only sanity check between				\
+								  * seqno of filehdr and jnlpool */				\
+	csd = csa->hdr;														\
+	/* Note: Below code is slightly similar to that in "mutex_salvage" */							\
+	if (csa->now_crit && JNL_ENABLED(csd) && (csd->trans_hist.early_tn != csd->trans_hist.curr_tn))				\
+	{	/* CMT04 finished but error happened before CMT08. Check if CMT06 needs to be undone */				\
+		assert(csa->nl->update_underway_tn < csd->trans_hist.early_tn);							\
+		assert(NULL != csa->jnl);											\
+		assert(NULL != csa->jnl->jnl_buff);										\
+		jbp = csa->jnl->jnl_buff;											\
+		index1 = jbp->phase2_commit_index1;										\
+		index2 = jbp->phase2_commit_index2;										\
+		if (index1 != index2)												\
+		{														\
+			assert(jbp->freeaddr <= jbp->rsrv_freeaddr);								\
+			DECR_PHASE2_COMMIT_INDEX(index2, JNL_PHASE2_COMMIT_ARRAY_SIZE);						\
+			lastJbufCmt = &jbp->phase2_commit_array[index2];							\
+			if (lastJbufCmt->process_id == process_id)								\
+			{	/* CMT06 finished. So undo it as a whole */							\
+				assert(lastJbufCmt->curr_tn == csd->trans_hist.curr_tn);					\
+			/* 	NARSTODO : Invoke same cleanup code as in mutex.c to reset jb->freeaddr back */			\
+				SET_JBP_RSRV_FREEADDR(jbp, lastJbufCmt->start_freeaddr);					\
+				SHM_WRITE_MEMORY_BARRIER;/* see corresponding SHM_READ_MEMORY_BARRIER in "jnl_phase2_cleanup" */\
+				jbp->phase2_commit_index2 = index2;	/* remove last commit entry */				\
+				/* Undo Step (CMT06) complete */								\
+			}													\
+		}														\
+	}															\
+	if (UPDATE_TRANS)													\
+		RESET_EARLY_TN_IF_NEEDED(csa);		/* Undo Step (CMT04) */							\
+	assert(!csa->hold_onto_crit || JGBL.onlnrlbk || TREF(in_gvcst_redo_root_search) || dse_running);			\
+	if (!csa->hold_onto_crit && RELEASE_CRIT)										\
+		rel_crit(GV_CUR_REGION); 		/* Undo Step (CMT01) */							\
+} MBEND
 
 boolean_t t_commit_cleanup(enum cdb_sc status, int signal)
 {
 	boolean_t			update_underway, reg_seqno_reset = FALSE, release_crit;
 	cache_rec_ptr_t			cr;
 	sgm_info			*si;
-	sgmnt_addrs			*csa, *jpl_csa = NULL;
+	sgmnt_addrs			*csa;
 	tp_region			*tr;
 	char				*trstr;
 	gd_region			*xactn_err_region, *jpl_reg = NULL;
-	cache_rec_ptr_t			*tp_cr_array;
+	jnlpool_ctl_ptr_t		jpl;
+	int				index1, index2;
+	jpl_phase2_in_prog_t		*lastJplCmt;
 	DEBUG_ONLY(unsigned int		lcl_t_tries;)
 	DCL_THREADGBL_ACCESS;
 
 	SETUP_THREADGBL_ACCESS;
 	assert(cdb_sc_normal != status);
 	xactn_err_region = gv_cur_region;
-	/* see comments in secshr_db_clnup for the commit logic flow as a sequence of steps in t_end and tp_tend and how
-	 * t_commit_cleanup() and secshr_db_clnup() complement each other (one does the rollback and one the roll forward)
-	 * update_underway is set to TRUE to indicate the commit is beyond rollback. It is set only if we hold crit on the region.
+	/* See comment at the top of "secshr_db_clnup" for the commit logic flow as a sequence of steps numbered CMTxx (where
+	 * xx is 01, 02, etc.) in t_end/tp_tend and how "t_commit_cleanup" and "secshr_db_clnup" complement each other (one does
+	 * the roll-back and one the roll-forward). update_underway is set to TRUE to indicate the commit is beyond rollback.
 	 */
 	update_underway = FALSE;
 	if (dollar_tlevel)
@@ -151,14 +187,15 @@ boolean_t t_commit_cleanup(enum cdb_sc status, int signal)
 	} else
 	{
 		trstr = "NON-TP";
-		update_underway = (cs_addrs->now_crit && (UPDTRNS_TCOMMIT_STARTED_MASK & update_trans)
-					|| T_UPDATE_UNDERWAY(cs_addrs));
-		if (NULL != gv_target)	/* gv_target can be NULL in case of DSE MAPS command etc. */
-			gv_target->clue.end = 0; /* in case t_end() had set history's tn to be "valid_thru++", undo it */
+		assert(!(cs_addrs->now_crit && (UPDTRNS_TCOMMIT_STARTED_MASK & update_trans)) || T_UPDATE_UNDERWAY(cs_addrs));
+		update_underway = T_UPDATE_UNDERWAY(cs_addrs);
+		if (NULL != gv_target)			/* gv_target can be NULL in case of DSE MAPS command etc. */
+			gv_target->clue.end = 0;	/* in case t_end() had set history's tn to be "valid_thru++", undo it */
 	}
 	if (!update_underway)
-	{	/* Rollback (undo) the transaction. the comments below refer to step numbers as documented in secshr_db_clnup */
-		/* If we are here due to a restart (in t_end or tp_tend), we release crit as long as it is not the transition
+	{	/* Rollback (undo) the transaction. the comments below refer to CMTxx step numbers described in secshr_db_clnup.
+		 * At this point we know an update is not underway. That means we got an error BEFORE Step CMT08.
+		 * If we are here due to a restart (in t_end or tp_tend), we release crit as long as it is not the transition
 		 * from 2nd to 3rd retry or 3rd to 3rd retry. However, if we are here because of a runtime error in t_end or tp_tend
 		 * at a point where the transaction can be rolled backwards (update_underway = FALSE), we release crit before going
 		 * to the error trap thereby avoiding any unintended crit hangs.
@@ -168,15 +205,24 @@ boolean_t t_commit_cleanup(enum cdb_sc status, int signal)
 		{
 			csa = &FILE_INFO(jnlpool.jnlpool_dummy_reg)->s_addrs;
 			if (csa->now_crit)
-			{	/* reset any csa->hdr->early_tn like increments that might have occurred in jnlpool */
-				assert((sm_uc_ptr_t)csa->critical == ((sm_uc_ptr_t)jnlpool_ctl + JNLPOOL_CTL_SIZE));
-				if (jnlpool_ctl->early_write_addr != jnlpool_ctl->write_addr)
+			{	/* Undo Step CMT03. Note: The below code is similar to that in "mutex_salvage" for the jnlpool */
+				jpl = jnlpool.jnlpool_ctl;
+				index1 = jpl->phase2_commit_index1;
+				index2 = jpl->phase2_commit_index2;
+				if (index1 != index2)
 				{
-					reg_seqno_reset = TRUE;	/* reset reg_seqnos of all regions to jnlpool_ctl->jnl_seqno */
-					DEBUG_ONLY(jpl_csa = csa;)
-					jnlpool_ctl->early_write_addr = jnlpool_ctl->write_addr; /* step (3) gets undone here */
+					assert(jpl->write_addr <= jpl->rsrv_write_addr);
+					DECR_PHASE2_COMMIT_INDEX(index2, JPL_PHASE2_COMMIT_ARRAY_SIZE);
+					lastJplCmt = &jpl->phase2_commit_array[index2];
+					if (lastJplCmt->process_id == process_id)
+					{	/* An error occurred after CMT03 but before CMT07. Undo CMT03 */
+						assert(lastJplCmt->jnl_seqno == jpl->jnl_seqno);
+						jpl->rsrv_write_addr = lastJplCmt->start_write_addr;
+						jpl->lastwrite_len = lastJplCmt->prev_jrec_len;
+						SHM_WRITE_MEMORY_BARRIER; /* similar layout as UPDATE_JPL_RSRV_WRITE_ADDR */
+						jpl->phase2_commit_index2 = index2;	/* remove last commit entry */
+					}
 				}
-				assert(jnlpool_ctl->write == jnlpool_ctl->write_addr % jnlpool_ctl->jnlpool_size);
 				if (!csa->hold_onto_crit)
 					jpl_reg = jnlpool.jnlpool_dummy_reg;	/* note down to release crit later */
 			}
@@ -191,28 +237,14 @@ boolean_t t_commit_cleanup(enum cdb_sc status, int signal)
 			for (si = first_sgm_info; NULL != si; si = si->next_sgm_info)
 			{
 				TP_CHANGE_REG(si->gv_cur_region);
-				tp_cr_array = &si->cr_array[0];
-				UNPIN_CR_ARRAY_ON_RETRY(tp_cr_array, si->cr_array_index);
-				assert(!si->cr_array_index);
-				csa = cs_addrs;
-				if (si->update_trans)
-				{
-					RESET_EARLY_TN_IF_NEEDED(csa);		/* step (4) of the commit logic is undone here */
-					RESET_REG_SEQNO_IF_NEEDED(csa, jpl_csa);/* step (5) of the commit logic is undone here */
-				}
-				assert(!csa->t_commit_crit);
-				assert(!csa->now_crit || (csa->ti->curr_tn == csa->ti->early_tn));
-				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 || jgbl.onlnrlbk);
-				if (!csa->hold_onto_crit && release_crit)
-					rel_crit(gv_cur_region); /* step (1) of the commit logic is iteratively undone here */
+				/* Undo CMT06, CMT04 and CMT01 */
+				T_COMMIT_CLEANUP_DB(&si->cr_array[0], si->cr_array_index, cs_addrs, si->update_trans,	\
+									jnlpool_ctl, jgbl, release_crit, gv_cur_region);
 			}
 			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).
+				 * Decrement t_tries to ensure that we don't 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 */
@@ -230,32 +262,23 @@ boolean_t t_commit_cleanup(enum cdb_sc status, int signal)
 					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);
+						rel_crit(tr->reg);	/* Undo Step (CMT01) */
 				}
 			}
 			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 */
+			RELEASE_JNLPOOL_LOCK_IF_NEEDED(jpl_reg);	/* Undo Step (CMT02) */
 		} else
 		{
-			UNPIN_CR_ARRAY_ON_RETRY(cr_array, cr_array_index);
-			assert(!cr_array_index);
-			csa = cs_addrs;
-			if (update_trans)
-			{
-				RESET_EARLY_TN_IF_NEEDED(csa);		/* step (4) of the commit logic is undone here */
-				RESET_REG_SEQNO_IF_NEEDED(csa, jpl_csa);/* step (5) of the commit logic is undone here */
-			}
-			/* Do not release crit on jnlpool or the region until reg_seqno has been reset above */
-			RELEASE_JNLPOOL_LOCK_IF_NEEDED(jpl_reg);/* step (2) of the commit logic is undone here */
-			if (!csa->hold_onto_crit && release_crit)
-				rel_crit(gv_cur_region);	/* step (1) of the commit logic is undone here */
+			/* Undo CMT06, CMT04 and CMT01 */
+			T_COMMIT_CLEANUP_DB(cr_array, cr_array_index, cs_addrs, update_trans,			\
+							jnlpool_ctl, jgbl, release_crit, gv_cur_region);
+			RELEASE_JNLPOOL_LOCK_IF_NEEDED(jpl_reg);	/* Undo Step (CMT02) */
 		}
-		DEBUG_ONLY(
-			csa = (NULL == jpl_reg) ? NULL : &FILE_INFO(jnlpool.jnlpool_dummy_reg)->s_addrs;
-			assert((NULL == csa) || !csa->now_crit || csa->hold_onto_crit);
-		)
+#		ifdef DEBUG
+		csa = (NULL == jpl_reg) ? NULL : &FILE_INFO(jnlpool.jnlpool_dummy_reg)->s_addrs;
+		assert((NULL == csa) || !csa->now_crit || csa->hold_onto_crit);
+#		endif
 		/* Do any pending buffer flush (wcs_wtstart) if we missed a flush timer. We should do this ONLY if we don't hold
 		 * crit. Use release_crit for that purpose. The only case where release_crit is TRUE but we still hold crit is if
 		 * the process wants to hold onto crit (for instance, DSE or ONLINE ROLLBACK). In that case, do the flush anyways.
diff --git a/sr_port/t_end.c b/sr_port/t_end.c
index e51ba98..f405565 100644
--- a/sr_port/t_end.c
+++ b/sr_port/t_end.c
@@ -12,12 +12,12 @@
 
 #include "mdef.h"
 
-#include <stddef.h>
-
 #include "gtm_time.h"
 #include "gtm_inet.h"
 #include "gtm_signal.h"	/* for VSIG_ATOMIC_T type */
 
+#include <stddef.h>
+
 #include "cdb_sc.h"
 #include "gdsroot.h"
 #include "gtm_facility.h"
@@ -130,6 +130,7 @@ 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;
+GBLREF	trans_num		local_tn;	/* transaction number for THIS PROCESS */
 #ifdef GTM_TRIGGER
 GBLREF	boolean_t		skip_dbtriggers;	/* see gbldefs.c for description of this global */
 #endif
@@ -144,7 +145,6 @@ error_def(ERR_GVPUTFAIL);
 error_def(ERR_JNLFILOPN);
 error_def(ERR_JNLFLUSH);
 error_def(ERR_JRTNULLFAIL);
-error_def(ERR_JNLPOOLRECOVERY);
 error_def(ERR_NOTREPLICATED);
 error_def(ERR_TEXT);
 
@@ -195,10 +195,9 @@ trans_num t_end(srch_hist *hist1, srch_hist *hist2, trans_num ctn)
 	trans_num		valid_thru, oldest_hist_tn, dbtn, blktn, temp_tn, epoch_tn, old_block_tn;
 	unsigned char		cw_depth, cw_bmp_depth, buff[MAX_ZWR_KEY_SZ], *end;
 	jnldata_hdr_ptr_t	jnl_header;
-	uint4			total_jnl_rec_size, tmp_cumul_jnl_rec_len, tmp_cw_set_depth, prev_cw_set_depth;
+	uint4			total_jnl_rec_size, tmp_cw_set_depth, prev_cw_set_depth;
 	DEBUG_ONLY(unsigned int	tot_jrec_size;)
 	jnlpool_ctl_ptr_t	jpl;
-	jnlpool_write_ctx_t	jplctx;
 	boolean_t		replication = FALSE;
 	boolean_t		supplementary = FALSE;	/* this variable is initialized ONLY if "replication" is TRUE. */
 	seq_num			strm_seqno, next_strm_seqno;
@@ -217,26 +216,24 @@ trans_num t_end(srch_hist *hist1, srch_hist *hist2, trans_num ctn)
 	jnl_tm_t		save_gbl_jrec_time;
 	enum gds_t_mode		mode;
 	uint4			prev_cr_array_index;
-	uint4			com_csum;
 	seq_num			temp_jnl_seqno;
 #	ifdef DEBUG
 	boolean_t		ready2signal_gvundef_lcl;
 	enum cdb_sc		prev_status;
-	blk_hdr_ptr_t		save_old_block;
 #	endif
 	int			n_blks_validated;
 	boolean_t		before_image_needed, lcl_ss_in_prog = FALSE, reorg_ss_in_prog = FALSE;
 	boolean_t		ss_need_to_restart, new_bkup_started;
 	boolean_t		same_db_state;
 	gv_namehead		*gvnh;
-	qw_off_t		jnlpool_overflow_size;
 	gd_region		*reg;
 #	ifdef GTM_TRIGGER
 	uint4			cycle;
 #	endif
 	snapshot_context_ptr_t  lcl_ss_ctx;
 	th_index_ptr_t     	cti;
-
+	jbuf_rsrv_struct_t	*jrs;
+	jrec_rsrv_elem_t	*first_jre, *jre, *jre_top;
 	DCL_THREADGBL_ACCESS;
 
 	SETUP_THREADGBL_ACCESS;
@@ -245,13 +242,13 @@ trans_num t_end(srch_hist *hist1, srch_hist *hist2, trans_num ctn)
 	 */
 	assert((hist1 != hist2) || (ERR_JRTNULLFAIL == t_err) && (NULL == hist1)
 					&& update_trans && (is_updproc || jgbl.forw_phase_recovery));
-	DEBUG_ONLY(
-		/* Store global variable ready2signal_gvundef in a local variable and reset the global right away to ensure that
-		 * the global value does not incorrectly get carried over to the next call of "t_end".
-		 */
-		ready2signal_gvundef_lcl = TREF(ready2signal_gvundef);
-		TREF(ready2signal_gvundef) = FALSE;
-	)
+#	ifdef DEBUG
+	/* Store global variable ready2signal_gvundef in a local variable and reset the global right away to ensure that
+	 * the global value does not incorrectly get carried over to the next call of "t_end".
+	 */
+	ready2signal_gvundef_lcl = TREF(ready2signal_gvundef);
+	TREF(ready2signal_gvundef) = FALSE;
+#	endif
 	reg = gv_cur_region;
 	csa = cs_addrs;
 	csd = csa->hdr;
@@ -601,14 +598,14 @@ trans_num t_end(srch_hist *hist1, srch_hist *hist2, trans_num ctn)
 	assert(!csa->hold_onto_crit || csa->now_crit);
 	if (!csa->now_crit)
 	{
-		/* 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. */
+		/* 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(reg, cw_set_depth + 1, NULL))
 			assert(FALSE);	/* wcs_get_space should have returned TRUE unconditionally in this case */
 		for (;;)
 		{
-			grab_crit(reg);
+			grab_crit(reg);	/* Step CMT01 (see secshr_db_clnup.c for CMTxx step descriptions) */
 			if (!FROZEN_HARD(csd))
 				break;
 			rel_crit(reg);
@@ -637,7 +634,6 @@ trans_num t_end(srch_hist *hist1, srch_hist *hist2, trans_num ctn)
 			goto failed;
 		}
 	}
-	com_csum = 0;
 	/* We should never proceed to update a frozen database. Only exception is DSE */
 	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
@@ -1088,7 +1084,7 @@ trans_num t_end(srch_hist *hist1, srch_hist *hist2, trans_num ctn)
 				 * UPGRADE/DOWNGRADE is in PHASE2 touching this very same block. In that case,
 				 * we cannot reuse this block so we restart. We could try finding a different block
 				 * to acquire instead and avoid a restart (tracked as part of C9E11-002651).
-				 * Note that in_cw_set is set to 0 ahead of in_tend in bg_update_phase2. Therefore
+				 * Note that in_cw_set is set to 0 ahead of in_tend in "bg_update_phase2". Therefore
 				 * it is possible that we see in_cw_set 0 but in_tend is still non-zero. In that case,
 				 * we cannot proceed with pinning this cache-record as the cr is still locked by
 				 * the other process. We can choose to wait here but instead decide to restart.
@@ -1146,22 +1142,22 @@ trans_num t_end(srch_hist *hist1, srch_hist *hist2, trans_num ctn)
 					assert(bsiz <= csd->blk_size);
 					cs->blk_checksum = jnl_get_checksum(old_block, csa, bsiz);
 				}
-				DEBUG_ONLY(
+#				ifdef DEBUG
 				else
 					assert(cs->blk_checksum == jnl_get_checksum(old_block, csa, old_block->bsiz));
-				)
+#				endif
 				assert(cs->cr->blk == cs->blk);
 			}
 		}
 	}
-	/* if we are not writing an INCTN record, we better have a non-zero cw_depth.
-	 * the only known exceptions are
-	 * 	a) if we were being called from gvcst_put for a duplicate SET
-	 * 	b) if we were being called from gvcst_kill for a duplicate KILL
-	 * 	c) if we were called from DSE MAPS
-	 * 	d) if we were being called from gvcst_jrt_null.
-	 * in case (a) and (b), we want to write logical SET or KILL journal records and replicate them.
-	 * in case (c), we do not want to replicate them. we want to assert that is_replicator is FALSE in this case.
+	/* If we are not writing an INCTN record, we better have a non-zero cw_depth.
+	 * The only known exceptions are
+	 * 	a) If we were being called from gvcst_put for a duplicate SET
+	 * 	b) If we were being called from gvcst_kill for a duplicate KILL
+	 * 	c) If we were called from DSE MAPS
+	 * 	d) If we were being called from gvcst_jrt_null.
+	 * In case (a) and (b), we want to write logical SET or KILL journal records and replicate them.
+	 * In case (c), we do not want to replicate them. we want to assert that is_replicator is FALSE in this case.
 	 * the following assert achieves that purpose.
 	 */
 	assert((inctn_invalid_op != inctn_opcode) || cw_depth
@@ -1196,214 +1192,185 @@ 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(reg, csa);
+		jnl_status = (!JNL_FILE_SWITCHED2(jpc, jbp) ? 0 : 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.
-			 * It is now though that the actual jnl record write occurs. Ensure that the current value of
-			 * cw_set_depth does not entail any change in journal record size than was calculated.
-			 * Same case with csa->jnl_before_images & jbp->before_images.
-			 * The only exception is that in case of mu_reorg_{upgrd_dwngrd,encrypt}_in_prog cw_set_depth will be
-			 * LESS than tmp_cw_set_depth (this is still fine as there is more size allocated than used).
-			 */
-			assert((cw_set_depth == tmp_cw_set_depth) || ((mu_reorg_upgrd_dwngrd_in_prog || mu_reorg_encrypt_in_prog)
-					&& cw_map_depth && (cw_set_depth < tmp_cw_set_depth)));
-			assert(jbp->before_images == csa->jnl_before_image);
-			assert((csa->jnl_state == csd->jnl_state) && (csa->jnl_before_image == csd->jnl_before_image));
-			if (DISK_BLOCKS_SUM(jbp->freeaddr, total_jnl_rec_size) > jbp->filesize)
-			{	/* Moved as part of change to prevent journal records splitting
-				 * across multiple generation journal files. */
-				if (SS_NORMAL != (jnl_status = jnl_flush(jpc->region)))
-				{
-					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 t_end"),
-						jnl_status);
-					assert((!JNL_ENABLED(csd)) && (JNL_ENABLED(csa)));
-					status = cdb_sc_jnlclose;
-					goto failed;
-				} else if (EXIT_ERR == jnl_file_extend(jpc, total_jnl_rec_size))
-				{
-					assert(csd == csa->hdr);	/* jnl_file_extend() shouldn't reset csd in MM */
-					assert((!JNL_ENABLED(csd)) && (JNL_ENABLED(csa)));
-					status = cdb_sc_jnlclose;
-					goto failed;
-				}
-				assert(csd == csa->hdr);	/* If MM, csd shouldn't have been reset */
-			}
-			assert(jgbl.gbl_jrec_time >= jbp->prev_jrec_time);
-			if (0 == jpc->pini_addr)
-				jnl_put_jrt_pini(csa);
-			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 (0 != jnl_status)
 		{
 			if (SS_NORMAL != jpc->status)
 				rts_error_csa(CSA_ARG(csa) VARLSTCNT(7) jnl_status, 4, JNL_LEN_STR(csd),
 						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(reg));
+			assert(FALSE);	/* rts_error_csa done above should never return */
+		}
+		/* tmp_cw_set_depth was used to do TOTAL_NONTPJNL_REC_SIZE calculation earlier in this function.
+		 * It is now though that the actual jnl record write occurs. Ensure that the current value of
+		 * cw_set_depth does not entail any change in journal record size than was calculated.
+		 * Same case with csa->jnl_before_images & jbp->before_images.
+		 * The only exception is that in case of mu_reorg_{upgrd_dwngrd,encrypt}_in_prog cw_set_depth will be
+		 * LESS than tmp_cw_set_depth (this is still fine as there is more size allocated than used).
+		 */
+		assert((cw_set_depth == tmp_cw_set_depth) || ((mu_reorg_upgrd_dwngrd_in_prog || mu_reorg_encrypt_in_prog)
+				&& cw_map_depth && (cw_set_depth < tmp_cw_set_depth)));
+		assert(jbp->before_images == csa->jnl_before_image);
+		assert((csa->jnl_state == csd->jnl_state) && (csa->jnl_before_image == csd->jnl_before_image));
+		if (jbp->last_eof_written
+			|| (DISK_BLOCKS_SUM(jbp->rsrv_freeaddr, total_jnl_rec_size) > jbp->filesize))
+		{	/* Moved as part of change to prevent journal records splitting
+			 * across multiple generation journal files. */
+			if (SS_NORMAL != (jnl_status = jnl_flush(jpc->region)))
+			{
+				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 t_end"), jnl_status);
+				assert((!JNL_ENABLED(csd)) && (JNL_ENABLED(csa)));
+				status = cdb_sc_jnlclose;
+				goto failed;
+			} else if (EXIT_ERR == jnl_file_extend(jpc, total_jnl_rec_size))
+			{
+				assert(csd == csa->hdr);	/* jnl_file_extend() shouldn't reset csd in MM */
+				assert((!JNL_ENABLED(csd)) && (JNL_ENABLED(csa)));
+				status = cdb_sc_jnlclose;
+				goto failed;
+			}
+			assert(csd == csa->hdr);	/* If MM, csd shouldn't have been reset */
+		}
+		assert(!jbp->last_eof_written);
+		assert(jgbl.gbl_jrec_time >= jbp->prev_jrec_time);
+		if (MAXUINT4 == jbp->next_epoch_time)
+			jbp->next_epoch_time = (uint4)(jgbl.gbl_jrec_time + jbp->epoch_interval);
+		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);
 		}
 	}
 	/* At this point, we are done with validation and so we need to assert that donot_commit is set to FALSE */
 	assert(!TREF(donot_commit));	/* We should never commit a transaction that was determined restartable */
-	if (REPL_ALLOWED(csa) && (NULL != jnlpool_ctl))
+	assert(jnlpool_ctl == jnlpool.jnlpool_ctl);
+	jrs = NULL;
+	if (REPL_ALLOWED(csa) && (NULL != (jpl = jnlpool.jnlpool_ctl)))	/* note: assignment of "jpl" */
 	{
 		repl_csa = &FILE_INFO(jnlpool.jnlpool_dummy_reg)->s_addrs;
 		if (!repl_csa->hold_onto_crit)
-			grab_lock(jnlpool.jnlpool_dummy_reg, TRUE, ASSERT_NO_ONLINE_ROLLBACK);
+			grab_lock(jnlpool.jnlpool_dummy_reg, TRUE, ASSERT_NO_ONLINE_ROLLBACK);	/* Step CMT02 */
 		assert(repl_csa->now_crit);
 		jnlpool_crit_acquired = TRUE;
 		/* With jnlpool lock held, check instance freeze, and retry if set. */
-		if (jnlpool.jnlpool_ctl->freeze)
+		if (jpl->freeze)
 		{
+			rel_lock(jnlpool.jnlpool_dummy_reg);
 			status = cdb_sc_instancefreeze;
 			goto failed;
 		}
 		if (is_replicator && (inctn_invalid_op == inctn_opcode))
-		{
-			jpl = jnlpool_ctl;
+		{	/* Update needs to write something to the journal pool */
 			replication = TRUE;
-			jplctx.write = jpl->write;
-			jplctx.write_total = 0;
 			temp_jnl_seqno = jpl->jnl_seqno;
+			jnl_fence_ctl.token = temp_jnl_seqno;
 			if (INVALID_SUPPL_STRM != strm_index)
 			{	/* Need to also update supplementary stream seqno */
 				supplementary = TRUE;
 				assert(0 <= strm_index);
 				strm_seqno = jpl->strm_seqno[strm_index];
 				ASSERT_INST_FILE_HDR_HAS_HISTREC_FOR_STRM(strm_index);
+				jnl_fence_ctl.strm_seqno = SET_STRM_INDEX(strm_seqno, strm_index);
 			} else
+			{	/* Note: "supplementary == FALSE" if strm_seqno is 0 is relied upon by "mutex_salvage" */
+				assert(!jnl_fence_ctl.strm_seqno);
 				supplementary = FALSE;
-			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));
-			jplctx.write += SIZEOF(jnldata_hdr_struct);
-			jplctx.write_total += SIZEOF(jnldata_hdr_struct);
-			if (jplctx.write >= jpl->jnlpool_size)
-			{
-				assert(jplctx.write == jpl->jnlpool_size);
-				jplctx.write = 0;
 			}
+			assert(jgbl.cumul_jnl_rec_len);
+			jgbl.cumul_jnl_rec_len += SIZEOF(jnldata_hdr_struct);
 			/* Make sure timestamp of this seqno is >= timestamp of previous seqno. Note: The below macro
 			 * invocation should be done AFTER the ADJUST_GBL_JREC_TIME call as the below resets
 			 * jpl->prev_jnlseqno_time. Doing it the other way around would mean the reset will happen
 			 * with a potentially lower value than the final adjusted time written in the jnl record.
 			 */
 			ADJUST_GBL_JREC_TIME_JNLPOOL(jgbl, jpl);
-			assert(jpl->early_write_addr == jpl->write_addr);
-			jpl->early_write_addr = jpl->write_addr + tmp_cumul_jnl_rec_len;
-			/* Source server does not read in crit. It relies on early_write_addr, the transaction
-			 * data, lastwrite_len, write_addr being updated in that order. To ensure this order,
-			 * we have to force out early_write_addr to its coherency point now. If not, the source
-			 * server may read data that is overwritten (or stale). This is true only on
-			 * architectures and OSes that allow unordered memory access
+			UPDATE_JPL_RSRV_WRITE_ADDR(jpl, jnlpool, jgbl.cumul_jnl_rec_len);/* sets jpl->rsrv_write_addr. Step CMT03 */
+			/* Source server does not read in crit. It relies on the transaction data, lastwrite_len,
+			 * rsrv_write_addr being updated in that order. To ensure this order, we have to force out
+			 * rsrv_write_addr to its coherency point now. If not, the source server may read data that
+			 * is overwritten (or stale). This is true only on architectures and OSes that allow unordered
+			 * memory access.
 			 */
 			SHM_WRITE_MEMORY_BARRIER;
 		}
 	}
 	assert(TN_NOT_SPECIFIED > MAX_TN_V6); /* Ensure TN_NOT_SPECIFIED isn't a valid TN number */
 	blktn = (TN_NOT_SPECIFIED == ctn) ? dbtn : ctn;
-	cti->early_tn = dbtn + 1;
+	cti->early_tn = dbtn + 1;	/* Step CMT04 */
+	csa->t_commit_crit = T_COMMIT_CRIT_PHASE0;	/* phase0 : write journal records. Step CMT05 */
 	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.
-		 */
-		if (!com_csum)
-		{
-			ADJUST_CHECKSUM_TN(INIT_CHECKSUM_SEED, &dbtn, com_csum);
-			ADJUST_CHECKSUM(com_csum, csa->jnl->pini_addr, com_csum);
-			ADJUST_CHECKSUM(com_csum, jgbl.gbl_jrec_time, com_csum);
-		}
+	{
+		jrs = TREF(nontp_jbuf_rsrv);
+		REINIT_JBUF_RSRV_STRUCT(jrs, csa, jpc, jbp);
+		if (0 == jpc->pini_addr)
+			jnl_write_reserve(csa, jrs, JRT_PINI, PINI_RECLEN, NULL);
 		DEBUG_ONLY(save_gbl_jrec_time = jgbl.gbl_jrec_time;)
-		if (jbp->before_images)
-		{	/* do not write PBLKs if MUPIP REORG UPGRADE/DOWNGRADE with -NOSAFEJNL */
-			if ((!mu_reorg_upgrd_dwngrd_in_prog && !mu_reorg_encrypt_in_prog) || !mu_reorg_nosafejnl)
+		if (jbp->before_images && !mu_reorg_nosafejnl)
+		{	/* Write out before-update journal image records.
+			 * Do not write PBLKs if MUPIP REORG UPGRADE/DOWNGRADE with -NOSAFEJNL.
+			 */
+			epoch_tn = jbp->epoch_tn; /* store in a local as it is used in a loop below */
+			for (cs = cw_set, cs_top = cs + cw_set_depth;  cs < cs_top;  ++cs)
 			{
-				epoch_tn = jbp->epoch_tn; /* store in a local as it is used in a loop below */
-				for (cs = cw_set, cs_top = cs + cw_set_depth;  cs < cs_top;  ++cs)
-				{
-					/* PBLK computations for FREE blocks are not needed */
-					if (WAS_FREE(cs->blk_prior_state))
+				/* PBLK computations for FREE blocks are not needed */
+				if (WAS_FREE(cs->blk_prior_state))
+					continue;
+				mode = cs->mode;
+				if (gds_t_committed < mode)
+				{	/* There are three possibilities at this point.
+					 * a) gds_t_write_root : In this case no need to write PBLK.
+					 * b) gds_t_busy2free : This is set by gvcst_bmp_mark_free to indicate
+					 *	that a block has to be freed right away instead of taking it
+					 *	through the RECYCLED state. This should be done only if
+					 *	csd->db_got_to_v5_once has not yet become TRUE. Once it is
+					 *	TRUE, block frees will write PBLK only when the block is reused.
+					 *      An exception is when the block is a level-0 block in directory
+					 * 	tree, we always write PBLK immediately.
+					 * c) gds_t_recycled2free: Need to write PBLK
+					 */
+					assert((gds_t_write_root == mode) || (gds_t_busy2free == mode)
+						|| (gds_t_recycled2free == mode));
+					if (!SAVE_2FREE_IMAGE(mode, free_seen, csd))
 						continue;
-					/* write out before-update journal image records */
-					mode = cs->mode;
-					if (gds_t_committed < mode)
-					{	/* There are three possibilities at this point.
-						 * a) gds_t_write_root : In this case no need to write PBLK.
-						 * b) gds_t_busy2free : This is set by gvcst_bmp_mark_free to indicate
-						 *	that a block has to be freed right away instead of taking it
-						 *	through the RECYCLED state. This should be done only if
-						 *	csd->db_got_to_v5_once has not yet become TRUE. Once it is
-						 *	TRUE, block frees will write PBLK only when the block is reused.
-						 *      An exception is when the block is a level-0 block in directory
-						 * 	tree, we always write PBLK immediately.
-						 * c) gds_t_recycled2free: Need to write PBLK
-						 */
-						assert((gds_t_write_root == mode) || (gds_t_busy2free == mode)
-							|| (gds_t_recycled2free == mode));
-						if (!SAVE_2FREE_IMAGE(mode, free_seen, csd))
-							continue;
-					}
-					old_block = (blk_hdr_ptr_t)cs->old_block;
-					ASSERT_IS_WITHIN_SHM_BOUNDS((sm_uc_ptr_t)old_block, csa);
-					DBG_ENSURE_OLD_BLOCK_IS_VALID(cs, is_mm, csa, csd);
-					if ((NULL != old_block) && (old_block->tn < epoch_tn))
-					{
-						bsiz = old_block->bsiz;
-						assert((bsiz <= csd->blk_size) || IS_DSE_IMAGE);
-						assert(bsiz >= SIZEOF(blk_hdr) || IS_DSE_IMAGE);
-						/* For acquired or gds_t_busy2free blocks, we should have computed
-						 * checksum already. The only exception is if we found no need to
-						 * compute checksum outside of crit but before we got crit, an
-						 * EPOCH got written concurrently so we have to write a PBLK (and
-						 * hence compute the checksum as well) when earlier we thought none
-						 * was necessary. An easy way to check this is that an EPOCH was
-						 * written AFTER we started this transaction.
-						 */
-						assert((gds_t_acquired != cs->mode) || (gds_t_busy2free != cs->mode)
-							|| cs->blk_checksum || (epoch_tn >= start_tn));
-						/* It is possible that the block has a bad block-size.
-						 * Before computing checksum ensure bsiz passed is safe.
-						 * The checks done here for "bsiz" assignment are
-						 * similar to those done in jnl_write_pblk/jnl_write_aimg.
-						 */
-						if (IS_DSE_IMAGE)
-							bsiz = MIN(bsiz, csd->blk_size);
-						assert(!cs->blk_checksum
-							|| (cs->blk_checksum == jnl_get_checksum(old_block, csa, bsiz)));
-						if (!cs->blk_checksum)
-							cs->blk_checksum = jnl_get_checksum(old_block, csa, bsiz);
-						if (NEEDS_ANY_KEY(csd, old_block->tn))
-						{
-							DBG_ENSURE_PTR_IS_VALID_GLOBUFF(csa, csd, (sm_uc_ptr_t)old_block);
-							DEBUG_ONLY(save_old_block = old_block;)
-							old_block = (blk_hdr_ptr_t)GDS_ANY_ENCRYPTGLOBUF(old_block, csa);
-							/* Ensure that unencrypted block and its twin counterpart are in sync. */
-							assert(save_old_block->tn == old_block->tn);
-							assert(save_old_block->bsiz == old_block->bsiz);
-							assert(save_old_block->levl == old_block->levl);
-							DBG_ENSURE_PTR_IS_VALID_ENCTWINGLOBUFF(csa,
-											       csd,
-											       (sm_uc_ptr_t)old_block);
-						}
-						jnl_write_pblk(csa, cs, old_block, com_csum);
-						cs->jnl_freeaddr = jbp->freeaddr;
-					}
-					DEBUG_ONLY(
-					else
-						assert(0 == cs->jnl_freeaddr);
-					)
+				}
+				old_block = (blk_hdr_ptr_t)cs->old_block;
+				ASSERT_IS_WITHIN_SHM_BOUNDS((sm_uc_ptr_t)old_block, csa);
+				DBG_ENSURE_OLD_BLOCK_IS_VALID(cs, is_mm, csa, csd);
+				assert(((NULL != old_block) && (old_block->tn < epoch_tn)) || (0 == cs->jnl_freeaddr));
+				if ((NULL != old_block) && (old_block->tn < epoch_tn))
+				{
+					bsiz = old_block->bsiz;
+					assert((bsiz <= csd->blk_size) || IS_DSE_IMAGE);
+					assert(bsiz >= SIZEOF(blk_hdr) || IS_DSE_IMAGE);
+					/* For acquired or gds_t_busy2free blocks, we should have computed
+					 * checksum already. The only exception is if we found no need to
+					 * compute checksum outside of crit but before we got crit, an
+					 * EPOCH got written concurrently so we have to write a PBLK (and
+					 * hence compute the checksum as well) when earlier we thought none
+					 * was necessary. An easy way to check this is that an EPOCH was
+					 * written AFTER we started this transaction.
+					 */
+					assert((gds_t_acquired != cs->mode) || (gds_t_busy2free != cs->mode)
+						|| cs->blk_checksum || (epoch_tn >= start_tn));
+					/* It is possible that the block has a bad block-size.
+					 * Before computing checksum ensure bsiz passed is safe.
+					 * The checks done here for "bsiz" assignment are
+					 * similar to those done in jnl_write_pblk/jnl_write_aimg.
+					 */
+					bsiz = MIN(bsiz, csd->blk_size);	/* be safe in PRO */
+					bsiz += FIXED_PBLK_RECLEN + JREC_SUFFIX_SIZE;
+					bsiz = ROUND_UP2(bsiz, JNL_REC_START_BNDRY);
+					jnl_write_reserve(csa, jrs, JRT_PBLK, bsiz, cs);
 				}
 			}
 		}
@@ -1412,7 +1379,12 @@ trans_num t_end(srch_hist *hist1, srch_hist *hist2, trans_num ctn)
 			assert(1 == cw_set_depth); /* only one block at a time */
 			assert(!replication);
 			cs = cw_set;
-			jnl_write_aimg_rec(csa, cs, com_csum);
+			old_block = (blk_hdr_ptr_t)cs->new_buff;
+			bsiz = old_block->bsiz;
+			bsiz = MIN(bsiz, csd->blk_size);	/* be safe in PRO */
+			bsiz += FIXED_AIMG_RECLEN + JREC_SUFFIX_SIZE;
+			bsiz = ROUND_UP2(bsiz, JNL_REC_START_BNDRY);
+			jnl_write_reserve(csa, jrs, JRT_AIMG, bsiz, cs);
 		} else if (write_inctn)
 		{
 			assert(!replication);
@@ -1436,36 +1408,52 @@ trans_num t_end(srch_hist *hist1, srch_hist *hist2, trans_num ctn)
 								? inctn_blkupgrd_fmtchng : inctn_blkdwngrd_fmtchng;
 				}
 			}
-			jnl_write_inctn_rec(csa);
+			jnl_write_reserve(csa, jrs, JRT_INCTN, INCTN_RECLEN, NULL);
 		} else if (0 == jnl_fence_ctl.level)
 		{
 			assert(!replication || !jgbl.forw_phase_recovery);
-			if (replication)
-			{
-				jnl_fence_ctl.token = temp_jnl_seqno;
-				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 */
-			jnl_write_logical(csa, non_tp_jfb_ptr, com_csum, &jplctx);
+			if (!replication && !jgbl.forw_phase_recovery)
+				jnl_fence_ctl.token = 0;
+			/* In case of forw-phase of recovery, jnl_fence_ctl.token would have been set by mur_output_record */
+			jnl_write_reserve(csa, jrs, non_tp_jfb_ptr->rectype, non_tp_jfb_ptr->record_size, non_tp_jfb_ptr);
 		} else
-			jnl_write_ztp_logical(csa, non_tp_jfb_ptr, com_csum, temp_jnl_seqno, &jplctx);
+		{
+			if (0 == jnl_fence_ctl.token)
+			{	/* generate token once after op_ztstart and use for all its mini-transactions
+				 * jnl_fence_ctl.token is set to 0 in op_ztstart.
+				 */
+				assert(!replication);
+				TOKEN_SET(&jnl_fence_ctl.token, local_tn, process_id);
+			}
+			jnl_write_reserve(csa, jrs, non_tp_jfb_ptr->rectype, non_tp_jfb_ptr->record_size, non_tp_jfb_ptr);
+		}
+		UPDATE_JRS_RSRV_FREEADDR(csa, jpc, jbp, jrs, jpl, jnl_fence_ctl, replication);	/* updates jbp->rsrv_freeaddr.
+												 * Step CMT06
+												 */
+		/* In non-TP, there is a max of ONE set journal record that can take MAX_LOGI_JNL_REC_SIZE.
+		 * This is guaranteed to fit in a journal buffer whose minimum size JNL_BUFFER_MIN is defined
+		 * such that it takes all this into account.
+		 */
+		assert(!IS_PHASE2_JNL_COMMIT_NEEDED_IN_CRIT(jbp, jrs->tot_jrec_len));
 		/* Ensure jgbl.gbl_jrec_time did not get reset by any of the jnl writing functions */
 		assert(save_gbl_jrec_time == jgbl.gbl_jrec_time);
+		/* If MM, there is no 2-phase commit for db. Likewise no 2-phase commit for journal. Do it all inside crit */
+		if (is_mm)
+			NONTP_FINISH_JNL_PHASE2_IN_JNLBUFF_AND_JNLPOOL(csa, jrs, replication, jnlpool);	/* Step CMT06a & CMT06b */
 	} else if (replication)
 	{	/* Case where JNL_ENABLED(csa) is FALSE but REPL_WAS_ENABLED(csa) is TRUE and therefore we need to
 		 * write logical jnl records in the journal pool (no need to write in journal buffer or journal file).
 		 */
 		assert(!JNL_ENABLED(csa) && REPL_WAS_ENABLED(csa));
-		if (0 == jnl_fence_ctl.level)
-		{
-			jnl_fence_ctl.token = temp_jnl_seqno;
-			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);
+		assert(0 == jnl_fence_ctl.level);	/* ZTP & replication are not supported */
+		jpc = csa->jnl;
+		jbp = jpc->jnl_buff;
+		jrs = TREF(nontp_jbuf_rsrv);
+		REINIT_JBUF_RSRV_STRUCT(jrs, csa, jpc, jbp);
+		jnl_write_reserve(csa, jrs, non_tp_jfb_ptr->rectype, non_tp_jfb_ptr->record_size, non_tp_jfb_ptr);
+		/* If MM, there is no 2-phase commit for db. Likewise no 2-phase commit for journal. Do it all inside crit */
+		if (is_mm)
+			NONTP_FINISH_JNL_PHASE2_IN_JNLBUFF_AND_JNLPOOL(csa, jrs, replication, jnlpool);	/* Step CMT06a & CMT06b */
 	}
 	if (free_seen)
 	{	/* Write to snapshot and backup file for busy2free and recycled2free mode. These modes only appear in
@@ -1496,20 +1484,37 @@ trans_num t_end(srch_hist *hist1, srch_hist *hist2, trans_num ctn)
 					WRITE_SNAPSHOT_BLOCK(cs_addrs, cr, NULL, blkid, lcl_ss_ctx);
 			}
 		}
-	}
-	if (replication)
-	{
-		temp_jnl_seqno++;
-		assert(csa->hdr->reg_seqno < temp_jnl_seqno);
-		csa->hdr->reg_seqno = temp_jnl_seqno;
-		if (supplementary)
+		/* Write the journal record before releasing crit as we will UNPIN the associated cache-records before
+		 * releasing crit (sooner than normal).
+		 */
+		if (NEED_TO_FINISH_JNL_PHASE2(jrs))
 		{
-			next_strm_seqno = strm_seqno + 1;
-			csa->hdr->strm_reg_seqno[strm_index] = next_strm_seqno;
+			/* "jnl_write_pblk" will look at "cse->old_mode" (instead of cse->mode) with the assumption that
+			 * it is called in phase2 after crit has been released. But in this case we are calling
+			 * "jnl_write_phase2" (which in turn calls "jnl_write_pblk") before releasing crit.
+			 * So set cse->old_mode = cse->mode before the call.
+			 */
+			first_jre = jrs->jrs_array;
+			jre_top = first_jre + jrs->usedlen;
+			for (jre = first_jre; jre < jre_top; jre++)
+			{
+				if (JRT_PBLK != jre->rectype)
+					continue;
+				cs = (cw_set_element *)jre->param1;
+				cs->old_mode = cs->mode;
+			}
+			assert(!replication);	/* so "JPL_PHASE2_WRITE_COMPLETE" does not need to be called inside
+						 * NONTP_FINISH_JNL_PHASE2_IN_JNLBUFF_AND_JNLPOOL invocation below.
+						 */
+			NONTP_FINISH_JNL_PHASE2_IN_JNLBUFF_AND_JNLPOOL(csa, jrs, replication, jnlpool);	/* Step CMT06a */
 		}
 	}
+	if (replication)
+		SET_JNL_SEQNO(jpl, temp_jnl_seqno, supplementary, strm_seqno, strm_index, next_strm_seqno);	/* Step CMT07 */
 	csa->prev_free_blks = cti->free_blocks;
-	csa->t_commit_crit = T_COMMIT_CRIT_PHASE1;
+	SET_T_COMMIT_CRIT_PHASE1(csa, cnl, dbtn); /* Step CMT08 */
+	if (replication)
+		SET_REG_SEQNO(csa, temp_jnl_seqno, supplementary, strm_index, next_strm_seqno, SKIP_ASSERT_FALSE); /* Step CMT09 */
 	if (cw_set_depth)
 	{
 		if (!is_mm)	/* increment counter of # of processes that are actively doing two-phase commit */
@@ -1528,18 +1533,18 @@ trans_num t_end(srch_hist *hist1, srch_hist *hist2, trans_num ctn)
 			cs->old_mode = (int4)mode;	/* note down before being reset to gds_t_committed */
 			if (gds_t_committed > mode)
 			{
-				DEBUG_ONLY(
-					/* Check bitmap status of block we are about to modify.
-					 * Two exceptions are
-					 *	a) DSE which can modify bitmaps at will.
-					 *	b) MUPIP RECOVER writing an AIMG. In this case it is playing
-					 *		forward a DSE action so is effectively like DSE doing it.
-					 */
-					if (!IS_DSE_IMAGE && !write_after_image)
-						bml_status_check(cs);
-				)
+#				ifdef DEBUG
+				/* Check bitmap status of block we are about to modify.
+				 * Two exceptions are
+				 *	a) DSE which can modify bitmaps at will.
+				 *	b) MUPIP RECOVER writing an AIMG. In this case it is playing
+				 *		forward a DSE action so is effectively like DSE doing it.
+				 */
+				if (!IS_DSE_IMAGE && !write_after_image)
+					bml_status_check(cs);
+#				endif
 				if (is_mm)
-					status = mm_update(cs, dbtn, blktn, dummysi);
+					status = mm_update(cs, dbtn, blktn, dummysi);	/* Step CMT10 */
 				else
 				{
 					if (csd->dsid)
@@ -1568,10 +1573,16 @@ trans_num t_end(srch_hist *hist1, srch_hist *hist2, trans_num ctn)
 					 * (to reduce restarts due to bitmap collisions) is addressed, we can reexamine
 					 * whether it makes sense to move bitmap block builds back to phase2.
 					 */
-					status = bg_update_phase1(cs, dbtn, dummysi);
+					status = bg_update_phase1(cs, dbtn, dummysi);	/* Step CMT10 */
 					if ((cdb_sc_normal == status) && (gds_t_writemap == mode))
-					{
-						status = bg_update_phase2(cs, dbtn, blktn, dummysi);
+					{	/* If we are about to do phase2 db commit while holding crit,
+						 * then check if jnl phase2 is pending. If so do it also in crit
+						 * before the first db phase2 commit happens.
+						 */
+						if (NEED_TO_FINISH_JNL_PHASE2(jrs))
+							NONTP_FINISH_JNL_PHASE2_IN_JNLBUFF_AND_JNLPOOL(csa,	\
+									jrs, replication, jnlpool); /* Step CMT06a & CMT06b */
+						status = bg_update_phase2(cs, dbtn, blktn, dummysi);	/* Step CMT10a */
 						if (cdb_sc_normal == status)
 							cs->mode = gds_t_committed;
 					}
@@ -1595,7 +1606,7 @@ trans_num t_end(srch_hist *hist1, srch_hist *hist2, trans_num ctn)
 		}
 	}
 	/* signal secshr_db_clnup/t_commit_cleanup, roll-back is no longer possible */
-	update_trans |= UPDTRNS_TCOMMIT_STARTED_MASK;
+	update_trans |= UPDTRNS_TCOMMIT_STARTED_MASK; /* Step CMT11 */
 	assert(cdb_sc_normal == status);
 	/* should never increment curr_tn on a frozen database except if DSE */
 	assert(!(FROZEN_HARD(csd) || (replication && jnlpool.jnlpool_ctl->freeze)) || IS_DSE_IMAGE);
@@ -1604,8 +1615,10 @@ trans_num t_end(srch_hist *hist1, srch_hist *hist2, trans_num ctn)
 	 */
 	if (is_mm)
 		MM_WRITE_MEMORY_BARRIER;
-	INCREMENT_CURR_TN(csd);
-	csa->t_commit_crit = T_COMMIT_CRIT_PHASE2;	/* set this BEFORE releasing crit but AFTER incrementing curr_tn */
+	INCREMENT_CURR_TN(csd); /* Step CMT12 */
+	csa->t_commit_crit = T_COMMIT_CRIT_PHASE2;	/* phase2 : update database buffers. Step CMT13.
+							 * Set this BEFORE releasing crit but AFTER incrementing curr_tn.
+							 */
 	/* If db is journaled, then db header is flushed periodically when writing the EPOCH record,
 	 * otherwise do it here every HEADER_UPDATE_COUNT transactions.
 	 */
@@ -1623,7 +1636,7 @@ trans_num t_end(srch_hist *hist1, srch_hist *hist2, trans_num ctn)
 			csa->nl->root_search_cycle++;
 		}
 	}
-	start_tn = dbtn; /* start_tn temporarily used to store currtn (for bg_update_phase2) before releasing crit */
+	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 */
 		assert((2 <= cr_array_index) && (cr_array_index <= 3));	/* 3 is possible if we pinned a twin for bitmap update */
@@ -1631,66 +1644,23 @@ trans_num t_end(srch_hist *hist1, srch_hist *hist2, trans_num ctn)
 		UNPIN_CACHE_RECORD(cr_array[0]);
 	}
 	if (!csa->hold_onto_crit)
-		rel_crit(reg);
-	if (replication)
-	{
-		assert(jpl->early_write_addr > jpl->write_addr);
-		assert(tmp_cumul_jnl_rec_len == (jplctx.write - jpl->write + (jplctx.write > jpl->write ? 0 : jpl->jnlpool_size)));
-		/* the following statements should be atomic */
-		jnl_header = (jnldata_hdr_ptr_t)(jnlpool.jnldata_base + jpl->write);
-		jnl_header->jnldata_len = tmp_cumul_jnl_rec_len;
-		jnl_header->prev_jnldata_len = jpl->lastwrite_len;
-		/* The following assert should be an == rather than a >= (as in tp_tend) because, we have
-		 * either one or no update.  If no update, we would have no cw_depth and we wouldn't enter
-		 * this path.  If there is an update, then both the indices should be 1.
-		 */
-		INT8_ONLY(assert(jgbl.cumul_index == jgbl.cu_jnl_index));
-		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
-		 * write_addr before seeing the change to jnlheader->jnldata_len, leading it to read an
-		 * invalid transaction length. To avoid such conditions, we should commit the order of
-		 * shared memory updates before we update write_addr. This ensures that the source server
-		 * sees all shared memory updates related to a transaction before the change in write_addr
-		 */
-		SHM_WRITE_MEMORY_BARRIER;
-		jpl->write = jplctx.write;
-		/* jpl->write_addr should be updated before updating jpl->jnl_seqno as secshr_db_clnup relies on this */
-		jpl->write_addr += jplctx.write_total;
-		if ((jplctx.write_total != jnl_header->jnldata_len)
-				DEBUG_ONLY(|| ((0 != TREF(gtm_test_jnlpool_sync))
-						&& (0 == (temp_jnl_seqno % TREF(gtm_test_jnlpool_sync))))))
-		{	/* Our accounting got out of sync somehow. Drop a core and force the journal pool to overflow. */
-			if (!jpl->outofsync_core_generated
-					DEBUG_ONLY(&& ((0 == TREF(gtm_test_jnlpool_sync))
-							|| (0 != (temp_jnl_seqno % TREF(gtm_test_jnlpool_sync))))))
-			{
-				jpl->outofsync_core_generated = TRUE;
-				gtm_fork_n_core();
-			}
-			/* The source server considers an increment to early_write_addr greater than the jnlpool_size as
-			 * an overflow, so add twice the jnlpool_size to early_write_addr and write_addr to keep them aligned
-			 * with each other and with write.
-			 */
-			jnlpool_overflow_size = jpl->jnlpool_size * 2ull;	/* Use ull to force 64-bit multiplication */
-			jpl->early_write_addr += jnlpool_overflow_size;
-			jpl->write_addr += jnlpool_overflow_size;
-			send_msg_csa(CSA_ARG(csa) VARLSTCNT(5) ERR_JNLPOOLRECOVERY, 3, jplctx.write_total, jnl_header->jnldata_len,
-									jpl->jnlpool_id.instfilename);
-		}
-		assert(jpl->early_write_addr == jpl->write_addr);
-		assert(jplctx.write == (jpl->write_addr % jpl->jnlpool_size));
-		jpl->jnl_seqno = temp_jnl_seqno;
-	}
+		rel_crit(reg);	/* Step CMT14 */
+	/* Now that all buffers needed for commit are locked in shared memory (in phase1 for BG), it is safe to
+	 * release the jnlpool lock. Releasing it before this could cause an instance freeze to sneak in while
+	 * the phase1 is still midway causing trouble for this transaction in case it needs to do any db/jnl writes.
+	 */
 	if (jnlpool_crit_acquired)
 	{
 		assert((NULL != jnlpool_ctl) && repl_csa->now_crit && REPL_ALLOWED(csa));
-		rel_lock(jnlpool.jnlpool_dummy_reg);
+		rel_lock(jnlpool.jnlpool_dummy_reg);	/* Step CMT15 */
 	}
 	/* If BG, check that we have not pinned any more buffers than we are updating */
 	DBG_CHECK_PINNED_CR_ARRAY_CONTENTS(csd, is_mm, cr_array, cr_array_index);
+	assert((NULL == jrs) || JNL_ALLOWED(csa));
+	assert((NULL == jrs) || !jrs->tot_jrec_len || !replication || jnlpool.jrs.tot_jrec_len);
+	assert((NULL == jrs) || jrs->tot_jrec_len || !replication || !jnlpool.jrs.tot_jrec_len);
+	if (NEED_TO_FINISH_JNL_PHASE2(jrs))
+		NONTP_FINISH_JNL_PHASE2_IN_JNLBUFF_AND_JNLPOOL(csa, jrs, replication, jnlpool);	/* Step CMT16 & CMT17 */
 	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.
@@ -1707,7 +1677,7 @@ trans_num t_end(srch_hist *hist1, srch_hist *hist2, trans_num ctn)
 					 * Note that cs->old_mode is negated by bg_update_phase1 (to help secshr_db_clnup).
 					 */
 					assert(-cs->old_mode == mode);
-					status = bg_update_phase2(cs, dbtn, blktn, dummysi);
+					status = bg_update_phase2(cs, dbtn, blktn, dummysi);	/* Step CMT18 */
 					if (cdb_sc_normal != status)
 					{	/* the database is probably in trouble */
 						INVOKE_T_COMMIT_CLEANUP(status, csa);
@@ -1736,14 +1706,12 @@ trans_num t_end(srch_hist *hist1, srch_hist *hist2, trans_num ctn)
 	}
 	ASSERT_CR_ARRAY_IS_UNPINNED(csd, cr_array, cr_array_index);
 	cr_array_index = 0;
-	csa->t_commit_crit = FALSE;
+	csa->t_commit_crit = FALSE;	/* Step CMT19 */
 	/* 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.
 	 */
 	if (SNAPSHOTS_IN_PROG(csa))
-	{
 		SS_RELEASE_IF_NEEDED(csa, cnl);
-	}
 
 skip_cr_array:
 	assert(!csa->now_crit || csa->hold_onto_crit);
@@ -1824,9 +1792,11 @@ failed_skip_revert:
 	assert(!csa->now_crit || !NEED_TO_RELEASE_CRIT(t_tries, status) || csa->hold_onto_crit);
 	DEFERRED_EXIT_HANDLING_CHECK; /* now that all crits are released, check if deferred signal/exit handling needs to be done */
 	t_retry(status);
-	/* in the retry case, we do not do a CWS_RESET as cw_stagnate is used only in the
-	 * final retry in which case t_end will succeed and do a CWS_RESET
+	/* Note that even though cw_stagnate is used only in the final retry, it is possible we restart in the final retry
+	 * (see "final_retry_ok" codes in cdb_sc_table.h) and so a CWS_RESET is necessary in that case. It is anyways a no-op
+	 * for non-final-retry restarts (relies on "cw_stagnate_reinitialized") so do it always to avoid unnecessary "if" check.
 	 */
+	CWS_RESET;
 	cw_map_depth = 0;
 	assert(0 == cr_array_index);
 	return 0;
diff --git a/sr_port/t_end_sysops.c b/sr_port/t_end_sysops.c
index d079c96..6f880cb 100644
--- a/sr_port/t_end_sysops.c
+++ b/sr_port/t_end_sysops.c
@@ -290,9 +290,17 @@ enum cdb_sc	mm_update(cw_set_element *cs, trans_num ctn, trans_num effective_tn,
 	sm_uc_ptr_t		chain_ptr, db_addr[2];
 	boolean_t 		write_to_snapshot_file;
 	snapshot_context_ptr_t	lcl_ss_ctx;
+#	ifdef DEBUG
+	jbuf_rsrv_struct_t	*jrs;
+#	endif
 	DCL_THREADGBL_ACCESS;
 
 	SETUP_THREADGBL_ACCESS;
+#	ifdef DEBUG
+	/* Assert that we never start db commit until all journal records have been written out in phase2 */
+	jrs = dollar_tlevel ? cs_addrs->sgm_info_ptr->jbuf_rsrv_ptr : TREF(nontp_jbuf_rsrv);
+	assert((NULL == jrs) || !jrs->tot_jrec_len);
+#	endif
 	assert(cs_addrs->now_crit);
 	assert((gds_t_committed > cs->mode) && (gds_t_noop < cs->mode));
 	INCR_DB_CSH_COUNTER(cs_addrs, n_bgmm_updates, 1);
@@ -934,6 +942,12 @@ enum cdb_sc	bg_update_phase1(cw_set_element *cs, trans_num ctn, sgm_info *si)
 	}
 	/* Take backup of block in phase2 (outside of crit). */
 	cs->cr = cr;		/* note down "cr" so phase2 can find it easily (given "cs") */
+	/* If this is the first time the the database block has been written, we must write
+	 * the entire database block if gtm_fullblockwrites = 2 */
+	/* Note that the check for gtm_fullblockwrites happens when we decide to write the block,
+	 * not here; so if the block is new, mark as needing first write */
+	if (WAS_FREE(cs->blk_prior_state))
+		cs->cr->needs_first_write = TRUE;
 	cs->cycle = cr->cycle;	/* update "cycle" as well (used later in tp_clean_up to update cycle in history) */
 	cs->old_mode = -cs->old_mode;	/* negate it to indicate phase1 is complete for this cse (used by secshr_db_clnup) */
 	assert(0 > cs->old_mode);
@@ -970,6 +984,9 @@ enum cdb_sc	bg_update_phase2(cw_set_element *cs, trans_num ctn, trans_num effect
 	cache_que_heads_ptr_t	cache_state;
 	boolean_t 		write_to_snapshot_file;
 	snapshot_context_ptr_t	lcl_ss_ctx;
+#	ifdef DEBUG
+	jbuf_rsrv_struct_t	*jrs;
+#	endif
 	DCL_THREADGBL_ACCESS;
 
 	SETUP_THREADGBL_ACCESS;
@@ -989,6 +1006,11 @@ enum cdb_sc	bg_update_phase2(cw_set_element *cs, trans_num ctn, trans_num effect
 	assert(-1 == cr->read_in_progress);
 	assert(LATCH_SET <= WRITE_LATCH_VAL(cr));	/* Assert that we hold the update lock on the cache-record */
 	csa = cs_addrs;		/* Local access copies */
+#	ifdef DEBUG
+	/* Assert that we never start phase2 of db commit until all journal records have been written out in phase2 */
+	jrs = dollar_tlevel ? csa->sgm_info_ptr->jbuf_rsrv_ptr : TREF(nontp_jbuf_rsrv);
+	assert((NULL == jrs) || !jrs->tot_jrec_len);
+#	endif
 	csd = csa->hdr;
 	cnl = csa->nl;
 	blkid = cs->blk;
diff --git a/sr_port/t_qread.c b/sr_port/t_qread.c
index 5bbfad2..db18c07 100755
--- a/sr_port/t_qread.c
+++ b/sr_port/t_qread.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,6 +55,7 @@
 #include "process_reorg_encrypt_restart.h"
 #include "wcs_backoff.h"
 #include "wcs_wt.h"
+#include "wcs_recover.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
@@ -655,7 +656,24 @@ sm_uc_ptr_t t_qread(block_id blk, sm_int_ptr_t cycle, cache_rec_ptr_ptr_t cr_out
 							return (sm_uc_ptr_t)NULL;
 						}
 						if (!wcs_phase2_commit_wait(csa, cr))
-						{	/* Timed out waiting for cr->in_tend to become non-zero. Restart. */
+						{	/* Timed out waiting for cr->in_tend to become non-zero. Restart.
+							 * But before that, if not holding crit, do a "wcs_recover" to fix
+							 * the problem before starting the next try. Check if "cr->in_tend"
+							 * is still non-zero after getting crit to avoid lots of unnecessary
+							 * calls to "wcs_recover".
+							 */
+							assert(was_crit == csa->now_crit);
+							if (!was_crit)
+							{
+								assert(!hold_onto_crit);
+								grab_crit_encr_cycle_sync(gv_cur_region);
+								if (blocking_pid == cr->in_tend)
+								{
+									wcs_recover(gv_cur_region);
+									assert(!cr->in_tend);
+								}
+								rel_crit(gv_cur_region);
+							}
 							rdfail_detail = cdb_sc_phase2waitfail;
 							return (sm_uc_ptr_t)NULL;
 						}
@@ -684,8 +702,11 @@ sm_uc_ptr_t t_qread(block_id blk, sm_int_ptr_t cycle, cache_rec_ptr_ptr_t cr_out
 				break;
 			if (lcnt >= BUF_OWNER_STUCK && (0 == (lcnt % BUF_OWNER_STUCK)))
 			{
-				if (!csa->now_crit && !hold_onto_crit)
+				if (!csa->now_crit)
+				{
+					assert(!hold_onto_crit);
 					grab_crit_encr_cycle_sync(gv_cur_region);
+				}
 				if (cr->read_in_progress < -1)
 				{	/* outside of design; clear to known state */
 					BG_TRACE_PRO(t_qread_out_of_design);
diff --git a/sr_port/t_retry.c b/sr_port/t_retry.c
index e63c222..d644472 100755
--- a/sr_port/t_retry.c
+++ b/sr_port/t_retry.c
@@ -299,6 +299,8 @@ void t_retry(enum cdb_sc failure)
 			 * (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.
+			 * (j) cdb_sc_phase2waitfail : We notice a block with a non-zero cr->in_tend in "t_qread" for the first
+			 *	time in the final retry.
 			 */
 			assert(cdb_sc_optrestart != failure);
 			if (IS_FINAL_RETRY_CODE(failure))
@@ -544,6 +546,13 @@ void t_retry(enum cdb_sc failure)
 					gvcst_redo_root_search();
 				}
 				break;
+			case cdb_sc_phase2waitfail:
+				/* No action needed since if we are in the final retry, we would have set wc_blocked (as part of
+				 * the SET_WC_BLOCKED_FINAL_RETRY_IF_NEEDED call above) and the "grab_crit_encr_cycle_sync" call
+				 * done a few lines later would have called "grab_crit" & "wcs_recover" which would have
+				 * fixed the phase2-commit/non-zero-"cr->in_tend" issue.
+				 */
+				break;
 			default:
 				break;
 		}
diff --git a/sr_port/tab_bg_trc_rec.h b/sr_port/tab_bg_trc_rec.h
index 5898113..32638ff 100755
--- a/sr_port/tab_bg_trc_rec.h
+++ b/sr_port/tab_bg_trc_rec.h
@@ -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	*
@@ -20,7 +20,7 @@ TAB_BG_TRC_REC("  Writes by wcs_wtstart ", wrt_count)			/* # of writes done in w
 TAB_BG_TRC_REC("  Writes were blocked   ", wrt_blocked)			/* # of times wc_blocked was on in wcs_wtstart */
 TAB_BG_TRC_REC("  Writer was busy       ", wrt_busy)			/* Encountered wcs_wtstart lock */
 TAB_BG_TRC_REC("  Writer fnd no writes  ", wrt_noblks_wrtn)		/* Times wcs_wtstart ran queues but nothing written */
-TAB_BG_TRC_REC("  Reserved filler bg_trc", reserved_bgtrcrec1)		/* Reserved filler to match length of VMS section */
+TAB_BG_TRC_REC("  WcBlocked gds_rundown2", wcb_gds_rundown2)
 TAB_BG_TRC_REC("  Reserved filler bg_trc", reserved_bgtrcrec2)		/* Reserved filler to match length of VMS section */
 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  */
@@ -79,12 +79,12 @@ TAB_BG_TRC_REC("  Epoch Timer Writes    ", n_dbsync_writes)		/* no. of dbsyncs a
 TAB_BG_TRC_REC("  Mutex Queue full      ", mutex_queue_full)		/* number of times the mutex queue overflowed */
 TAB_BG_TRC_REC("  WcBlocked from bt_put ", wcb_bt_put)
 TAB_BG_TRC_REC("  WcBlocked mutexsalvage", wcb_mutex_salvage)
-TAB_BG_TRC_REC("  WcBlocked tp_grab_crit", wcb_tp_grab_crit)		/* currently unused */
+TAB_BG_TRC_REC("  WcBlocked wcs_flu0    ", wcb_wcs_flu0)
 TAB_BG_TRC_REC("  WcBlocked nocr_invcr  ", wcb_t_end_sysops_nocr_invcr)
 TAB_BG_TRC_REC("  WcBlocked cr_invcr    ", wcb_t_end_sysops_cr_invcr)
 TAB_BG_TRC_REC("  WcBlocked rip_wait    ", wcb_t_end_sysops_rip_wait)
 TAB_BG_TRC_REC("  WcBlocked dirtyripwait", wcb_t_end_sysops_dirtyripwait)
-TAB_BG_TRC_REC("  WcBlocked gds_rundown ", wcb_gds_rundown)
+TAB_BG_TRC_REC("  WcBlocked gds_rundown1", wcb_gds_rundown1)
 TAB_BG_TRC_REC("  WcBlocked wcs_flu1    ", wcb_wcs_flu1)
 TAB_BG_TRC_REC("  WcBlocked mu_backup   ", wcb_mu_back)
 TAB_BG_TRC_REC("  WcBlocked dirty_invcr ", wcb_t_end_sysops_dirty_invcr)
@@ -156,3 +156,6 @@ 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)
+TAB_BG_TRC_REC("  JnlBuff Phs2Cmt Full  ", jnlbuff_phs2cmt_array_full)
+TAB_BG_TRC_REC("  JnlPhs2ClnupIfPossible", jnl_phase2_cleanup_if_possible)
+TAB_BG_TRC_REC("  JnlBuff Phs2Cmt PrcAlv", jnlbuff_phs2cmt_isprcalv)
diff --git a/sr_port/tab_jpl_trc_rec.h b/sr_port/tab_jpl_trc_rec.h
new file mode 100644
index 0000000..cd13327
--- /dev/null
+++ b/sr_port/tab_jpl_trc_rec.h
@@ -0,0 +1,17 @@
+/****************************************************************
+ *								*
+ * 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.	*
+ *								*
+ ****************************************************************/
+
+/* All additions to the end please */
+
+TAB_JPL_TRC_REC("JnlPoolWrite Sleep      ", jnl_pool_write_sleep)	  /* # of SLEEP calls in "jnl_pool_write" */
+TAB_JPL_TRC_REC("Phs2CmtArrayFull Sleep  ", repl_phs2cmt_arrayfull_sleep) /* # of SLEEP calls in "UPDATE_JPL_RSRV_WRITE_ADDR" */
+TAB_JPL_TRC_REC("ReplPhs2Clnup IsPrcAlv  ", repl_phase2_cleanup_isprcalv) /* # of "is_proc_alive" calls in "repl_phase2_cleanup" */
diff --git a/sr_port/time_calc.c b/sr_port/time_calc.c
index 3866210..5fc42d5 100755
--- a/sr_port/time_calc.c
+++ b/sr_port/time_calc.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	*
@@ -19,6 +20,7 @@
 
 #include "gt_timer.h"
 
+error_def(ERR_TIMEROVFL);
 
 /*
  * ----------------------------------
@@ -59,7 +61,6 @@ int4	abs_time_comp(ABS_TIME *atp1, ABS_TIME *atp2)
 void	add_int_to_abs_time(ABS_TIME *atps, int4 ival,ABS_TIME *atpd)
 {
 	int4	ival_sec, ival_usec;
-	error_def (ERR_TIMEROVFL);
 
 	if (ival < 0)
 	{
@@ -68,17 +69,15 @@ void	add_int_to_abs_time(ABS_TIME *atps, int4 ival,ABS_TIME *atpd)
 		 * multiplying by 1000 to convert from seconds to
 		 * milliseconds.
 		 */
-		rts_error(VARLSTCNT(1) ERR_TIMEROVFL);
+		rts_error_csa(CSA_ARG(NULL) VARLSTCNT(1) ERR_TIMEROVFL);
 	}
-
-	ival_sec  = ival / 1000;			/* milliseconds -> seconds */
-	ival_usec = (ival - (ival_sec * 1000)) * 1000;	/* microsecond remainder */
-
+	ival_sec  = ival / MILLISECS_IN_SEC;					/* milliseconds -> seconds */
+	ival_usec = (ival - (ival_sec * MILLISECS_IN_SEC)) * MICROSECS_IN_MSEC;	/* microsecond remainder */
 	atpd->at_sec = atps->at_sec + ival_sec;
-	if ((atpd->at_usec = atps->at_usec + ival_usec) >= 1000000)
+	if ((atpd->at_usec = atps->at_usec + ival_usec) >= MICROSEC_IN_SEC)
 	{
 		/* microsecond overflow */
-		atpd->at_usec -= 1000000;
+		atpd->at_usec -= MICROSEC_IN_SEC;
 		atpd->at_sec  += 1;		/* carry */
 	}
 }
@@ -108,7 +107,7 @@ ABS_TIME	sub_abs_time(ABS_TIME *atp1, ABS_TIME *atp2)
 
 	if (atp2->at_usec > atp1->at_usec)
 	{
-		dat.at_usec += 1000000;
+		dat.at_usec += MICROSEC_IN_SEC;
 		dat.at_sec--;
 	}
 	return (dat);
diff --git a/sr_port/timeout2msec.c b/sr_port/timeout2msec.c
index a7853d6..de5ba51 100755
--- a/sr_port/timeout2msec.c
+++ b/sr_port/timeout2msec.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	*
@@ -11,7 +12,7 @@
 
 #include "mdef.h"
 
-/*	timeout2msec - convert timeout seconds to milliseconds; check for range of value.
+	/*	timeout2msec - convert timeout seconds to milliseconds; check for range of value.
  *
  *	According to the M(UMPS) standard, a negative timeout value should be equivalent to a zero timeout value.
  *
@@ -24,25 +25,13 @@
  *
  *		if timeout
  *			<= 0		zero
- *			> MAXPOSINT4	MAXPOSINT4, and indicate error (arithmetic overflow)
- *			else		timeout*1000 (timeout value in milliseconds)
+ *			> MAXPOSINT4	MAXPOSINT4
+ *			else		timeout * 1000 (timeout value in milliseconds)
  */
 
 int4	timeout2msec (int4 timeout)
 {
-	int4	retval;
 
-	error_def (ERR_TIMEROVFL);
-
-
-	if (timeout <= 0)
-		retval = 0;
-	else if (timeout > MAXPOSINT4/1000)
-	{
-		/* If multiplying by 1000 would cause arithmetic overflow out of a 4-byte signed integer, indicate an error.  */
-		rts_error (VARLSTCNT(1) ERR_TIMEROVFL);
-		retval = MAXPOSINT4;	/* probably won't get here, but largest possible value, just in case */
-	} else
-		retval = timeout*1000;	/* seconds -> milliseconds */
-	return retval;
+	/* less than 0, make it 0; if multiplying by 1000 causes arithmetic overflow, cap the value */
+	return (0 > timeout) ? 0 : ((MAXPOSINT4 > (timeout * MILLISECS_IN_SEC)) ? (timeout * MILLISECS_IN_SEC) : MAXPOSINT4);
 }
diff --git a/sr_port/tp.h b/sr_port/tp.h
old mode 100755
new mode 100644
index d1ac333..dd4a302
--- a/sr_port/tp.h
+++ b/sr_port/tp.h
@@ -162,6 +162,9 @@ typedef struct sgm_info_struct
 	sgmnt_addrs		*kip_csa;
 	int			tmp_cw_set_depth;	/* used only #ifdef DEBUG. see comments for tmp_cw_set_depth in "tp_tend" */
 	uint4			tot_jrec_size;		/* maximum journal space needs for this transaction */
+	jbuf_rsrv_struct_t	*jbuf_rsrv_ptr;		/* Pointer to structure corresponding to reservations on the journal
+							 * buffer for this region in current TP transaction.
+							 */
 } sgm_info;
 
 /* Define macros to reflect the size of cw_index and next_off in the off_chain structure.
@@ -205,7 +208,7 @@ typedef struct tp_region_struct
 						 */
 	union					/* we will either use file_id or index */
 	{
-		gd_id		file_id; 	/* both for VMS and UNIX */
+		gd_id		file_id;
 		int4		fid_index;	/* copy of csa->fid_index for this region */
 	} file;
 } tp_region;
@@ -243,11 +246,13 @@ typedef struct tp_region_struct
 		VERIFY_LIST_IS_REINITIALIZED(si->jnl_list);				\
 		VERIFY_LIST_IS_REINITIALIZED(si->format_buff_list);			\
 		assert(si->jnl_tail == &si->jnl_head);					\
+		assert(NULL != si->jbuf_rsrv_ptr);					\
 	} else										\
 	{										\
 		assert(NULL == si->jnl_list);						\
 		assert(NULL == si->format_buff_list);					\
 		assert(NULL == si->jnl_tail);						\
+		assert(NULL == si->jbuf_rsrv_ptr);					\
 	}										\
 	VERIFY_LIST_IS_REINITIALIZED(si->recompute_list);				\
 	VERIFY_LIST_IS_REINITIALIZED(si->cw_set_list);					\
@@ -306,7 +311,6 @@ typedef struct tp_region_struct
 	}													\
 }
 
-#ifdef UNIX
 /* Following macro resets clues and root block number of all the gv_targets accessed in the life-time of this process. This is
  * needed whenever a process during its transaction (TP or Non-TP) validation phase detects that a concurrent Online Rollback
  * started and completed in the meantime, the transaction should NOT go for commit, but should restart to ensure the clues and
@@ -350,7 +354,6 @@ typedef struct tp_region_struct
 		}												\
 	}													\
 }
-#endif
 
 typedef struct ua_list_struct
 {
@@ -829,18 +832,7 @@ typedef enum
 # endif	/* #ifdef DEBUG */
 #endif	/* #ifdef GTM_TRIGGER */
 
-#ifdef VMS
-/* The error below has special handling in a few condition handlers because it not so much signals an error
-   as it does drive the necessary mechanisms to invoke a restart. Consequently this error can be
-   overridden by a "real" error. For VMS, the extra parameters are specified to provide "placeholders" on
-   the stack in the signal array if a real error needs to be overlayed in place of this one (see example
-   code in mdb_condition_handler). The number of extra parameters need to be 2 more than the largest
-   number of parameters for an rts_error in tp_restart().
-*/
-#define INVOKE_RESTART	rts_error_csa(CSA_ARG(NULL) VARLSTCNT(6) ERR_TPRETRY, 4, 0, 0, 0, 0, 0, 0, 0, 0);
-#else
 #define INVOKE_RESTART	rts_error_csa(CSA_ARG(NULL) VARLSTCNT(1) ERR_TPRETRY);
-#endif
 
 /* the following macros T_BEGIN_READ_NONTP_OR_TP and T_BEGIN_SETORKILL_NONTP_OR_TP are similar except for one difference
  * which is that for the SETORKILL case, sgm_info_ptr->update_trans needs to be set. They need to be maintained
@@ -913,12 +905,11 @@ GBLREF	unsigned int	t_tries;
 	assert(dollar_tlevel);											\
 	assert(CDB_STAGNATE == t_tries);									\
 	/* mupip_jnl_recovery operates with t_tries=CDB_STAGNATE so we should not adjust t_tries		\
-	 * In that case, because we have standalone access, we dont expect anyone else to interfere with us 	\
+	 * In that case, because we have standalone access, we don't expect anyone else to interfere with us 	\
 	 * and cause a restart, but if they do, TPNOTACID_CHECK (below) gives a TPNOTACID message.		\
 	 */													\
 	if (!mupip_jnl_recover)											\
 	{													\
-		assert(CDB_STAGNATE <= dollar_trestart);							\
 		assert(dollar_trestart >= TREF(tp_restart_dont_counts));					\
 		t_tries = CDB_STAGNATE - 1;									\
 		DEBUG_ONLY(if (0 == TREF(tp_restart_dont_counts)))						\
@@ -928,24 +919,24 @@ GBLREF	unsigned int	t_tries;
 	}													\
 }
 
-#define TPNOTACID_DEFAULT_TIME	2	/* default (in seconds)for tpnotacidtime */
+#define TPNOTACID_DEFAULT_TIME	2 * MILLISECS_IN_SEC	/* default for tpnotacidtime */
 #define TPNOTACID_MAX_TIME	30	/* maximum (in seconds)for tpnotacidtime */
-#define TPTIMEOUT_MAX_TIME	60	/* maximum (inseconds) for dollar_zmaxtptime - enforced in gtm_env_init, not in op_svput */
+#define TPTIMEOUT_MAX_TIME	60	/* maximum (in seconds) for dollar_zmaxtptime - enforced in gtm_env_init, not in op_svput */
 
-#define	TPNOTACID_CHECK(CALLER_STR)											\
-{															\
-	GBLREF	boolean_t	mupip_jnl_recover;									\
-	mval		zpos;												\
-															\
-	if (IS_TP_AND_FINAL_RETRY)											\
-	{														\
-		TP_REL_CRIT_ALL_REG;											\
-		assert(!mupip_jnl_recover);										\
-		TP_FINAL_RETRY_DECREMENT_T_TRIES_IF_OK;									\
-		getzposition(&zpos);											\
-		send_msg_csa(CSA_ARG(NULL) VARLSTCNT(6) ERR_TPNOTACID, 4, LEN_AND_LIT(CALLER_STR), zpos.str.len,	\
-				zpos.str.addr);										\
-	}														\
+#define	TPNOTACID_CHECK(CALLER_STR)												\
+{																\
+	GBLREF	boolean_t	mupip_jnl_recover;										\
+	mval		zpos;													\
+																\
+	if (IS_TP_AND_FINAL_RETRY)												\
+	{															\
+		TP_REL_CRIT_ALL_REG;												\
+		assert(!mupip_jnl_recover);											\
+		TP_FINAL_RETRY_DECREMENT_T_TRIES_IF_OK;										\
+		getzposition(&zpos);												\
+		send_msg_csa(CSA_ARG(NULL) VARLSTCNT(9) ERR_TPNOTACID, 7, LEN_AND_LIT(CALLER_STR), zpos.str.len, zpos.str.addr, \
+			 (TREF(tpnotacidtime)).str.len, (TREF(tpnotacidtime)).str.addr, dollar_trestart);			\
+	}															\
 }
 
 #define SAVE_REGION_INFO(SAVE_KEY, SAVE_TARGET, SAVE_CUR_REG, SAVE_SI_PTR)	\
@@ -978,8 +969,7 @@ MBSTART {									\
 /* 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.
  */
-#define NEED_TO_RELEASE_CRIT(T_TRIES, STATUS)		(((CDB_STAGNATE - 1) > T_TRIES)					\
-							 UNIX_ONLY(|| cdb_sc_instancefreeze == STATUS))
+#define NEED_TO_RELEASE_CRIT(T_TRIES, STATUS)		(((CDB_STAGNATE - 1) > T_TRIES)	|| (cdb_sc_instancefreeze == STATUS))
 
 void tp_get_cw(cw_set_element *cs, int depth, cw_set_element **cs1);
 void tp_clean_up(tp_cleanup_state clnup_state);
diff --git a/sr_port/tp_clean_up.c b/sr_port/tp_clean_up.c
index 32d511b..621d74b 100644
--- a/sr_port/tp_clean_up.c
+++ b/sr_port/tp_clean_up.c
@@ -58,9 +58,6 @@ GBLREF	char			*update_array, *update_array_ptr;
 GBLREF	uint4			update_array_size, cumul_update_array_size;
 GBLREF	tp_frame		*tp_pointer;
 GBLREF	uint4			update_trans;
-#ifdef VMS
-GBLREF	boolean_t		tp_has_kill_t_cse; /* cse->mode of kill_t_write or kill_t_create got created in this transaction */
-#endif
 #ifdef DEBUG
 GBLREF	unsigned int		t_tries;
 #endif
@@ -121,8 +118,7 @@ void	tp_clean_up(tp_cleanup_state clnup_state)
 		 * update_arrays each x-bytes in size and we freed them up and requested 2x-bytes of contiguous storage
 		 * and we might error out on that malloc attempt (though this is very improbable).
 		 */
-		if ((NULL != first_ua) && (NULL != first_ua->next_ua)
-		    && !process_exiting && (UNIX_ONLY(ERR_MEMORY) VMS_ONLY(ERR_VMSMEMORY) != error_condition))
+		if ((NULL != first_ua) && (NULL != first_ua->next_ua) && !process_exiting && (ERR_MEMORY != error_condition))
 		{	/* if the original update array was too small, make a new larger one */
 			/* tmp_update_array_size is used below instead of the global variables (update_array_size,
 			 * first_ua->update_array_size or cumul_update_array_size) to handle error returns from	malloc()
@@ -184,7 +180,7 @@ void	tp_clean_up(tp_cleanup_state clnup_state)
 #			ifdef DEBUG
 			if (!process_exiting)
 			{	/* Ensure that we did not miss out on resetting clue for any gvtarget.
-				 * Dont do this if the process is cleaning up the TP transaction as part of exit handling
+				 * Don't do this if the process is cleaning up the TP transaction as part of exit handling
 				 * as the tp_clean_up invocation could be due to an interrupt (MUPIP STOP etc.) and we cannot
 				 * be sure what state the mainline code was when it was interrupted. Thankfully, the clue
 				 * will be used only as part of the next transaction. Since the process is in the process of
@@ -289,7 +285,7 @@ void	tp_clean_up(tp_cleanup_state clnup_state)
 							{
 								cr = cse->cr;
 								assert(NULL != cr);
-								UNIX_ONLY(assert((NULL == t1->cr) || (t1->cr == cr)));
+								assert((NULL == t1->cr) || (t1->cr == cr));
 								if (cr != t1->cr)
 								{
 									t1->cr = cr;
@@ -382,7 +378,7 @@ void	tp_clean_up(tp_cleanup_state clnup_state)
 #		ifdef DEBUG
 		if (!process_exiting)
 		{	/* 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
+			 * Don't 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.
 			 */
 			for (gvnh = gv_target_list; NULL != gvnh; gvnh = gvnh->next_gvnh)
@@ -427,14 +423,12 @@ void	tp_clean_up(tp_cleanup_state clnup_state)
 		gvt_tp_list = NULL;
 		CWS_RESET; /* reinitialize the hashtable before restarting/committing the TP transaction */
 	}	/* if (any database work in the transaction) */
-	VMS_ONLY(tp_has_kill_t_cse = FALSE;)
 	sgm_info_ptr = NULL;
 	first_sgm_info = NULL;
 	/* ensure that we don't have crit on any region at the end of a TP transaction (be it GT.M or MUPIP). The only exception
 	 * is ONLINE ROLLBACK or MUPIP TRIGGER -UPGRADE which holds crit for the entire duration
 	 */
-	assert((CDB_STAGNATE == t_tries) || (0 == have_crit(CRIT_HAVE_ANY_REG))
-						UNIX_ONLY(|| jgbl.onlnrlbk || TREF(in_trigger_upgrade)));
+	assert((CDB_STAGNATE == t_tries) || (0 == have_crit(CRIT_HAVE_ANY_REG)) || jgbl.onlnrlbk || TREF(in_trigger_upgrade));
 	/* 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
diff --git a/sr_port/tp_get_cw.c b/sr_port/tp_get_cw.c
index 7b39291..c03b6d0 100755
--- a/sr_port/tp_get_cw.c
+++ b/sr_port/tp_get_cw.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	*
@@ -29,6 +30,15 @@ GBLREF sgm_info		*sgm_info_ptr;
 void tp_get_cw (cw_set_element *cs, int depth, cw_set_element **cs1)
 {
 	cw_set_element *cs_tmp;			/* to avoid double dereferencing in the TRAVERSE macro */
+#	ifdef DEBUG
+	cw_set_element	*cs_tmp1;
+
+	cs_tmp = sgm_info_ptr->first_cw_set;
+	TRAVERSE_TO_LATEST_CSE(cs_tmp);
+	cs_tmp1 = cs;
+	TRAVERSE_TO_LATEST_CSE(cs_tmp1);
+	assert(cs_tmp1 == cs_tmp);
+#	endif
 	assert (depth < sgm_info_ptr->cw_set_depth);
 	cs_tmp = (cw_set_element *)find_element(sgm_info_ptr->cw_set_list, depth);
 
diff --git a/sr_port/tp_incr_clean_up.c b/sr_port/tp_incr_clean_up.c
index 5a3426a..6952329 100644
--- a/sr_port/tp_incr_clean_up.c
+++ b/sr_port/tp_incr_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	*
@@ -105,7 +105,7 @@ void tp_incr_clean_up(uint4 newlevel)
 			 * of this structure to point to the new cse for this block. Note that if cse->mode is gds_t_create,
 			 * there will be no tp_srch_status entry allotted for cse->blk (one will be there only for the chain.flag
 			 * representation of this to-be-created block). Same case with mode of kill_t_create as it also corresponds
-			 * to a non-existent block#. Therefore dont try looking up the hashtable for this block in those cases.
+			 * to a non-existent block#. Therefore don't try looking up the hashtable for this block in those cases.
 			 */
 			tp_srch_status = NULL;
 			assert((gds_t_create == cse->mode) || (kill_t_create == cse->mode)
@@ -188,7 +188,7 @@ void tp_incr_clean_up(uint4 newlevel)
 		freed = free_last_n_elements(si->cw_set_list, num_free);
 		assert(freed);
 		if (upd_trans && !si->update_trans)
-		{	/* si had updates before the rollback but none after. Do buddylist cleanup so tp_clean_up dont need to */
+		{	/* si had updates before the rollback but none after. Do buddylist cleanup so tp_clean_up don't need to */
 			csa = si->tp_csa;
 			if (JNL_ALLOWED(csa))
 			{
diff --git a/sr_port/tp_restart.c b/sr_port/tp_restart.c
index 17f001e..986c28a 100644
--- a/sr_port/tp_restart.c
+++ b/sr_port/tp_restart.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	*
@@ -454,6 +454,12 @@ int tp_restart(int newlevel, boolean_t handle_errors_internally)
 			case cdb_sc_gvtrootmod2:
 			case cdb_sc_gvtrootnonzero:
 			case cdb_sc_optrestart:
+			/* Note: No additional action needed for "cdb_sc_phase2waitfail" since if we are in the final retry,
+			 * we would have set wc_blocked (as part of the SET_WC_BLOCKED_FINAL_RETRY_IF_NEEDED call done
+			 * in t_retry/tp_tend/op_tcommit) and the "tp_crit_all_regions" call done below will call
+			 * "grab_crit" & "wcs_recover" which will fix the phase2-commit/non-zero-"cr->in_tend" issue.
+			 */
+			case cdb_sc_phase2waitfail:
 				assert(IS_FINAL_RETRY_CODE(status));
 				if (CDB_STAGNATE <= t_tries)
 				{
diff --git a/sr_port/tp_tend.c b/sr_port/tp_tend.c
index fc02c5c..e0766d3 100644
--- a/sr_port/tp_tend.c
+++ b/sr_port/tp_tend.c
@@ -73,11 +73,9 @@
 #include "anticipatory_freeze.h"	/* needed for IS_REPL_INST_FROZEN macro */
 #endif
 
-#ifdef UNIX
 #include "gtmrecv.h"
 #include "deferred_signal_handler.h"
 #include "repl_instance.h"
-#endif
 #include "shmpool.h"
 #include "db_snapshot.h"
 #include "is_proc_alive.h"
@@ -115,13 +113,8 @@ 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;
-#endif
-#ifdef VMS
-GBLREF	boolean_t		tp_has_kill_t_cse; /* cse->mode of kill_t_write or kill_t_create got created in this transaction */
-#endif
 #ifdef GTM_TRIGGER
 GBLREF	boolean_t		skip_dbtriggers;	/* see gbldefs.c for description of this global */
 GBLREF	int4			gtm_trigger_depth;
@@ -135,34 +128,10 @@ GBLREF	uint4			mu_reorg_encrypt_in_prog;	/* non-zero if MUPIP REORG ENCRYPT is i
 error_def(ERR_DLCKAVOIDANCE);
 error_def(ERR_JNLFILOPN);
 error_def(ERR_JNLFLUSH);
-error_def(ERR_JNLPOOLRECOVERY);
 error_def(ERR_JNLTRANS2BIG);
 error_def(ERR_REPLOFFJNLON);
 error_def(ERR_TEXT);
 
-#define	SET_REG_SEQNO_IF_REPLIC(CSA, SEQNO, SUPPLEMENTARY, NEXT_STRM_SEQNO)			\
-{												\
-	GBLREF	jnl_gbls_t		jgbl;							\
-	GBLREF	boolean_t		is_updproc;						\
-	UNIX_ONLY(GBLREF recvpool_addrs	recvpool;)						\
-												\
-	if (REPL_ALLOWED(CSA) && is_replicator)							\
-	{											\
-		assert(CSA->hdr->reg_seqno < SEQNO);						\
-		CSA->hdr->reg_seqno = SEQNO;							\
-		UNIX_ONLY(									\
-			if (SUPPLEMENTARY)							\
-			{									\
-				CSA->hdr->strm_reg_seqno[strm_index] = NEXT_STRM_SEQNO;		\
-			}									\
-		)										\
-		VMS_ONLY(									\
-			if (is_updproc)								\
-				CSA->hdr->resync_seqno = jgbl.max_resync_seqno;			\
-		)										\
-	}											\
-}
-
 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);
 
@@ -263,16 +232,13 @@ boolean_t	tp_crit_all_regions()
 boolean_t	tp_tend()
 {
 	block_id		tp_blk;
-	boolean_t		is_mm, release_crit, was_crit, x_lock, do_validation;
+	boolean_t		is_mm, release_crit, x_lock, do_validation;
 	boolean_t		replication = FALSE, region_is_frozen;
-#	ifdef UNIX
 	boolean_t		supplementary = FALSE;	/* this variable is initialized ONLY if "replication" is TRUE. */
 	seq_num			strm_seqno, next_strm_seqno;
-#	endif
 	bt_rec_ptr_t		bt;
 	cache_rec_ptr_t		cr;
 	cw_set_element		*cse, *first_cw_set, *bmp_begin_cse;
-	file_control		*fc;
 	jnl_private_control	*jpc;
 	jnl_buffer_ptr_t	jbp;
 	jnl_format_buffer	*jfb;
@@ -287,7 +253,6 @@ boolean_t	tp_tend()
 	enum cdb_sc		status;
 	gd_region		*save_gv_cur_region;
 	int			lcnt, jnl_participants, replay_jnl_participants;
-	jnldata_hdr_ptr_t	jnl_header;
 	jnl_record		*rec;
 	boolean_t		yes_jnl_no_repl, recompute_cksum, cksum_needed;
 	boolean_t		save_dont_reset_gbl_jrec_time;
@@ -295,32 +260,22 @@ boolean_t	tp_tend()
 	uint4			total_jnl_rec_size, in_tend;
 	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 */
 	blk_hdr_ptr_t		old_block;
 	unsigned int		bsiz;
 	cache_rec_ptr_t		*tp_cr_array;
-	unsigned int		tp_cr_array_index;
 	sgm_info		**prev_tp_si_by_ftok, *tmp_first_tp_si_by_ftok;
 	gv_namehead		*prev_target, *curr_target;
-	jnl_tm_t		save_gbl_jrec_time;
 	enum gds_t_mode		mode;
-#	ifdef DEBUG
-	blk_hdr_ptr_t		save_old_block;
-#	endif
 	boolean_t		ss_need_to_restart, new_bkup_started;
-	uint4			com_csum;
 	seq_num			temp_jnl_seqno;
-	qw_off_t		jnlpool_overflow_size;
-	DEBUG_ONLY(
-		int		tmp_jnl_participants;
-		uint4		upd_num;
-		uint4		max_upd_num;
-		uint4		prev_upd_num;
-		uint4		upd_num_start;
-		uint4		upd_num_end;
-		char		upd_num_seen[256];
-	)
+	jbuf_rsrv_struct_t	*jrs;
+#	ifdef DEBUG
+	char			upd_num_seen[256];
+	int			tmp_jnl_participants;
+	jnl_tm_t		save_gbl_jrec_time;
+	uint4			max_upd_num, prev_upd_num, upd_num, upd_num_end, upd_num_start;
+#	endif
 	DCL_THREADGBL_ACCESS;
 
 	SETUP_THREADGBL_ACCESS;
@@ -329,13 +284,12 @@ boolean_t	tp_tend()
 	status = cdb_sc_normal;
 	/* if the transaction does no updates and the transaction history has not changed, we do not need any more validation */
 	do_validation = FALSE;	/* initially set to FALSE, but set to TRUE below */
-	jnl_status = 0;
 	assert(NULL == first_tp_si_by_ftok);
 	first_tp_si_by_ftok = NULL;	/* just in case it is not set */
 	prev_tp_si_by_ftok = &tmp_first_tp_si_by_ftok;
 	yes_jnl_no_repl = FALSE;
 	jnl_participants = 0;	/* # of regions that had a LOGICAL journal record written for this TP */
-	assert(!IS_DSE_IMAGE UNIX_ONLY (&& !TREF(in_gvcst_redo_root_search))); /* DSE and gvcst_redo_root_search work in Non-TP */
+	assert(!IS_DSE_IMAGE && !TREF(in_gvcst_redo_root_search)); /* DSE and gvcst_redo_root_search work in Non-TP */
 	for (tr = tp_reg_list; NULL != tr; tr = tr->fPtr)
 	{
 		TP_CHANGE_REG_IF_NEEDED(tr->reg);
@@ -343,11 +297,9 @@ boolean_t	tp_tend()
 		csd = cs_data;
 		cnl = csa->nl;
 		is_mm = (dba_mm == csd->acc_meth);
-#		ifdef UNIX
 		assert(!csa->hold_onto_crit || jgbl.onlnrlbk || TREF(in_trigger_upgrade));
 		assert(!jgbl.onlnrlbk || (csa->hold_onto_crit && csa->now_crit));
 		assert(!TREF(in_trigger_upgrade) || (csa->hold_onto_crit && csa->now_crit));
-#		endif
 		si = (sgm_info *)(csa->sgm_info_ptr);
 		sgm_info_ptr = si;
 		*prev_tp_si_by_ftok = si;
@@ -413,7 +365,7 @@ boolean_t	tp_tend()
 			 *    logic gets crit anyways and so will salvage the lock and do the necessary recovery and issue
 			 *    DBFLCORRP if it notices that csd->file_corrupt is TRUE.
 			 */
-			if ((si->start_tn == csd->trans_hist.early_tn) UNIX_ONLY(&& (0 == cnl->onln_rlbk_pid)))
+			if ((si->start_tn == csd->trans_hist.early_tn) && (0 == cnl->onln_rlbk_pid))
 			{	/* read with no change to the transaction history. ensure we haven't overrun
 				 * our history buffer and we have reasonable values for first and last */
 				assert(si->last_tp_hist - si->first_tp_hist <= si->tp_hist_size);
@@ -490,7 +442,7 @@ boolean_t	tp_tend()
 	}
 	if (!do_validation)
 	{
-		if ((CDB_STAGNATE <= t_tries) UNIX_ONLY(&& !jgbl.onlnrlbk))
+		if ((CDB_STAGNATE <= t_tries) && !jgbl.onlnrlbk)
 		{
 			for (tr = tp_reg_list; NULL != tr; tr = tr->fPtr)
 			{
@@ -569,7 +521,7 @@ boolean_t	tp_tend()
 			 * the current transaction which we want to avoid if we are in the final retry.
 			 */
 			if (!csa->now_crit)
-				grab_crit(gv_cur_region);
+				grab_crit(gv_cur_region); /* Step CMT01 (see secshr_db_clnup.c for CMTxx step descriptions) */
 			else if (cnl->wc_blocked)
 			{
 				status = cdb_sc_helpedout;
@@ -594,7 +546,6 @@ boolean_t	tp_tend()
 			CHECK_TN(csa, csd, csd->trans_hist.curr_tn);	/* can issue rts_error TNTOOLARGE */
 			if (!is_mm)
 				oldest_hist_tn = OLDEST_HIST_TN(csa);
-#			ifdef UNIX
 			/* 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
@@ -613,7 +564,6 @@ boolean_t	tp_tend()
 					SYNC_ROOT_CYCLES(csa);
 				goto failed;
 			}
-#			endif
 #			ifdef GTM_TRIGGER
 			if (!skip_dbtriggers && si->tp_set_sgm_done && (csa->db_trigger_cycle != csd->db_trigger_cycle))
 			{	/* The process' view of the triggers could be potentially stale. restart to be safe.
@@ -735,14 +685,6 @@ boolean_t	tp_tend()
 						TP_TRACE_HIST(CR_BLKEMPTY, NULL);
 						goto failed;
 					}
-					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,
-												NULL, cnl->ccp_cycle);
-						}
-					)
 				}
 				if (JNL_ENABLED(csa))
 				{	/* Since we got the system time (jgbl.gbl_jrec_time) outside of crit, it is possible that
@@ -770,7 +712,7 @@ boolean_t	tp_tend()
 					assert(jgbl.gbl_jrec_time);
 					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)
+					if (0 != jnl_status)
 					{
 						ctn = csd->trans_hist.curr_tn;
 						assert(csd->trans_hist.early_tn == ctn);
@@ -780,8 +722,11 @@ boolean_t	tp_tend()
 						else
 							rts_error_csa(CSA_ARG(csa) VARLSTCNT(6) jnl_status, 4, JNL_LEN_STR(csd),
 								DB_LEN_STR(gv_cur_region));
+						assert(FALSE);	/* rts_error_csa done above should never return */
 					}
-					if (DISK_BLOCKS_SUM(jbp->freeaddr, si->total_jnl_rec_size) > jbp->filesize)
+					if (jbp->last_eof_written
+							|| (DISK_BLOCKS_SUM(jbp->rsrv_freeaddr, si->total_jnl_rec_size)
+														> jbp->filesize))
 					{	/* Moved here to prevent jnlrecs split across multiple generation journal files. */
 						if (SS_NORMAL != (jnl_status = jnl_flush(jpc->region)))
 						{
@@ -802,6 +747,8 @@ boolean_t	tp_tend()
 						}
 						assert(csd == csa->hdr);	/* If MM, csd shouldn't have been reset */
 					}
+					if (MAXUINT4 == jbp->next_epoch_time)
+						jbp->next_epoch_time = (uint4)(jgbl.gbl_jrec_time + jbp->epoch_interval);
 					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 */
@@ -1200,44 +1147,15 @@ boolean_t	tp_tend()
 							assert(bsiz <= csd->blk_size);
 							cse->blk_checksum = jnl_get_checksum(old_block, csa, bsiz);
 						}
-						DEBUG_ONLY(
+#						ifdef DEBUG
 						else
 							assert(cse->blk_checksum ==
 									jnl_get_checksum(old_block, csa, old_block->bsiz));
-						)
+#						endif
 						assert(cse->cr->blk == cse->blk);
 					}	/* end if acquired block */
 				}	/* end cse for loop */
 			}	/* end if !mm && before-images need to be written */
-#			ifdef VMS
-			/* Check if this TP transaction created any cses of mode kill_t_write or kill_t_create. If so, ensure
-			 * the corresponding cse->new_buff has already been initialized. This is necessary in case an error
-			 * 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 don't want this routine invoked in the privileged GTMSECSHR image so we do this beforehand.
-			 */
-			if (tp_has_kill_t_cse)
-			{
-				for (cse = first_cw_set;  NULL != cse;  cse = cse->next_cw_set)
-				{
-					TRAVERSE_TO_LATEST_CSE(cse);
-					if ((n_gds_t_op < cse->mode) && (NULL == cse->new_buff))
-					{
-						assert(!cse->done);
-						cse->new_buff = get_new_free_element(si->new_buff_list);
-						cse->first_copy = TRUE;
-					}
-				}
-			}
-			DEBUG_ONLY(
-				for (cse = first_cw_set;  NULL != cse;  cse = cse->next_cw_set)
-				{
-					TRAVERSE_TO_LATEST_CSE(cse);
-					assert((n_gds_t_op > cse->mode) || (NULL != cse->new_buff));
-				}
-			)
-#			endif
 			assert(cdb_sc_normal == status);
 		}
 		if (x_lock)
@@ -1254,10 +1172,10 @@ boolean_t	tp_tend()
 			if (!si->tp_csa->hold_onto_crit)
 				rel_crit(si->gv_cur_region);
 		}
-		/* Check that we DONT own crit/commit on ANY region. The only exception is online mupip journal rollback/recovery
+		/* Check that we DON'T own crit/commit on ANY region. The only exception is online mupip journal rollback/recovery
 		 * which holds crit for the entire process lifetime.
 		 */
-		assert(UNIX_ONLY(jgbl.onlnrlbk || ) (0 == have_crit(CRIT_HAVE_ANY_REG | CRIT_IN_COMMIT)));
+		assert(jgbl.onlnrlbk || (0 == have_crit(CRIT_HAVE_ANY_REG | CRIT_IN_COMMIT)));
 		/* Wait for it to be unfrozen before re-grabbing crit on ALL regions */
 		WAIT_FOR_REGION_TO_UNFREEZE(csa, csd);
 		assert(CDB_STAGNATE > t_tries);
@@ -1267,57 +1185,48 @@ boolean_t	tp_tend()
 	/* Validate the correctness of the calculation of # of replication/journaled regions inside & outside of crit */
 	assert(tmp_jnl_participants == jnl_participants);
 	assert(cdb_sc_normal == status);
+	DEBUG_ONLY(if (!jgbl.forw_phase_recovery) jnl_fence_ctl.token = 0;)
+	jnl_fence_ctl.replication = replication;	/* used by "secshr_db_clnup" to finish CMT09 if needed */
 	if (replication)
 	{
 		jpl = jnlpool_ctl;
 		if (!repl_csa->hold_onto_crit)
-			grab_lock(jnlpool.jnlpool_dummy_reg, TRUE, ASSERT_NO_ONLINE_ROLLBACK);
-#		ifdef UNIX
+			grab_lock(jnlpool.jnlpool_dummy_reg, TRUE, ASSERT_NO_ONLINE_ROLLBACK);	/* Step CMT02 */
 		if (jnlpool.jnlpool_ctl->freeze)
 		{
 			status = cdb_sc_instancefreeze;	/* break the possible deadlock by signalling a restart */
 			TP_TRACE_HIST(CR_BLKEMPTY, NULL);
 			goto failed;
 		}
-#		endif
-		jplctx.write = jpl->write;
-		jplctx.write_total = 0;
 		temp_jnl_seqno = jpl->jnl_seqno;
-#		ifdef UNIX
+		jnl_fence_ctl.token = temp_jnl_seqno;
 		if (INVALID_SUPPL_STRM != strm_index)
 		{	/* Need to also update supplementary stream seqno */
 			supplementary = TRUE;
 			assert(0 <= strm_index);
 			strm_seqno = jpl->strm_seqno[strm_index];
 			ASSERT_INST_FILE_HDR_HAS_HISTREC_FOR_STRM(strm_index);
+			jnl_fence_ctl.strm_seqno = SET_STRM_INDEX(strm_seqno, strm_index);
 		} else
+		{	/* Note: "supplementary == FALSE" if strm_seqno is 0 is relied upon by "mutex_salvage" */
+			assert(!jnl_fence_ctl.strm_seqno);
 			supplementary = FALSE;
-#		endif
-		INT8_ONLY(assert(jplctx.write == jpl->write_addr % jpl->jnlpool_size));
-		jplctx.write += SIZEOF(jnldata_hdr_struct);
-		jplctx.write_total += SIZEOF(jnldata_hdr_struct);
-		if (jplctx.write >= jpl->jnlpool_size)
-		{
-			assert(jplctx.write == jpl->jnlpool_size);
-			jplctx.write = 0;
 		}
 		assert(jgbl.cumul_jnl_rec_len);
 		jgbl.cumul_jnl_rec_len += TCOM_RECLEN * jnl_participants + SIZEOF(jnldata_hdr_struct);
 		DEBUG_ONLY(jgbl.cumul_index += jnl_participants;)
-		assert(jgbl.cumul_jnl_rec_len % JNL_REC_START_BNDRY == 0);
 		/* Make sure timestamp of this seqno is >= timestamp of previous seqno. Note: The below macro
 		 * invocation should be done AFTER the ADJUST_GBL_JREC_TIME call as the below resets
 		 * jpl->prev_jnlseqno_time. Doing it the other way around would mean the reset will happen
 		 * with a potentially lower value than the final adjusted time written in the jnl record.
 		 */
 		ADJUST_GBL_JREC_TIME_JNLPOOL(jgbl, jpl);
-		assert(jpl->early_write_addr == jpl->write_addr);
-		jpl->early_write_addr = jpl->write_addr + jgbl.cumul_jnl_rec_len;
-		/* Source server does not read in crit. It relies on early_write_addr, the transaction
-		 * data, lastwrite_len, write_addr being updated in that order. To ensure this order,
-		 * we have to force out early_write_addr to its coherency point now. If not, the source
-		 * server may read data that is overwritten (or stale). This is true only on
-		 * architectures and OSes that allow unordered memory access
+		UPDATE_JPL_RSRV_WRITE_ADDR(jpl, jnlpool, jgbl.cumul_jnl_rec_len); /* updates jpl->rsrv_write_addr. Step CMT03 */
+		/* Source server does not read in crit. It relies on the transaction data, lastwrite_len,
+		 * rsrv_write_addr being updated in that order. To ensure this order, we have to force out
+		 * rsrv_write_addr to its coherency point now. If not, the source server may read data that
+		 * is overwritten (or stale). This is true only on architectures and OSes that allow unordered
+		 * memory access.
 		 */
 		SHM_WRITE_MEMORY_BARRIER;
 	}
@@ -1333,10 +1242,9 @@ boolean_t	tp_tend()
 	 * We therefore take approach (b) below. Write journal records for all regions in one loop. Write database updates
 	 * for all regions in another loop. This way if any error occurs before database updates for any region begins in
 	 * the second loop, we cleanup the structures as if the transaction is rolled back (there is an exception to this in
-	 * that currently the journal buffers are not rolled back to undo the write of journal records but currently
-	 * MUPIP RECOVER knows to handle such records and TR C9905-001072 exists to make the source-server handle such records).
-	 * If any error occurs (or if the process gets STOP/IDed in VMS) while we are committing database updates,
-	 * secshr_db_clnup will be invoked and will complete the updates for this TP transaction.
+	 * that the journal buffers are not rolled back to undo the write of journal records but MUPIP RECOVER knows to handle
+	 * such records and TR C9905-001072 exists to make the source-server handle such records). If any error occurs while we
+	 * are committing database updates, secshr_db_clnup will be invoked and will complete the updates for this TP transaction.
 	 */
 	/* the following section writes journal records in all regions */
 	DEBUG_ONLY(save_gbl_jrec_time = jgbl.gbl_jrec_time;)
@@ -1418,13 +1326,7 @@ boolean_t	tp_tend()
 		} while (upd_num_end <= max_upd_num);
 	}
 #	endif
-	if (!jgbl.forw_phase_recovery)
-	{
-		jnl_fence_ctl.token = 0;
-		replay_jnl_participants = jnl_participants;
-	} else
-		replay_jnl_participants = jgbl.mur_jrec_participants;
-
+	replay_jnl_participants = (!jgbl.forw_phase_recovery ? jnl_participants : jgbl.mur_jrec_participants);
 	/* In case of journal recovery, token would be initialized to a non-zero value */
 	for (si = first_tp_si_by_ftok; (NULL != si); si = si->next_tp_si_by_ftok)
 	{
@@ -1436,7 +1338,7 @@ boolean_t	tp_tend()
 		csd = cs_data;
 		ctn = csd->trans_hist.curr_tn;
 		ASSERT_CURR_TN_EQUALS_EARLY_TN(csa, ctn);
-		csd->trans_hist.early_tn = ctn + 1;
+		csd->trans_hist.early_tn = ctn + 1;	/* Step CMT04 */
 		/* 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.
@@ -1446,96 +1348,73 @@ boolean_t	tp_tend()
 			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))
+		is_mm = (dba_mm == csd->acc_meth);
+		csa->t_commit_crit = T_COMMIT_CRIT_PHASE0;	/* phase0 : write journal records. Step CMT05 */
+		if (JNL_ALLOWED(csa))
 		{
 			jpc = csa->jnl;
 			jbp = jpc->jnl_buff;
-			/* si->tmp_cw_set_depth is a copy of si->cw_set_depth at TOTAL_TPJNL_REC_SIZE calculation time;
-			 * ensure it has not changed until now when the actual jnl record write occurs.
-			 * same case with csa->jnl_before_images & jbp->before_images.
-			 */
-			assert(si->cw_set_depth == si->tmp_cw_set_depth);
-			assert(jbp->before_images == csa->jnl_before_image);
-			assert(jgbl.gbl_jrec_time >= jbp->prev_jrec_time);
-			if (0 == jpc->pini_addr)
-				jnl_put_jrt_pini(csa);
-			if(!com_csum)
-			{
-				ADJUST_CHECKSUM_TN(INIT_CHECKSUM_SEED, &ctn, com_csum);
-				ADJUST_CHECKSUM(com_csum, jpc->pini_addr, com_csum);
-				ADJUST_CHECKSUM(com_csum, jgbl.gbl_jrec_time, com_csum);
-			}
-			if (jbp->before_images)
+			jrs = si->jbuf_rsrv_ptr;
+			REINIT_JBUF_RSRV_STRUCT(jrs, csa, jpc, jbp);
+			/* Write non-logical records (PBLK) if applicable */
+			if (JNL_ENABLED(csa))
 			{
-				epoch_tn = jbp->epoch_tn; /* store in a local variable as it is used in a loop below */
-				for (cse = si->first_cw_set;  NULL != cse;  cse = cse->next_cw_set)
-				{	/* Write out before-update journal image records */
-					TRAVERSE_TO_LATEST_CSE(cse);
-					if (WAS_FREE(cse->blk_prior_state))
-						continue;
-					old_block = (blk_hdr_ptr_t)cse->old_block;
-					ASSERT_IS_WITHIN_SHM_BOUNDS((sm_uc_ptr_t)old_block, csa);
-					assert((n_gds_t_op != cse->mode) && (gds_t_committed != cse->mode));
-					assert(n_gds_t_op < kill_t_create);
-					assert(n_gds_t_op < kill_t_write);
-					if (n_gds_t_op <= cse->mode)
-						continue;
-					DEBUG_ONLY(is_mm = (dba_mm == csd->acc_meth));
-					DBG_ENSURE_OLD_BLOCK_IS_VALID(cse, is_mm, csa, csd);
-					if ((NULL != old_block) && (old_block->tn < epoch_tn))
-					{	/* For acquired blocks, we should have computed checksum already.
-						 * The only exception is if we found no need to compute checksum
-						 * outside of crit but before we got crit, an EPOCH got written
-						 * concurrently so we have to write a PBLK (and hence compute the
-						 * checksum as well) when earlier we thought none was necessary.
-						 * An easy way to check this is that an EPOCH was written AFTER
-						 * we started this transaction.
-						 */
-						assert((gds_t_acquired != cse->mode) || cse->blk_checksum
-							|| (epoch_tn >= si->start_tn));
-						assert(old_block->bsiz <= csd->blk_size);
-						if (!cse->blk_checksum)
-							cse->blk_checksum = jnl_get_checksum(old_block, csa, old_block->bsiz);
-						else
-							assert(cse->blk_checksum == jnl_get_checksum(old_block, csa,
-												     	old_block->bsiz));
-						if (NEEDS_ANY_KEY(csd, old_block->tn))
-						{
-							DBG_ENSURE_PTR_IS_VALID_GLOBUFF(csa, csd, (sm_uc_ptr_t)old_block);
-							DEBUG_ONLY(save_old_block = old_block;)
-							old_block = (blk_hdr_ptr_t)GDS_ANY_ENCRYPTGLOBUF(old_block, csa);
-							/* Ensure that unencrypted block and its twin counterpart are in sync. */
-							assert(save_old_block->tn == old_block->tn);
-							assert(save_old_block->bsiz == old_block->bsiz);
-							assert(save_old_block->levl == old_block->levl);
-							DBG_ENSURE_PTR_IS_VALID_ENCTWINGLOBUFF(csa, csd, (sm_uc_ptr_t)old_block);
+				/* si->tmp_cw_set_depth is a copy of si->cw_set_depth at TOTAL_TPJNL_REC_SIZE calculation time;
+				 * ensure it has not changed until now when the actual jnl record write occurs.
+				 * same case with csa->jnl_before_images & jbp->before_images.
+				 */
+				assert(si->cw_set_depth == si->tmp_cw_set_depth);
+				assert(jbp->before_images == csa->jnl_before_image);
+				assert(jgbl.gbl_jrec_time >= jbp->prev_jrec_time);
+				if (0 == jpc->pini_addr)
+					jnl_write_reserve(csa, jrs, JRT_PINI, PINI_RECLEN, NULL);
+				if (jbp->before_images)
+				{
+					epoch_tn = jbp->epoch_tn; /* store in a local variable as it is used in a loop below */
+					for (cse = si->first_cw_set;  NULL != cse;  cse = cse->next_cw_set)
+					{	/* Write out before-update journal image records */
+						TRAVERSE_TO_LATEST_CSE(cse);
+						if (WAS_FREE(cse->blk_prior_state))
+							continue;
+						old_block = (blk_hdr_ptr_t)cse->old_block;
+						ASSERT_IS_WITHIN_SHM_BOUNDS((sm_uc_ptr_t)old_block, csa);
+						assert((n_gds_t_op != cse->mode) && (gds_t_committed != cse->mode));
+						assert(n_gds_t_op < kill_t_create);
+						assert(n_gds_t_op < kill_t_write);
+						if (n_gds_t_op <= cse->mode)
+							continue;
+						DEBUG_ONLY(is_mm = (dba_mm == csd->acc_meth));
+						DBG_ENSURE_OLD_BLOCK_IS_VALID(cse, is_mm, csa, csd);
+						assert(((NULL != old_block) && (old_block->tn < epoch_tn))
+											|| (0 == cse->jnl_freeaddr));
+						if ((NULL != old_block) && (old_block->tn < epoch_tn))
+						{	/* For acquired blocks, we should have computed checksum already.
+							 * The only exception is if we found no need to compute checksum
+							 * outside of crit but before we got crit, an EPOCH got written
+							 * concurrently so we have to write a PBLK (and hence compute the
+							 * checksum as well) when earlier we thought none was necessary.
+							 * An easy way to check this is that an EPOCH was written AFTER
+							 * we started this transaction.
+							 */
+							assert((gds_t_acquired != cse->mode) || cse->blk_checksum
+								|| (epoch_tn >= si->start_tn));
+							bsiz = old_block->bsiz;
+							assert(bsiz <= csd->blk_size);
+							bsiz = MIN(bsiz, csd->blk_size);	/* be safe in PRO */
+							bsiz += FIXED_PBLK_RECLEN + JREC_SUFFIX_SIZE;
+							bsiz = ROUND_UP2(bsiz, JNL_REC_START_BNDRY);
+							jnl_write_reserve(csa, jrs, JRT_PBLK, bsiz, cse);
 						}
-						jnl_write_pblk(csa, cse, old_block, com_csum);
-						cse->jnl_freeaddr = jbp->freeaddr;
-					} else
-						cse->jnl_freeaddr = 0;
+					}
 				}
 			}
 		}
 		/* Write logical journal records if applicable. */
 		if (JNL_WRITE_LOGICAL_RECS(csa))
 		{
-			if (0 == jnl_fence_ctl.token)
-			{
-				assert(!jgbl.forw_phase_recovery);
-				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);
-					)
-				} else
-					TOKEN_SET(&jnl_fence_ctl.token, local_tn, process_id);
-			}
-			/* else : jnl_fence_ctl.token would be pre-filled by journal recovery */
+			if (!replication && !jgbl.forw_phase_recovery)
+				TOKEN_SET(&jnl_fence_ctl.token, local_tn, process_id);
+			/* else : jnl_fence_ctl.token would be pre-filled by journal recovery OR "if (replication)" logic above */
 			assert(0 != jnl_fence_ctl.token);
 			jfb = si->jnl_head;
 			assert(NULL != jfb);
@@ -1552,7 +1431,7 @@ boolean_t	tp_tend()
 			DEBUG_ONLY(++tmp_jnl_participants;)
 			do
 			{
-				jnl_write_logical(csa, jfb, com_csum, &jplctx);
+				jnl_write_reserve(csa, jrs, jfb->rectype, jfb->record_size, jfb);
 				jfb = jfb->next;
 			} while (NULL != jfb);
 		}
@@ -1564,19 +1443,7 @@ boolean_t	tp_tend()
 	assert((JNL_FENCE_LIST_END == jnl_fence_ctl.fence_list) || (0 != jnl_fence_ctl.token));
 	tcom_record.token_seq.token = jnl_fence_ctl.token;
 	tcom_record.strm_seqno = jnl_fence_ctl.strm_seqno;
-	if (replication)
-	{
-		assert(!jgbl.forw_phase_recovery);
-		temp_jnl_seqno++;
-		UNIX_ONLY(
-			if (supplementary)
-				next_strm_seqno = strm_seqno + 1;
-		)
-		VMS_ONLY(
-			if (is_updproc)
-				jgbl.max_resync_seqno++;
-		)
-	}
+	/* tcom_record.jnl_tid was set in op_tstart or updproc */
 	/* Note that only those regions that are actively journaling will appear in the following list: */
 	DEBUG_ONLY(tmp_jnl_participants = 0;)
 	for (csa = jnl_fence_ctl.fence_list;  JNL_FENCE_LIST_END != csa;  csa = csa->next_fenced)
@@ -1585,21 +1452,21 @@ boolean_t	tp_tend()
 		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;
-		UNIX_ONLY(SET_REG_SEQNO_IF_REPLIC(csa, temp_jnl_seqno, supplementary, next_strm_seqno);)
-		VMS_ONLY(SET_REG_SEQNO_IF_REPLIC(csa, tjpl, supplementary, 0);)
-		/* Switch to current region. Not using TP_CHANGE_REG macros since we already have csa and csa->hdr available. */
-		gv_cur_region = jpc->region;
-		cs_addrs = csa;
-		cs_data = csa->hdr;
-		/* Note tcom_record.jnl_tid was set in op_tstart or updproc */
-		tcom_record.prefix.checksum = compute_checksum(INIT_CHECKSUM_SEED,
-									(unsigned char *)&tcom_record, SIZEOF(struct_jrec_tcom));
-		JNL_WRITE_APPROPRIATE(csa, jpc, JRT_TCOM, (jnl_record *)&tcom_record, NULL, NULL, &jplctx);
+		jrs = csa->sgm_info_ptr->jbuf_rsrv_ptr;
+		jnl_write_reserve(csa, jrs, JRT_TCOM, TCOM_RECLEN, &tcom_record);
+		jbp = jpc->jnl_buff;
+		assert(JNL_ALLOWED(csa));
+		if (JNL_ENABLED(csa))	/* Need "if" check to handle WAS_ON scenario */
+			UPDATE_JRS_RSRV_FREEADDR(csa, jpc, jbp, jrs, jpl, jnl_fence_ctl, replication);/* sets jbp->rsrv_freeaddr.
+												       * Step CMT06.
+												       */
+		assert(jrs->tot_jrec_len);
+		if (IS_PHASE2_JNL_COMMIT_NEEDED_IN_CRIT(jbp, jrs->tot_jrec_len) || (dba_mm == csa->hdr->acc_meth))
+			FINISH_JNL_PHASE2_IN_JNLBUFF(csa, jrs);	/* Step CMT06a */
 		DEBUG_ONLY(tmp_jnl_participants++;)
 	}
+	if (replication)
+		SET_JNL_SEQNO(jpl, temp_jnl_seqno, supplementary, strm_seqno, strm_index, next_strm_seqno);	/* Step CMT07 */
 	assert(jnl_participants == tmp_jnl_participants);
 	/* Ensure jgbl.gbl_jrec_time did not get reset by any of the jnl writing functions */
 	assert(save_gbl_jrec_time == jgbl.gbl_jrec_time);
@@ -1613,21 +1480,25 @@ boolean_t	tp_tend()
 			TP_TEND_CHANGE_REG(si);
 			csa = cs_addrs;
 			csd = cs_data;
+			cnl = csa->nl;
 			is_mm = (dba_mm == csd->acc_meth);
 			ctn = csd->trans_hist.curr_tn;
 			assert((ctn + 1) == csd->trans_hist.early_tn);
 			csa->prev_free_blks = csd->trans_hist.free_blocks;
-			csa->t_commit_crit = T_COMMIT_CRIT_PHASE1;
+			SET_T_COMMIT_CRIT_PHASE1(csa, cnl, ctn); /* Step CMT08 */
+			if (REPL_ALLOWED(csa) && is_replicator)
+			{
+				assert(NULL != csa->next_fenced);
+				SET_REG_SEQNO(csa, temp_jnl_seqno, supplementary, strm_index, next_strm_seqno,
+											SKIP_ASSERT_FALSE); /* Step CMT09 */
+			}
 			if (csd->dsid && tp_kill_bitmaps)
 				rc_cpt_inval();
 			cse = si->first_cw_set;
 			if (NULL != cse)
 			{
 				if (!is_mm)	/* increment counter of # of processes that are actively doing two-phase commit */
-				{
-					cnl = csa->nl;
 					INCR_WCS_PHASE2_COMMIT_PIDCNT(csa, cnl);
-				}
 #				ifdef DEBUG
 				/* Assert that cse->old_mode, if uninitialized, never contains a negative value
 				 * (this is relied upon by secshr_db_clnup)
@@ -1680,15 +1551,19 @@ boolean_t	tp_tend()
 						 * Hence build such blocks in phase1 while holding crit and avoid such restarts.
 						 */
 						if (is_mm)
-							status = mm_update(cse, ctn, ctn, si);
+							status = mm_update(cse, ctn, ctn, si);	/* Step CMT10 */
 						else
 						{
-							status = bg_update_phase1(cse, ctn, si);
-							if ((cdb_sc_normal == status)
-								&& ((gds_t_writemap == mode)
-									|| cse->recompute_list_head && (gds_t_write == cse->mode)))
-							{
-								status = bg_update_phase2(cse, ctn, ctn, si);
+							status = bg_update_phase1(cse, ctn, si);	/* Step CMT10 */
+							if ((cdb_sc_normal == status) && IS_BG_PHASE2_COMMIT_IN_CRIT(cse, mode))
+							{	/* If we are about to do phase2 db commit while holding crit,
+								 * then check if jnl phase2 commit is pending on this region.
+								 * If so do it before any db phase2 commit happens in this region.
+								 */
+								jrs = si->jbuf_rsrv_ptr;
+								if (NEED_TO_FINISH_JNL_PHASE2(jrs))
+									FINISH_JNL_PHASE2_IN_JNLBUFF(csa, jrs);	/* Step CMT06a */
+								status = bg_update_phase2(cse, ctn, ctn, si);	/* Step CMT10a */
 								if (cdb_sc_normal == status)
 									cse->mode = gds_t_committed;
 							}
@@ -1730,10 +1605,9 @@ boolean_t	tp_tend()
 			/* signal secshr_db_clnup/t_commit_cleanup, roll-back is no longer possible */
 			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 */
+			si->update_trans = lcl_update_trans | UPDTRNS_TCOMMIT_STARTED_MASK; /* Step CMT11 */
 			/* should never increment curr_tn on a frozen database */
-			assert(!(FROZEN_HARD(csd) UNIX_ONLY(|| (replication && IS_REPL_INST_FROZEN))));
+			assert(!(FROZEN_HARD(csd) || (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.
@@ -1744,7 +1618,11 @@ boolean_t	tp_tend()
 			 */
 			if (is_mm)
 				MM_WRITE_MEMORY_BARRIER;
-			INCREMENT_CURR_TN(csd);
+			INCREMENT_CURR_TN(csd); /* Step CMT12 */
+			csa->t_commit_crit = T_COMMIT_CRIT_PHASE2;	/* phase2 : update database buffers. Step CMT13.
+									 * Set this BEFORE releasing crit but AFTER
+									 * incrementing curr_tn.
+									 */
 #			ifdef GTM_TRIGGER
 			if (csa->incr_db_trigger_cycle)
 			{
@@ -1774,66 +1652,29 @@ boolean_t	tp_tend()
 			ctn = si->tp_csd->trans_hist.curr_tn;
 		si->start_tn = ctn; /* start_tn used temporarily to store currtn (for bg_update_phase2) before releasing crit */
 		if (!si->tp_csa->hold_onto_crit)
-			rel_crit(si->gv_cur_region);	/* should use si->gv_cur_region (not gv_cur_region) as the latter is not
-							 * set in case we are not updating this region */
+		{	/* Note: Should use si->gv_cur_region (not gv_cur_region) as the latter is not set
+			 * in case we are not updating this region as part of this TP transaction.
+			 */
+			rel_crit(si->gv_cur_region);	/* Step CMT14 */
+		}
 	} /* for (si ... ) */
 	assert(cdb_sc_normal == status);
+	/* Now that all buffers needed for commit are locked in shared memory (in phase1 for BG), it is safe to
+	 * release the jnlpool lock. Releasing it before this could cause an instance freeze to sneak in while
+	 * the phase1 is still midway causing trouble for this transaction in case it needs to do any db/jnl writes.
+	 */
 	if (replication)
 	{
-		assert(jgbl.cumul_index == jgbl.cu_jnl_index);
-		assert((jpl->write + jgbl.cumul_jnl_rec_len) % jpl->jnlpool_size == jplctx.write);
-		assert(jpl->early_write_addr > jpl->write_addr);
-		jnl_header = (jnldata_hdr_ptr_t)(jnlpool.jnldata_base + jpl->write);	/* Begin atomic stmnts */
-		jnl_header->jnldata_len = jgbl.cumul_jnl_rec_len;
-		jnl_header->prev_jnldata_len = jpl->lastwrite_len;
-		UNIX_ONLY(
-			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 write_addr
-		 * before seeing the change to jnlheader->jnldata_len, leading it to read an invalid
-		 * transaction length. To avoid such conditions, we should commit the order of shared
-		 * memory updates before we update write_addr. This ensures that the source server sees all
-		 * shared memory updates related to a transaction before the change in write_addr
-		 */
-		SHM_WRITE_MEMORY_BARRIER;
-		jpl->write = jplctx.write;
-		/* jpl->write_addr should be updated before updating jpl->jnl_seqno as secshr_db_clnup relies on this */
-		jpl->write_addr += jplctx.write_total;
-		if ((jplctx.write_total != jnl_header->jnldata_len)
-				DEBUG_ONLY(|| ((0 != TREF(gtm_test_jnlpool_sync))
-						&& (0 == (temp_jnl_seqno % TREF(gtm_test_jnlpool_sync))))))
-		{	/* Our accounting got out of sync somehow. Drop a core and force the journal pool to overflow. */
-			if (!jpl->outofsync_core_generated
-					DEBUG_ONLY(&& ((0 == TREF(gtm_test_jnlpool_sync))
-							|| (0 != (temp_jnl_seqno % TREF(gtm_test_jnlpool_sync))))))
-			{
-				jpl->outofsync_core_generated = TRUE;
-				gtm_fork_n_core();
-			}
-			/* The source server considers an increment to early_write_addr greater than the jnlpool_size as
-			 * an overflow, so add twice the jnlpool_size to early_write_addr and write_addr to keep them aligned
-			 * with each other and with write.
-			 */
-			jnlpool_overflow_size = jpl->jnlpool_size * 2ull;	/* Use ull to force 64-bit multiplication */
-			jpl->early_write_addr += jnlpool_overflow_size;
-			jpl->write_addr += jnlpool_overflow_size;
-			send_msg_csa(CSA_ARG(csa) VARLSTCNT(5) ERR_JNLPOOLRECOVERY, 3, jplctx.write_total, jnl_header->jnldata_len,
-									jpl->jnlpool_id.instfilename);
-		}
-		jpl->jnl_seqno = temp_jnl_seqno;			/* End atomic stmnts */
-		assert(jpl->early_write_addr == jpl->write_addr);
-		assert(jplctx.write == (jpl->write_addr % jpl->jnlpool_size));
-		assert(NULL != repl_csa);
+		assert(repl_csa->now_crit);
 		if (!repl_csa->hold_onto_crit)
-			rel_lock(jnlpool.jnlpool_dummy_reg);
+			rel_lock(jnlpool.jnlpool_dummy_reg);	/* Step CMT15 */
 	}
-	/* Check that we DONT own crit on ANY region. The only exception is online mupip journal rollback/recovery
+	/* Check that we DON'T own crit on ANY region. The only exception is online mupip journal rollback/recovery
 	 * or MUPIP TRIGGER -UPGRADE which holds crit for the entire process lifetime. */
-	assert(UNIX_ONLY(jgbl.onlnrlbk || TREF(in_trigger_upgrade) || ) (0 == have_crit(CRIT_HAVE_ANY_REG)));
-	/* the following section is the actual commitment of the changes in the database (phase2 for BG) */
+	assert(jgbl.onlnrlbk || TREF(in_trigger_upgrade) || (0 == have_crit(CRIT_HAVE_ANY_REG)));
+	/* the following section is the actual commitment of the journal records */
+	TP_FINISH_JNL_PHASE2_IN_JNLBUFF_AND_JNLPOOL(jnl_fence_ctl, replication, jnlpool);	/* Step CMT16 & CMT17 */
+	/* The following section is the actual commitment of the changes in the database (phase2 for BG) */
 	for (si = first_tp_si_by_ftok;  (NULL != si); si = si->next_tp_si_by_ftok)
 	{
 		cse = si->first_cw_set;
@@ -1850,14 +1691,14 @@ boolean_t	tp_tend()
 				TRAVERSE_TO_LATEST_CSE(cse);
 				if (gds_t_committed > cse->mode)
 				{	/* Finish 2nd phase of commit for BG (updating the buffers locked in phase1) now that CRIT
-					 * has been released. For MM, only thing needed is to set cs->mode to gds_t_committed.
+					 * has been released. For MM, only thing needed is to set cse->mode to gds_t_committed.
 					 */
 					if (!is_mm)
 					{	/* Validate old_mode noted down in first phase is the same as the current mode.
-						 * Note that cs->old_mode is negated by bg_update_phase1 (to help secshr_db_clnup).
+						 * Note that cse->old_mode is negated by bg_update_phase1 (to help secshr_db_clnup).
 						 */
 						assert(-cse->old_mode == (int4)cse->mode);
-						status = bg_update_phase2(cse, ctn, ctn, si);
+						status = bg_update_phase2(cse, ctn, ctn, si);	/* Step CMT18 */
 						if (cdb_sc_normal != status)
 						{	/* the database is probably in trouble */
 							TP_TRACE_HIST(cse->blk, cse->blk_target);
@@ -1909,7 +1750,7 @@ boolean_t	tp_tend()
 			}
 		}
 		assert(!si->cr_array_index);
-		si->tp_csa->t_commit_crit = FALSE;
+		si->tp_csa->t_commit_crit = FALSE;	/* Step CMT19 */
 	}
 	si_not_validated = NULL;	/* all "si" have been validated at this point */
 	/* Caution: followthrough, cleanup for normal and abnormal "status" */
@@ -1919,7 +1760,7 @@ failed:
 		si_not_validated = si;
 		si_last = (NULL == si_not_validated) ? NULL : si_not_validated->next_tp_si_by_ftok;
 		/* Free up all pinnned cache-records and release crit */
-		release_crit = (NEED_TO_RELEASE_CRIT(t_tries, status) UNIX_ONLY(&& !jgbl.onlnrlbk));
+		release_crit = (NEED_TO_RELEASE_CRIT(t_tries, status) && !jgbl.onlnrlbk);
 		for (si = first_tp_si_by_ftok; si_last != si; si = si->next_tp_si_by_ftok)
 		{
 			assert(si->tp_csa->now_crit);
@@ -1934,17 +1775,15 @@ failed:
 				rel_crit(si->gv_cur_region);
 			}
 		}
-#ifdef UNIX
 		if (replication && repl_csa->now_crit && release_crit)
 		{	/* The only restart that is possible once we acquired the journal pool lock is due to instance freeze */
 			assert(cdb_sc_instancefreeze == status);
 			rel_lock(jnlpool.jnlpool_dummy_reg);
 		}
-#endif
-		/* Check that we DONT own crit/commit on ANY region. The only exception is online mupip journal rollback/recovery
+		/* Check that we DON'T own crit/commit on ANY region. The only exception is online mupip journal rollback/recovery
 		 * which holds crit for the entire process lifetime.
 		 */
-		assert(UNIX_ONLY(jgbl.onlnrlbk || ) !release_crit || (0 == have_crit(CRIT_HAVE_ANY_REG | CRIT_IN_COMMIT)));
+		assert(jgbl.onlnrlbk || !release_crit || (0 == have_crit(CRIT_HAVE_ANY_REG | CRIT_IN_COMMIT)));
 	}
 	/* We have finished validation on this region. Reset transaction numbers in the gv_target
 	 * histories so they will be valid for a future access utilizing the clue field. This occurs
diff --git a/sr_port/tripinit.c b/sr_port/tripinit.c
index 1b464c0..38ac2c1 100755
--- a/sr_port/tripinit.c
+++ b/sr_port/tripinit.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	*
@@ -27,7 +28,6 @@ GBLREF mline			mline_root;
 GBLREF mliteral			literal_chain;
 GBLREF mvar			*mvartab;
 GBLREF mvax			*mvaxtab,*mvaxtab_end;
-GBLREF short int		block_level;
 GBLREF triple			t_orig;
 
 void tripinit(void)
@@ -66,8 +66,8 @@ void tripinit(void)
 	dqinit(&(t_orig.backptr), que);
 	dqinit(&literal_chain, que);
 	memset(&mline_root, 0, SIZEOF(mline_root));
-	mline_tail = & mline_root;
-	block_level = -1;
+	mline_tail = &mline_root;
+	TREF(block_level) = 0;
 	setcurtchain(&t_orig);
 	return;
 }
diff --git a/sr_port/unary_tail.c b/sr_port/unary_tail.c
index 1844ae2..fb9e444 100644
--- a/sr_port/unary_tail.c
+++ b/sr_port/unary_tail.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	*
@@ -28,13 +28,16 @@ void unary_tail(oprtype *opr)
 	 */
 	int		com, comval, drop, neg, num;
 	mval		*mv, *v;
-	opctype		c, c1, c2;
+	opctype		c, c1, c2, pending_coerce;
 	oprtype		*p;
-	triple		*t, *t1, *t2, *ta;
+	triple		*t, *t1, *t2, *ta, *ref0;
 	uint4		w;
+	DCL_THREADGBL_ACCESS;
 
+	SETUP_THREADGBL_ACCESS;
 	assert(TRIP_REF == opr->oprclass);
 	t = ta = t2 = opr->oprval.tref;
+	pending_coerce = OC_NOOP;
 	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;
@@ -48,11 +51,6 @@ void unary_tail(oprtype *opr)
 		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:
@@ -67,6 +65,9 @@ void unary_tail(oprtype *opr)
 				{
 					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 == pending_coerce && ((OC_COMVAL == c1) || (OC_COBOOL == c1)))
+				{	/* Delete this coercion; we may add it back later */
+					pending_coerce = c1;
 				} 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)
@@ -74,11 +75,6 @@ void unary_tail(oprtype *opr)
 				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);
@@ -90,6 +86,17 @@ void unary_tail(oprtype *opr)
 				assert(OC_LIT == c);
 				t = ta;
 				v = &t1->operand[0].oprval.mlit->v;
+				if (OC_NOOP != pending_coerce && OC_COMVAL != pending_coerce)
+				{	/* add back a coercion if we need it;
+					 * a COMVAL preceding a LIT is unneeded (and will cause an error).
+					 * this leaves a COBOOL but removing earier and readding here is easier to follow & cleaner
+					 */
+					ref0 = maketriple(pending_coerce);
+					dqins(t, exorder, ref0);
+					ref0->operand[0].oprclass = TRIP_REF;
+					ref0->operand[0].oprval.tref = t;
+					opr->oprval.tref = ref0;
+				}
 				if (num || com)
 				{	/* num includes both OC_NEG and OC_FORCENUM */
 					unuse_literal(v);
@@ -125,10 +132,18 @@ void unary_tail(oprtype *opr)
 				}
 				assert((MV_NM & v->mvtype) && (MV_STR & v->mvtype));
 				break;
+			case OC_NOOP:
+				if (OC_COMVAL == t->opcode)
+				{
+					t->opcode = OC_NOOP;
+					t->operand[0].oprclass = NO_REF;
+					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]);
+					RETURN_IF_RTS_ERROR;
 					if (OC_LIT == t2->opcode)
 					{
 						c2 = t2->opcode;
diff --git a/sr_port/unw_mv_ent.c b/sr_port/unw_mv_ent.c
index 176fb60..78c0878 100644
--- a/sr_port/unw_mv_ent.c
+++ b/sr_port/unw_mv_ent.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,10 +12,6 @@
 
 #include "mdef.h"
 
-#ifdef VMS
-#include <fab.h>		/* needed for dbgbldir_sysops.h */
-#endif
-
 #include "gtm_string.h"
 #include "gtm_unistd.h"
 
@@ -47,13 +43,12 @@
 #include "gt_timer.h"
 #include "iosocketdef.h"
 #include "have_crit.h"
-#ifdef UNIX
 #include "iormdef.h"
 #include "iottdef.h"
-#endif
 #include "stack_frame.h"
 #include "alias.h"
 #include "tp_timeout.h"
+#include "localvarmonitor.h"
 #ifdef GTM_TRIGGER
 #include "gv_trigger.h"
 #include "gtm_trigger.h"
@@ -181,6 +176,7 @@ void unw_mv_ent(mv_stent *mv_st_ent)
 				assert(mv_st_ent->mv_st_cont.mvs_stab == curr_symval);
 				symval_ptr = curr_symval;
 				curr_symval = symval_ptr->last_tab;
+				(TREF(curr_symval_cycle))++;
 				DBGRFCT((stderr, "\n\n***** unw_mv_ent-STAB: ** Symtab pop with 0x"lvaddr" replacing 0x"
 					 lvaddr"\n\n", curr_symval, symval_ptr));
 #				ifdef GTM_TRIGGER
@@ -346,7 +342,6 @@ void unw_mv_ent(mv_stent *mv_st_ent)
 				return;	/* already processed */
 			switch(mv_st_ent->mv_st_cont.mvs_zintdev.io_ptr->type)
 			{
-#				ifdef UNIX
 				case tt:
 					if (NULL != mv_st_ent->mv_st_cont.mvs_zintdev.io_ptr)
 					{	/* This mv_stent has not been processed yet */
@@ -361,14 +356,13 @@ void unw_mv_ent(mv_stent *mv_st_ent)
 					if (NULL != mv_st_ent->mv_st_cont.mvs_zintdev.io_ptr)
 					{	/* This mv_stent has not been processed yet */
 						rm_ptr = (d_rm_struct *)(mv_st_ent->mv_st_cont.mvs_zintdev.io_ptr->dev_sp);
-						assert(rm_ptr->pipe || rm_ptr->fifo || rm_ptr->follow);
+						assert(rm_ptr->is_pipe || rm_ptr->fifo || rm_ptr->follow);
 						rm_ptr->mupintr = FALSE;
 						rm_ptr->pipe_save_state.who_saved = pipewhich_invalid;
 						mv_st_ent->mv_st_cont.mvs_zintdev.buffer_valid = FALSE;
 						mv_st_ent->mv_st_cont.mvs_zintdev.io_ptr = NULL;
 					}
 					return;
-#				endif
 				case gtmsocket:
 					if (NULL != mv_st_ent->mv_st_cont.mvs_zintdev.io_ptr)
 					{	/* This mv_stent has not been processed yet */
diff --git a/sr_port/updhelper_reader.c b/sr_port/updhelper_reader.c
index 5a1943e..342b456 100644
--- a/sr_port/updhelper_reader.c
+++ b/sr_port/updhelper_reader.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	*
@@ -16,9 +16,6 @@
 
 #include <sys/mman.h>
 #include <errno.h>
-#ifdef VMS
-#include <descrip.h> /* Required for gtmsource.h */
-#endif
 
 #include "gdsroot.h"
 #include "gdskill.h"
@@ -41,18 +38,6 @@
 #include "repl_shutdcode.h"
 #include "gvcst_protos.h"
 
-#ifdef VMS
-#include <ssdef.h>
-#include <fab.h>
-#include <rms.h>
-#include <iodef.h>
-#include <secdef.h>
-#include <psldef.h>
-#include <lckdef.h>
-#include <syidef.h>
-#include <xab.h>
-#include <prtdef.h>
-#endif
 #include "op.h"
 #include "targ_alloc.h"
 #include "dpgbldir.h"
@@ -94,7 +79,7 @@
 
 #define IS_GOOD_RECORD(REC, RECLEN, READADDRS, LIMITADDRS, PRE_READ, LOCAL_READ) 	\
 	((IS_VALID_RECTYPE(REC))							\
-	    && (MIN_JNLREC_SIZE < RECLEN)						\
+	    && (MIN_JNLREC_SIZE <= RECLEN)						\
 	    && (ROUND_DOWN2(RECLEN, JNL_REC_START_BNDRY) == RECLEN)			\
 	    && (READADDRS + RECLEN <= LIMITADDRS)					\
 	    && (RECLEN == REC_LEN_FROM_SUFFIX(READADDRS, RECLEN))			\
@@ -115,10 +100,7 @@ GBLREF	FILE			*updhelper_log_fp;
 GBLREF	int			num_additional_processors;
 GBLREF  sgmnt_addrs             *cs_addrs;
 GBLREF 	sgmnt_data_ptr_t 	cs_data;
-#ifdef VMS
-GBLREF  uint4                   image_count;
-#endif
-GBLREF boolean_t		disk_blk_read;
+GBLREF	boolean_t		disk_blk_read;
 #ifdef DEBUG
 GBLREF	sgmnt_addrs		*reorg_encrypt_restart_csa;
 #endif
@@ -283,7 +265,7 @@ 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;
@@ -315,7 +297,7 @@ 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;
diff --git a/sr_port/updhelper_writer.c b/sr_port/updhelper_writer.c
index 9f0559a..a4ec53b 100755
--- a/sr_port/updhelper_writer.c
+++ b/sr_port/updhelper_writer.c
@@ -158,6 +158,7 @@ int updhelper_writer(void)
 								wcs_flu(WCSFLU_FLUSH_HDR | WCSFLU_WRITE_EPOCH
 												| WCSFLU_SPEEDUP_NOBEFORE);
 								assert(NULL == reorg_encrypt_restart_csa);
+								assert(jbp->next_epoch_time > jgbl.gbl_jrec_time);
 							}
 							rel_crit(reg);
 							/* Do equivalent of WCSFLU_SYNC_EPOCH now out of crit */
diff --git a/sr_port/updproc.c b/sr_port/updproc.c
index 741c928..b0d8712 100644
--- a/sr_port/updproc.c
+++ b/sr_port/updproc.c
@@ -21,10 +21,6 @@
 
 #include <sys/mman.h>
 #include <errno.h>
-#ifdef VMS
-#include <ssdef.h>
-#include <descrip.h> /* Required for gtmsource.h */
-#endif
 
 #include "cdb_sc.h"
 #include "gtm_string.h"
@@ -55,11 +51,9 @@
 #include "repl_shutdcode.h"
 #include "repl_sp.h"
 #include "jnl_write.h"
-#ifdef UNIX
 #include "repl_instance.h"
 #include "gtmio.h"
 #include "repl_inst_dump.h"		/* for "repl_dump_histinfo" prototype */
-#endif
 #ifdef GTM_TRIGGER
 #include <rtnhdr.h>			/* for rtn_tabent in gv_trigger.h */
 #include "gv_trigger.h"
@@ -71,17 +65,6 @@
 #include "trigger_update_protos.h"
 #include "util.h"
 #endif
-#ifdef VMS
-#include <fab.h>
-#include <rms.h>
-#include <iodef.h>
-#include <secdef.h>
-#include <psldef.h>
-#include <lckdef.h>
-#include <syidef.h>
-#include <xab.h>
-#include <prtdef.h>
-#endif
 #include "op.h"
 #include "svnames.h"		/* for SV_ZTWORMHOLE */
 #include "gvcst_protos.h"	/* for gvcst_init prototype */
@@ -136,11 +119,6 @@ GBLREF	unsigned int		t_tries;
 GBLREF	unsigned char		t_fail_hist[CDB_MAX_TRIES];
 GBLREF	struct_jrec_tcom	tcom_record;
 GBLREF	gv_namehead		*reset_gv_target;
-#ifdef VMS
-GBLREF	struct chf$signal_array	*tp_restart_fail_sig;
-GBLREF	boolean_t		tp_restart_fail_sig_used;
-GBLREF	boolean_t		secondary_side_std_null_coll;
-#endif
 GBLREF	boolean_t		is_replicator;
 GBLREF	jnl_gbls_t		jgbl;
 GBLREF	boolean_t		disk_blk_read;
@@ -157,10 +135,8 @@ GBLREF	stack_frame		*frame_pointer;	/* needed by TRIGGER_BASE_FRAME_UNWIND_IF_NO
 GBLREF	boolean_t		skip_dbtriggers;
 GBLREF	gv_namehead		*gv_target;
 GBLREF	boolean_t		gv_play_duplicate_kills;
-#ifdef UNIX
 GBLREF		int4		strm_index;
 STATICDEF	boolean_t	set_onln_rlbk_flg;
-#endif
 
 static	boolean_t		updproc_continue = TRUE;
 
@@ -187,7 +163,7 @@ error_def(ERR_UPDREPLSTATEOFF);
 														\
 	assert(CSA = &FILE_INFO(gv_cur_region)->s_addrs);	/* so we can use gv_cur_region below */		\
 	assert(JPC == CSA->jnl);										\
-	SET_GBL_JREC_TIME;	/* needed for jnl_put_jrt_pini() */						\
+	SET_GBL_JREC_TIME;	/* needed for "jnl_write_pini"/"jnl_write_epoch" done later in "wcs_flu" */	\
 	jbp = JPC->jnl_buff;											\
 	/* 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 as that could write			\
@@ -208,7 +184,7 @@ error_def(ERR_UPDREPLSTATEOFF);
 		if (0 == jnl_status)										\
 		{												\
 			if (0 == JPC->pini_addr)								\
-				jnl_put_jrt_pini(CSA);								\
+				jnl_write_pini(CSA);								\
 		} else												\
 		{												\
 			if (SS_NORMAL != JPC->status)								\
@@ -308,7 +284,6 @@ CONDITION_HANDLER(updproc_ch)
 		 */
 		if (first_sgm_info GTMTRIG_ONLY( || (TPRESTART_STATE_NORMAL != tprestart_state)))
 		{
-			VMS_ONLY(assert(FALSE == tp_restart_fail_sig_used);)
 #			ifdef GTM_TRIGGER
 			/* Note: Below GTM_TRIGGER-only code is similar to mdb_condition_handler. But unlike there,
 			 * where MUM_TSTART is done inside the condition handler to transfer control, we do an UNWIND
@@ -319,7 +294,7 @@ CONDITION_HANDLER(updproc_ch)
 			 * that by saving and restoring active_ch after the macro call so UNWIND is fine. But what this
 			 * means is that for a short code window (from when unw_mv_ent sets active_ch to when we reset it
 			 * after the macro call below), active_ch would be incorrectly set to updproc_ch (instead of
-			 * util_base_ch which START_CH would have set it to above). But that is okay since we dont expect
+			 * util_base_ch which START_CH would have set it to above). But that is okay since we don't expect
 			 * any TPRETRY errors in this short window and updproc_ch would anyways transfer control to
 			 * util_base_ch (through NEXTCH) for all non-TPRETRY errors.
 			 */
@@ -332,15 +307,9 @@ CONDITION_HANDLER(updproc_ch)
 			GTMTRIG_ONLY(assert(TPRESTART_STATE_NORMAL == tprestart_state));
 			NON_GTMTRIG_ONLY(assert(INVALID_GV_TARGET == reset_gv_target);)
 			reset_gv_target = INVALID_GV_TARGET; /* see "trigger_item_tpwrap_ch" similar code for why this is needed */
-#			ifdef UNIX
 			if (ERR_REPLONLNRLBK == SIGNAL) /* tp_restart did rts_error_csa(ERR_REPLONLNRLBK) */
 				set_onln_rlbk_flg = TRUE;
 			if ((ERR_TPRETRY == SIGNAL) || (ERR_REPLONLNRLBK == SIGNAL))
-#			elif defined VMS
-			if (!tp_restart_fail_sig_used)		/* If tp_restart ran clean */
-#			else
-#			  error unsupported platform
-#			endif
 			{
 				/* It is possible that dollar_tlevel at the time of the ESTABLISH of updproc_ch was 0
 				 * and the op_tstart happened inside updproc_actions and later as part of op_tcommit a
@@ -352,21 +321,10 @@ CONDITION_HANDLER(updproc_ch)
 				 * an assert failure in UNWIND. START_CH would have done a active_ch-- so we need a
 				 * active_ch[1] to get at the desired active_ch.
 				 */
-				UNIX_ONLY(assert(active_ch[1].dollar_tlevel <= dollar_tlevel);)
-				UNIX_ONLY(DEBUG_ONLY(active_ch[1].dollar_tlevel = dollar_tlevel;))
+				assert(active_ch[1].dollar_tlevel <= dollar_tlevel);
+				DEBUG_ONLY(active_ch[1].dollar_tlevel = dollar_tlevel;)
 				UNWIND(NULL, NULL);
 			}
-#			ifdef VMS
-			else
-			{	/* Otherwise tp_restart had a signal that we must now deal with.
-				 * replace the TPRETRY information with that saved from tp_restart.
-				 * first assert that we have room for these arguments and proper setup
-				 */
-				assert(TPRESTART_ARG_CNT >= tp_restart_fail_sig->chf$is_sig_args);
-				memcpy(sig, tp_restart_fail_sig, (tp_restart_fail_sig->chf$l_sig_args + 1) * SIZEOF(int));
-				tp_restart_fail_sig_used = FALSE;
-			}
-#			endif
 		} else
 		{
 			UNWIND(NULL, NULL);
@@ -376,7 +334,6 @@ CONDITION_HANDLER(updproc_ch)
 	else if (ERR_REPEATERROR == SIGNAL)
 		SIGNAL = dollar_ecode.error_last_ecode;	/* Error rethrown from a trigger */
 #	endif
-#	ifdef UNIX
 	else if (ERR_REPLONLNRLBK == SIGNAL)
 	{
 		preemptive_db_clnup(SEVERITY);
@@ -392,10 +349,9 @@ CONDITION_HANDLER(updproc_ch)
 		 * be 0 or non-zero and has no relation to the dollar_tlevel currently. So just fix active_ch->dollar_tlevel
 		 * before the UNWIND call to avoid any dollar_tlevel related assert failures.
 		 */
-		UNIX_ONLY(DEBUG_ONLY(active_ch[1].dollar_tlevel = dollar_tlevel;))
+		DEBUG_ONLY(active_ch[1].dollar_tlevel = dollar_tlevel;)
 		UNWIND(NULL, NULL);
 	}
-#	endif
 	/* Assumes we don't fall through and unlock the mutex later
 	 * We don't care if it fails, so ignore the status.
 	 */
@@ -415,10 +371,6 @@ int updproc(void)
 	uint4			status;
 	gld_dbname_list 	*gld_db_files, *curr;
 	recvpool_ctl_ptr_t	recvpool_ctl;
-#	ifdef VMS
-	char			proc_name[PROC_NAME_MAXLEN + 1];
-	struct dsc$descriptor_s proc_name_desc;
-#	endif
 	upd_proc_local_ptr_t	upd_proc_local;
 	sgmnt_addrs		*repl_csa;
 	DCL_THREADGBL_ACCESS;
@@ -426,19 +378,9 @@ int updproc(void)
 	SETUP_THREADGBL_ACCESS;
 	call_on_signal = updproc_sigstop;
 	GTMTRIG_DBG_ONLY(ch_at_trigger_init = &updproc_ch);
-#	ifdef VMS
-	/* Get a meaningful process name */
-	proc_name_desc.dsc$w_length = get_proc_name(LIT_AND_LEN("GTMUPD"), getpid(), proc_name);
-	proc_name_desc.dsc$a_pointer = proc_name;
-	proc_name_desc.dsc$b_dtype = DSC$K_DTYPE_T;
-	proc_name_desc.dsc$b_class = DSC$K_CLASS_S;
-	if (SS$_NORMAL != (status = sys$setprn(&proc_name_desc)))
-		rts_error_csa(CSA_ARG(NULL) VARLSTCNT(7) ERR_RECVPOOLSETUP, 0, ERR_TEXT, 2,
-				RTS_ERROR_LITERAL("Unable to change update process name"), status);
-#	else
 	/* In the update process, we want every replicated update from an originating instances to end up in a replicated region
 	 * on this (the receiving) instance. If not, we will issue a UPDREPLSTATEOFF error. But it is possible that replication
-	 * was turned ON at that time (since we dont hold crit at the time we do the UPDREPLSTATEOFF check) but later got turned
+	 * was turned ON at that time (since we don't hold crit at the time we do the UPDREPLSTATEOFF check) but later got turned
 	 * OFF (for example due to no disk space for journal files etc.) just before the actual application of the update.
 	 * In that case, the UPDREPLSTATEOFF error would not have been issued but there is still an issue in that an update from
 	 * the primary got applied to a non-replicated database on the secondary. We prevent this out-of-sync situation from
@@ -446,7 +388,6 @@ int updproc(void)
 	 * a runtime error and does not turn journaling off.
 	 */
 	TREF(error_on_jnl_file_lost) = JNL_FILE_LOST_ERRORS;
-#	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;
@@ -477,7 +418,6 @@ int updproc(void)
 						 * and not the other way around.
 						 */
 		recvpool_ctl->jnl_seqno = jnl_seqno;
-#		ifdef UNIX
 		/* At this point, the receiver server will see the non-zero jnl_seqno and start communicating with a source server.
 		 * But if this is a supplementary root primary instance, the current instance jnl_seqno is not what the receiver
 		 * will ask the source to start sending transactions from. It has to first figure out what non-supplementary
@@ -534,21 +474,8 @@ int updproc(void)
 			start_jnl_seqno = jnl_seqno;
 			strm_index = recvpool.gtmrecv_local->strm_index;
 		}
-#		endif
 		upd_proc_local->read_jnl_seqno = jnl_seqno;
 		/* Check if the secondary is ahead of the primary */
-#		ifdef VMS
-		if ((jnlpool_ctl->jnl_seqno > start_jnl_seqno) && jnlpool_ctl->upd_disabled)
-		{
-			repl_log(updproc_log_fp, TRUE, TRUE,
-				"JNLSEQNO last updated by  update process = "INT8_FMT" "INT8_FMTX"\n",
-				INT8_PRINT(start_jnl_seqno), INT8_PRINTX(start_jnl_seqno));
-			repl_log(updproc_log_fp, TRUE, TRUE,
-				"JNLSEQNO of last transaction written to journal pool = "INT8_FMT" "INT8_FMTX"\n",
-				INT8_PRINT(jnlpool_ctl->jnl_seqno), INT8_PRINTX(jnlpool_ctl->jnl_seqno));
-			rts_error_csa(CSA_ARG(NULL) VARLSTCNT(1) ERR_SECONDAHEAD);
-		}
-#		else
 		/* The SECONDAHEAD check is performed in the receiver server after it has connected with the source
 		 * server. This is because the check is relevant only if the source server is dualsite. That is
 		 * not known now but instead at connection time. Hence the deferred check.
@@ -559,20 +486,18 @@ int updproc(void)
 		 */
 		assert((jnlpool_ctl->jnl_seqno == start_jnl_seqno)
 			|| (jnlpool.repl_inst_filehdr->is_supplementary && !jnlpool.jnlpool_ctl->upd_disabled));
-#		endif
-		UNIX_ONLY(assert(updproc_continue && !set_onln_rlbk_flg));
+		assert(updproc_continue && !set_onln_rlbk_flg);
 		/* We should be the only one acquiring the lock, so a single try should be sufficient. */
 		status = pthread_mutex_trylock(&recvpool.recvpool_ctl->write_updated_ctl);
 		if (0 != status)
 			rts_error_csa(CSA_ARG(NULL) VARLSTCNT(8) ERR_SYSCALL, 5,
 					LEN_AND_LIT("pthread_mutex_trylock"), CALLFROM, status, 0);
-		while (updproc_continue UNIX_ONLY(&& !set_onln_rlbk_flg))
+		while (updproc_continue && !set_onln_rlbk_flg)
 			updproc_actions(gld_db_files);
 		status = pthread_mutex_unlock(&recvpool.recvpool_ctl->write_updated_ctl);
 		if (0 != status)
 			rts_error_csa(CSA_ARG(NULL) VARLSTCNT(8) ERR_SYSCALL, 5,
 					LEN_AND_LIT("pthread_mutex_unlock"), CALLFROM, status, 0);
-#		ifdef UNIX
 		if (set_onln_rlbk_flg)
 		{	/* A concurrent online rollback happened which drove the updproc_ch and called us. Need to let the receiver
 			 * server know about it and set up the sequence numbers
@@ -591,9 +516,7 @@ int updproc(void)
 				assert(!dollar_trestart);
 			}
 			start_jnl_seqno = jnlpool.jnlpool_ctl->jnl_seqno; /* needed when we go back to the beginning of the loop */
-		} else
-#		endif
-		if (!updproc_continue)
+		} else if (!updproc_continue)
 			break;
 	}
 	updproc_end();
@@ -632,7 +555,6 @@ void updproc_actions(gld_dbname_list *gld_db_files)
 	char	           	gv_mname[MAX_KEY_SZ];
 	unsigned char		buff[MAX_ZWR_KEY_SZ], *end, scan_char, next_char;
 	boolean_t		log_switched = FALSE;
-#	ifdef UNIX
 	boolean_t		suppl_root_primary, suppl_propagate_primary;
 	repl_histinfo		histinfo;
 	repl_old_triple_jnl_t	*input_old_triple;
@@ -640,7 +562,6 @@ void updproc_actions(gld_dbname_list *gld_db_files)
 	uint4			expected_rec_len;
 	int			status;
 	struct timespec		waketime;
-#	endif
 	jnl_private_control	*jpc;
 	gld_dbname_list		*curr;
 	gd_region		*save_reg, *dummy_reg;
@@ -654,14 +575,12 @@ void updproc_actions(gld_dbname_list *gld_db_files)
 	DCL_THREADGBL_ACCESS;
 
 	SETUP_THREADGBL_ACCESS;
-#	ifdef UNIX
 	assert((NULL != jnlpool.jnlpool_dummy_reg) && jnlpool.jnlpool_dummy_reg->open);
 	repl_csa = &FILE_INFO(jnlpool.jnlpool_dummy_reg)->s_addrs;
 	DEBUG_ONLY(
 		assert(!repl_csa->hold_onto_crit); /* so we can do unconditional grab_lock/rel_lock below */
 		ASSERT_VALID_JNLPOOL(repl_csa);
 	)
-#	endif
 	ESTABLISH(updproc_ch);
 	recvpool_ctl = recvpool.recvpool_ctl;
 	upd_proc_local = recvpool.upd_proc_local;
@@ -674,7 +593,6 @@ void updproc_actions(gld_dbname_list *gld_db_files)
 	jnl_seqno = upd_proc_local->read_jnl_seqno;
 	log_interval = upd_proc_local->log_interval;
 	lastlog_seqno = jnl_seqno - log_interval; /* to ensure we log the first transaction */
-#	ifdef UNIX
 	if (jnlpool.repl_inst_filehdr->is_supplementary)
 	{
 		if (!jnlpool.jnlpool_ctl->upd_disabled)
@@ -691,7 +609,6 @@ void updproc_actions(gld_dbname_list *gld_db_files)
 		suppl_root_primary = FALSE;
 		suppl_propagate_primary = FALSE;
 	}
-#	endif
 	/* Since update process does not invoke op_gvname but directly invokes op_gvput/kill etc. we set TREF(gd_targ_addr)
 	 * here (this is normally set by op_gvname in mumps).
 	 */
@@ -699,7 +616,7 @@ void updproc_actions(gld_dbname_list *gld_db_files)
 	while (TRUE)
 	{
 		incr_seqno = FALSE;
-		UNIX_ONLY(assert(0 == GET_STRM_INDEX(jnl_seqno));)
+		assert(0 == GET_STRM_INDEX(jnl_seqno));
 		if (SHUTDOWN == upd_proc_local->upd_proc_shutdown)
 			break;
 		if (GTMRECV_NO_RESTART != gtmrecv_local->restart)
@@ -749,7 +666,7 @@ void updproc_actions(gld_dbname_list *gld_db_files)
 		 * is non-zero, it is possible tupd_num is 0 in case we come here after a TP restart.
 		 */
 		assert((dollar_tlevel && (tupd_num || dollar_trestart)) || !dollar_tlevel && !tupd_num);
-		if (upd_proc_local->bad_trans UNIX_ONLY(|| upd_proc_local->onln_rlbk_flg)
+		if (upd_proc_local->bad_trans || upd_proc_local->onln_rlbk_flg
 			|| (!dollar_tlevel && (FALSE == recvpool.recvpool_ctl->wrapped)
 				&& (temp_write = recvpool.recvpool_ctl->write) == upd_proc_local->read))
 		{	/* bad-trans OR online rollback OR nothing to process. In case of bad_trans or online rollback, wait for
@@ -775,13 +692,11 @@ void updproc_actions(gld_dbname_list *gld_db_files)
 			if ((0 != status) && (ETIMEDOUT != status))
 				rts_error_csa(CSA_ARG(NULL) VARLSTCNT(8) ERR_SYSCALL, 5,
 						LEN_AND_LIT("pthread_mutex_timedwait"), CALLFROM, status, 0);
-#			ifdef UNIX
 			if (!upd_proc_local->onln_rlbk_flg && (repl_csa->onln_rlbk_cycle != jnlpool.jnlpool_ctl->onln_rlbk_cycle))
 			{	/* A concurrent online rollback happened. Start afresh */
 				grab_lock(jnlpool.jnlpool_dummy_reg, TRUE, GRAB_LOCK_ONLY);
 				UPDPROC_ONLN_RLBK_CLNUP(jnlpool.jnlpool_dummy_reg); /* No return */
 			} /* else onln_rlbk_flag is already set and the receiver should take the next appropriate action */
-#			endif
 			continue;
 		}
 		/* The update process reads "recvpool_ctl->write" first and assumes that all data in the receive pool
@@ -841,7 +756,6 @@ void updproc_actions(gld_dbname_list *gld_db_files)
 		rectype = (enum jnl_record_type)rec->prefix.jrec_type;
 		rec_len = rec->prefix.forwptr;
 		assert(IS_REPLICATED(rectype));
-#		ifdef UNIX
 		if ((JRT_TRIPLE == rectype) || (JRT_HISTREC == rectype))
 		{	/* Source server has sent a REPL_TRIPLE or REPL_HISTREC message in the middle of logical journal
 			 * records. Construct the repl_histrec structure from the input message and add this history
@@ -959,7 +873,12 @@ void updproc_actions(gld_dbname_list *gld_db_files)
 						 */
 						jpc = cs_addrs->jnl;
 						DO_JNL_ENSURE_OPEN(cs_addrs, jpc); /* does "jnl_ensure_open" and pre-requisites */
-						wcs_flu(WCSFLU_FSYNC_DB | WCSFLU_FLUSH_HDR | WCSFLU_WRITE_EPOCH);
+						/* Note: WCSFLU_FORCE_EPOCH needed to ensure an EPOCH is written always even if
+						 * the most recent record in the journal file is an EPOCH. This is because we
+						 * are writing a new strm_seqno and want this to show.
+						 */
+						wcs_flu(WCSFLU_FSYNC_DB | WCSFLU_FLUSH_HDR			\
+								| WCSFLU_WRITE_EPOCH | WCSFLU_FORCE_EPOCH);
 						rel_crit(gv_cur_region);
 					}
 					TP_CHANGE_REG(save_reg);
@@ -994,7 +913,6 @@ void updproc_actions(gld_dbname_list *gld_db_files)
 			upd_proc_local->read = temp_read;
 			continue;
 		}
-#		endif
 		/* NOTE: All journal sequence number fields are at same offset */
 		if (ROUND_DOWN2(rec_len, JNL_REC_START_BNDRY) != rec_len)
 		{	/* We need that so REC_LEN_FROM_SUFFIX does not access unaligned int */
@@ -1085,7 +1003,6 @@ void updproc_actions(gld_dbname_list *gld_db_files)
 		}
 		if (upd_good_record == bad_trans_type)
 		{
-#			ifdef UNIX
 			if (suppl_propagate_primary)
 			{
 				rec_strm_seqno = GET_STRM_SEQNO(rec);
@@ -1104,7 +1021,6 @@ void updproc_actions(gld_dbname_list *gld_db_files)
 							strm_index, &rec_strm_seqno, &strm_seqno);
 				}
 			}
-#			endif
 			if (JRT_NULL == rectype)
 			{	/* Play the NULL transaction into the database and journal files */
 				save_reg = gv_cur_region;
@@ -1242,14 +1158,11 @@ void updproc_actions(gld_dbname_list *gld_db_files)
 							{
 								if (STR_SUB_PREFIX == scan_char)
 								{
-									VMS_ONLY(assert(!secondary_side_std_null_coll);)
-									UNIX_ONLY(
-										assert(!recvpool_ctl->this_side.is_std_null_coll);)
+									assert(!recvpool_ctl->this_side.is_std_null_coll);
 									last_nullsubs = cntr;
 								} else if (SUBSCRIPT_STDCOL_NULL == scan_char)
 								{
-									VMS_ONLY(assert(secondary_side_std_null_coll);)
-									UNIX_ONLY(assert(recvpool_ctl->this_side.is_std_null_coll);)
+									assert(recvpool_ctl->this_side.is_std_null_coll);
 									last_nullsubs = cntr;
 								}
 							}
@@ -1279,8 +1192,7 @@ void updproc_actions(gld_dbname_list *gld_db_files)
 					else
 					{
 						assert(IS_SET(rectype));
-						if (VMS_ONLY(keystr->length + 1 + SIZEOF(rec_hdr) +) val_mv.str.len >
-										gv_cur_region->max_rec_size)
+						if (val_mv.str.len > gv_cur_region->max_rec_size)
 						{
 							bad_trans_type = upd_bad_val_size;
 							tmpcsa = csa;
@@ -1366,7 +1278,7 @@ void updproc_actions(gld_dbname_list *gld_db_files)
 				"-> Bad trans :: bad_trans_type = %ld type = %ld len = %ld backptr = %ld jnl_seqno = %llu "
 				"[0x%llx]\n", bad_trans_type, rectype, rec_len, backptr, tmpseqno, tmpseqno);
 			upd_proc_local->bad_trans = TRUE;
-			/* We dont expect to be holding crit on any region in case of a bad_trans.
+			/* We don't expect to be holding crit on any region in case of a bad_trans.
 			 * Nevertheless release crit in PRO just in case we hold it.
 			 */
 			assert(0 == have_crit(CRIT_HAVE_ANY_REG));
@@ -1428,8 +1340,7 @@ void updproc_actions(gld_dbname_list *gld_db_files)
 						if (NULL != gv_failed_key)	/* Free memory if it has been used */
 							free(gv_failed_key);
 						assert(NULL != tmpcsa);
-						rts_error_csa(CSA_ARG(tmpcsa) VARLSTCNT(10) ERR_REC2BIG, 4,
-							VMS_ONLY(gv_currkey->end + 1 + SIZEOF(rec_hdr) +) val_mv.str.len,
+						rts_error_csa(CSA_ARG(tmpcsa) VARLSTCNT(10) ERR_REC2BIG, 4, val_mv.str.len,
 							(int4)(tmpcsa->region)->max_rec_size, REG_LEN_STR(tmpcsa->region),
 							ERR_GVIS, 2, end - buff, buff);
 						break;
@@ -1460,12 +1371,8 @@ void updproc_actions(gld_dbname_list *gld_db_files)
 			 * journal pool. In case of a root primary supplementary instance, we need to do this check only for the
 			 * non-supplementary stream of interest (strm_index) that this update process is processing.
 			 */
-			UNIX_ONLY(
-				assert(!suppl_root_primary || ((0 < strm_index) && (MAX_SUPPL_STRMS > strm_index)));
-				jnlpool_ctl_seqno = (!suppl_root_primary ? jnlpool_ctl->jnl_seqno
-										: jnlpool_ctl->strm_seqno[strm_index]);
-			)
-			VMS_ONLY(jnlpool_ctl_seqno = jnlpool_ctl->jnl_seqno;)
+			assert(!suppl_root_primary || ((0 < strm_index) && (MAX_SUPPL_STRMS > strm_index)));
+			jnlpool_ctl_seqno = (!suppl_root_primary ? jnlpool_ctl->jnl_seqno : jnlpool_ctl->strm_seqno[strm_index]);
 			if (jnlpool_ctl_seqno)
 			{	/* Now that the update process has played an incoming seqno, we expect it to have incremented
 				 * the corresponding jnl_seqno and strm_seqno fields in the current instance's journal pool
@@ -1482,7 +1389,7 @@ void updproc_actions(gld_dbname_list *gld_db_files)
 				 * before that in the idle wait loop) and take appropriate action.
 				 */
 				if ((upd_proc_local->read_jnl_seqno != jnlpool_ctl_seqno)
-					UNIX_ONLY(&& (repl_csa->onln_rlbk_cycle == jnlpool_ctl->onln_rlbk_cycle)))
+					&& (repl_csa->onln_rlbk_cycle == jnlpool_ctl->onln_rlbk_cycle))
 				{
 					repl_log(updproc_log_fp, TRUE, TRUE,
 						"JNLSEQNO last updated by  update process = "INT8_FMT" "INT8_FMTX"\n",
diff --git a/sr_port/updproc_end.c b/sr_port/updproc_end.c
old mode 100755
new mode 100644
index 5820630..a4f6fcd
--- a/sr_port/updproc_end.c
+++ b/sr_port/updproc_end.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,7 +23,6 @@
 #include "gtm_string.h"
 #include "gtm_time.h"
 
-#ifdef UNIX
 #include "gtm_ipc.h"
 #include <gtm_un.h>
 #include <sys/sem.h>
@@ -30,10 +30,6 @@
 #ifndef __MVS__
 #include <sys/param.h>
 #endif
-#elif defined(VMS)
-#include <psldef.h>
-#include <descrip.h> /* Required for gtmrecv.h */
-#endif
 
 #include "gdsroot.h"
 #include "gdsblk.h"
@@ -56,14 +52,9 @@
 #include "repl_msg.h"
 #include "gtmsource.h"
 #include "repl_sem.h"
-#ifdef VMS
-#include "repl_shm.h"
-#endif
 #include "repl_log.h"
-#ifdef UNIX
 #include "mutex.h"
 #include "anticipatory_freeze.h"
-#endif
 #include "gtm_event_log.h"
 #include "mupip_exit.h"
 #include "read_db_files_from_gld.h"
@@ -85,30 +76,23 @@ void  updproc_stop(boolean_t exit)
 	int		fclose_res, idx, save_errno;
 	seq_num		log_seqno, log_seqno1, jnlpool_seqno, jnlpool_strm_seqno[MAX_SUPPL_STRMS];
 	sgmnt_addrs	*repl_csa;
-	UNIX_ONLY(
-		int4	strm_idx;
-		DCL_THREADGBL_ACCESS;
-	)
+	int4		strm_idx;
+	DCL_THREADGBL_ACCESS;
 
-	UNIX_ONLY(
-		SETUP_THREADGBL_ACCESS;
-	)
+	SETUP_THREADGBL_ACCESS;
 	call_on_signal = NULL;	/* Don't reenter on error */
 	if (pool_init)
 	{
 		DEBUG_ONLY(repl_csa = &FILE_INFO(jnlpool.jnlpool_dummy_reg)->s_addrs;)
 		assert(!repl_csa->hold_onto_crit);
 		jnlpool_seqno = jnlpool.jnlpool_ctl->jnl_seqno;
-		UNIX_ONLY(
-			for (idx = 0; idx < MAX_SUPPL_STRMS; idx++)
-				jnlpool_strm_seqno[idx] = jnlpool.jnlpool_ctl->strm_seqno[idx];
-		)
+		for (idx = 0; idx < MAX_SUPPL_STRMS; idx++)
+			jnlpool_strm_seqno[idx] = jnlpool.jnlpool_ctl->strm_seqno[idx];
 		log_seqno = recvpool.recvpool_ctl->jnl_seqno;
 		log_seqno1 = recvpool.upd_proc_local->read_jnl_seqno;
-		UNIX_ONLY(strm_idx = recvpool.gtmrecv_local->strm_index;)
+		strm_idx = recvpool.gtmrecv_local->strm_index;
 		rel_lock(jnlpool.jnlpool_dummy_reg);
 		repl_log(updproc_log_fp, TRUE, TRUE, "REPL INFO - Current Jnlpool Seqno : %llu\n", jnlpool_seqno);
-#		ifdef UNIX
 		for (idx = 0; idx < MAX_SUPPL_STRMS; idx++)
 		{
 			if (jnlpool_strm_seqno[idx])
@@ -117,43 +101,22 @@ void  updproc_stop(boolean_t exit)
 		}
 		if (0 < strm_idx)
 			repl_log(updproc_log_fp, TRUE, TRUE, "REPL INFO - Update process has Stream # %d\n", strm_idx);
-#		endif
 		repl_log(updproc_log_fp, TRUE, TRUE, "REPL INFO - Current Update process Read Seqno : %llu\n", log_seqno1);
 		repl_log(updproc_log_fp, TRUE, TRUE, "REPL INFO - Current Receive Pool Seqno : %llu\n", log_seqno);
-#		ifdef UNIX
 		if (!INST_FREEZE_ON_ERROR_POLICY)
 		{
 			mutex_cleanup(jnlpool.jnlpool_dummy_reg);
-			JNLPOOL_SHMDT(status, save_errno);
+			JNLPOOL_SHMDT(jnlpool, status, save_errno);
 			if (0 > status)
 				repl_log(stderr, TRUE, TRUE, "Error detaching from jnlpool : %s\n", STRERROR(save_errno));
+			assert(!pool_init);
 		}
-#		elif defined(VMS)
-		jnlpool_ctl = jnlpool.jnlpool_ctl = NULL;
-		if (SS$_NORMAL != (status = detach_shm(jnlpool.shm_range)))
-			repl_log(stderr, TRUE, TRUE, "Error detaching from jnlpool : %s\n", REPL_STR_ERROR);
-		if (SS$_NORMAL != (status = signoff_from_gsec(jnlpool.shm_lockid)))
-			repl_log(stderr, TRUE, TRUE, "Error dequeueing lock on jnlpool global section : %s\n", REPL_STR_ERROR);
-#		else
-#		error Unsupported Platform
-#		endif
-		pool_init = FALSE;
 	}
 	recvpool.upd_proc_local->upd_proc_shutdown = NORMAL_SHUTDOWN;
-	/* On UNIX, the receiver server needs to do a WAITPID on the update process so that the STOPed update process can be
+	/* The receiver server needs to do a WAITPID on the update process so that the STOPed update process can be
 	 * reaped by the OS and don't go into the defunct state. So, do not reset the upd_proc_pid
 	 */
-	VMS_ONLY(recvpool.upd_proc_local->upd_proc_pid = 0;)
-#ifdef UNIX
 	SHMDT(recvpool.recvpool_ctl);
-#elif defined(VMS)
-	if(SS$_NORMAL != (status = detach_shm(recvpool.shm_range)))
-		repl_log(stderr, TRUE, TRUE, "Update process could not detach from recvpool : %s\n", REPL_STR_ERROR);
-	if (SS$_NORMAL != (status = signoff_from_gsec(recvpool.shm_lockid)))
-		repl_log(stderr, TRUE, TRUE, "Error dequeueing lock on recvpool global section : %s\n", REPL_STR_ERROR);
-#else
-#error Unsupported Platform
-#endif
 	recvpool.recvpool_ctl = NULL;
 	gtm_event_log_close();
 	if (exit)
diff --git a/sr_port/viewtab.h b/sr_port/viewtab.h
index 6a85a59..18b5c85 100755
--- a/sr_port/viewtab.h
+++ b/sr_port/viewtab.h
@@ -31,6 +31,13 @@ VIEWTAB("FREEZE",		VTP_DBREGION,			VTK_FREEZE,		MV_NM),
 VIEWTAB("FULL_BOOLEAN",		VTP_NULL,			VTK_FULLBOOL,		MV_STR),
 VIEWTAB("FULL_BOOLWARN",	VTP_NULL,			VTK_FULLBOOLWARN,	MV_STR),
 VIEWTAB("GDSCERT",		VTP_NULL | VTP_VALUE,		VTK_GDSCERT,		MV_STR),
+#ifdef TESTPOLLCRIT
+VIEWTAB("GRABCRIT",		VTP_DBREGION,			VTK_GRABCRIT,		MV_STR),
+VIEWTAB("GRABJNLPH2",		VTP_DBREGION,			VTK_GRABJNLPH2,		MV_STR),
+VIEWTAB("GRABJNLPOOLPH2",	VTP_DBREGION,			VTK_GRABJNLPOOLPH2,	MV_STR),
+VIEWTAB("GRABJNLQIO",		VTP_DBREGION,			VTK_GRABJNLQIO,		MV_STR),
+VIEWTAB("GRABLOCK",		VTP_DBREGION,			VTK_GRABLOCK,		MV_STR),
+#endif
 VIEWTAB("GVACCESS_METHOD",	VTP_DBREGION,			VTK_GVACC_METH,		MV_STR),
 VIEWTAB("GVDUPSETNOOP",		VTP_NULL | VTP_VALUE,		VTK_GVDUPSETNOOP,	MV_STR),
 VIEWTAB("GVFILE",		VTP_DBREGION,			VTK_GVFILE,		MV_STR),
@@ -45,9 +52,7 @@ VIEWTAB("ICSIZE",		VTP_NULL,			VTK_ICSIZE,		MV_NM),
 VIEWTAB("IMAGENAME",		VTP_NULL,			VTK_IMAGENAME,		MV_STR), /* nodoc : test system use returns
 												  * running executable */
 VIEWTAB("JNLACTIVE",		VTP_DBREGION,			VTK_JNLACTIVE,		MV_NM),
-#ifndef VMS
 VIEWTAB("JNLERROR",		VTP_VALUE | VTP_NULL,		VTK_JNLERROR,		MV_NM),
-#endif
 VIEWTAB("JNLFILE",		VTP_DBREGION,			VTK_JNLFILE,		MV_STR),
 VIEWTAB("JNLFLUSH",		VTP_DBREGION | VTP_NULL,	VTK_JNLFLUSH,		MV_STR),
 VIEWTAB("JNLTRANSACTION",	VTP_NULL,			VTK_JNLTRANSACTION,	MV_NM),
@@ -60,8 +65,7 @@ VIEWTAB("LOGTPRESTART",		VTP_VALUE | VTP_NULL,		VTK_LOGTPRESTART,	MV_NM),
 #ifdef DEBUG
 VIEWTAB("LVDMP",		VTP_LVN,			VTK_LVDMP,		MV_NM),
 #endif
-VIEWTAB("LVDUPCHECK",		VTP_NULL | VTP_VALUE,		VTK_LVDUPCHECK,		MV_STR), /* nodoc : felt unnecessary in
-												  * all known cases */
+VIEWTAB("LVMON",		VTP_NULL | VTP_VALUE,		VTK_LVMON,		MV_STR),/* nodoc : code debugging feature */
 #ifdef DEBUG_ALIAS
 VIEWTAB("LVMONOUT",		VTP_NULL,			VTK_LVMONOUT,		MV_NM), /* nodoc : code debugging feature */
 VIEWTAB("LVMONSTART",		VTP_NULL,			VTK_LVMONSTART,		MV_NM), /* nodoc : code debugging feature */
@@ -91,6 +95,13 @@ VIEWTAB("RCHITS",		VTP_NULL,			VTK_RCHITS,		MV_NM),
 VIEWTAB("RCMISSES",		VTP_NULL,			VTK_RCMISSES,		MV_NM),
 VIEWTAB("RCSIZE",		VTP_NULL,			VTK_RCSIZE,		MV_NM),
 VIEWTAB("REGION",		VTP_DBKEY,			VTK_REGION,		MV_STR),
+#ifdef TESTPOLLCRIT
+VIEWTAB("RELCRIT",		VTP_DBREGION,			VTK_RELCRIT,		MV_STR),
+VIEWTAB("RELJNLPH2",		VTP_DBREGION,			VTK_RELJNLPH2,		MV_STR),
+VIEWTAB("RELJNLPOOLPH2",	VTP_DBREGION,			VTK_RELJNLPOOLPH2,	MV_STR),
+VIEWTAB("RELJNLQIO",		VTP_DBREGION,			VTK_RELJNLQIO,		MV_STR),
+VIEWTAB("RELLOCK",		VTP_DBREGION,			VTK_RELLOCK,		MV_STR),
+#endif
 VIEWTAB("RESETGVSTATS",		VTP_NULL,			VTK_RESETGVSTATS,	MV_STR),
 VIEWTAB("RTNCHECKSUM",		VTP_RTNAME,			VTK_RTNCHECKSUM,	MV_STR),
 VIEWTAB("RTNNEXT",		VTP_RTNAME,			VTK_RTNEXT,		MV_STR),
diff --git a/sr_port/wbox_test_init.h b/sr_port/wbox_test_init.h
index 5aaf8cd..fd6d277 100755
--- a/sr_port/wbox_test_init.h
+++ b/sr_port/wbox_test_init.h
@@ -1,7 +1,7 @@
 
 /****************************************************************
  *								*
- * 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	*
@@ -176,7 +176,11 @@ typedef enum {
 	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 */
+	WBTEST_HELPOUT_FAILGROUPCHECK,		/* 132 : Create GTM-8654 : EUID and file owners are not group members */
+	WBTEST_LVMON_PSEUDO_FAIL,		/* 133 : Create condition to cause lvmonitor to fail a comparison and report it */
+	WBTEST_REPLINSTSTNDALN,			/* 134 : Expected case of REPLINSTSTNDALN error */
+	WBTEST_FORCE_SHMPLRECOV,		/* 135 : Always invoke SHMPLRECOV abandoned block processing */
+	WBTEST_GETPWUID_CHECK_OVERWRITE		/* 136 : Check for getpwuid_struct variable overwrite condition */
 	/* 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 2237135..728aeb6 100644
--- a/sr_port/wcs_phase2_commit_wait.c
+++ b/sr_port/wcs_phase2_commit_wait.c
@@ -31,6 +31,7 @@
 #include "send_msg.h"
 #include "gtm_c_stack_trace.h"
 #include "wbox_test_init.h"
+#include "is_proc_alive.h"
 
 error_def(ERR_COMMITWAITPID);
 error_def(ERR_COMMITWAITSTUCK);
@@ -63,14 +64,11 @@ error_def(ERR_COMMITWAITSTUCK);
 }
 
 GBLREF	uint4		process_id;
-GBLREF	int		process_exiting;
 #ifdef DEBUG
 GBLREF	boolean_t	in_mu_rndwn_file;
 #endif
 
-#ifdef UNIX
-GBLREF	volatile int4		timer_stack_count;
-#endif
+#define	PROC_ALIVE_CHECK_FACTOR	32	/* Do "is_proc_alive" check 32 times during the total wait period */
 
 /* if cr == NULL, wait a maximum of 1 minute for ALL processes actively in bg_update_phase2 to finish.
  * if cr != NULL, wait a maximum of 1 minute for the particular cache-record to be done with phase2 commit.
@@ -85,13 +83,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;
+	uint4			lcnt, lcnt_isprcalv_freq, lcnt_isprcalv_next, blocking_pid, start_in_tend;
 	int4			value;
-	boolean_t		was_crit;
-	boolean_t		use_timer;
+	boolean_t		is_alive, was_crit;
 	boolean_t		timedout;
 	block_id		blk;
-	int4			index, crarray_size, crarray_index;
+	int4			index, crarray_index;
 	cache_rec_ptr_t		cr_lo, cr_top, curcr;
 	phase2_wait_trace_t	crarray[MAX_PHASE2_WAIT_CR_TRACE_SIZE];
 #	ifdef DEBUG
@@ -100,39 +97,16 @@ boolean_t	wcs_phase2_commit_wait(sgmnt_addrs *csa, cache_rec_ptr_t cr)
 	int4			waitarray_size;
 	boolean_t		half_time = FALSE;
 #	endif
-	static uint4		stuck_cnt = 0; /* stuck_cnt signifies the number of times the same process
-						has called gtmstuckexec for the same condition*/
+	static uint4		stuck_cnt = 0;	/* stuck_cnt signifies the number of times the same process
+						 * has called gtmstuckexec for the same condition.
+						 */
+
 	DEBUG_ONLY(cr_lo = cr_top = NULL;)
-	crarray_size = SIZEOF(crarray) / SIZEOF(crarray[0]);
 	DEBUG_ONLY(waitarray_size = SIZEOF(waitarray) / SIZEOF(waitarray[0]);)
 
 	assert(!in_mu_rndwn_file);
 	csd = csa->hdr;
-	/* To avoid unnecessary time spent waiting, we would like to do rel_quants instead of wcs_sleep. But this means
-	 * we need to have some other scheme for limiting the total time slept. We use the heartbeat scheme which currently is
-	 * available only in Unix. Every 8 seconds or so, the heartbeat timer increments a counter. But the heartbeat_timer
-	 * will not pop if we are are already in timer_handler. This is possible if the flush timer pops and we end up invoking
-	 * wcs_clean_dbsync->wcs_flu->wcs_phase2_commit_wait. But since the heartbeat timer cannot pop as long as
-	 * timer_in_handler is TRUE (which it will be until at least we exit this function), we cannot use the heartbeat scheme
-	 * and so fall back on rel_quants. If not, use wcs_sleep.
-	 * We have found that doing rel_quants (instead of sleeps) causes huge CPU usage in Tru64 even if the default spincnt is
-	 * set to 0 and ALL processes are only waiting for one process to finish its phase2 commit. Therefore we choose
-	 * the sleep approach for Tru64. Choosing a spincnt of 0 would choose the sleep approach (versus rel_quant).
-	 */
-#	if (defined(UNIX) && !defined(__osf__))
-	use_timer = (!process_exiting && csd->wcs_phase2_commit_wait_spincnt && (1 > timer_stack_count));
-#	else
-	use_timer = FALSE;
-#	endif
-	if (use_timer)
-	{
-		maxspincnt = csd->wcs_phase2_commit_wait_spincnt;
-		assert(maxspincnt);
-		if (!maxspincnt)
-			maxspincnt = WCS_PHASE2_COMMIT_DEFAULT_SPINCNT;
-		TIMEOUT_INIT(timedout, PHASE2_COMMIT_WAIT_MS DEBUG_ONLY(/ 2));
-	} else
-		DEBUG_ONLY(phase2_commit_half_wait = (PHASE2_COMMIT_WAIT >> 1));
+	DEBUG_ONLY(phase2_commit_half_wait = (PHASE2_COMMIT_WAIT / 2));
 	assert(dba_bg == csd->acc_meth);
 	if (dba_bg != csd->acc_meth)	/* in pro, be safe and return */
 		return TRUE;
@@ -156,59 +130,93 @@ 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;
 		cr_top = cr_lo + csd->n_bts;
 	}
-	/* Spin & sleep/yield alternately for the phase2 commit to complete */
-	for (spincnt = 0, lcnt = 0; ; spincnt++)
+	/* Check/Sleep alternately for the phase2 commit to complete */
+	lcnt_isprcalv_freq = PHASE2_COMMIT_WAIT / PROC_ALIVE_CHECK_FACTOR;
+	lcnt_isprcalv_next = lcnt_isprcalv_freq - 1;
+	for (lcnt = 0; ; )
 	{
 		SHM_READ_MEMORY_BARRIER; /* read memory barrier done to minimize time spent spinning waiting for value to change */
 		if (NULL == cr)
 		{
 			value = cnl->wcs_phase2_commit_pidcnt;
 			if (!value)
-			{
-				if (use_timer)
-					TIMEOUT_DONE(timedout);
 				return TRUE;
+			if (lcnt == lcnt_isprcalv_next)
+			{	/* Do "is_proc_alive" check. This section is very similar to the "NULL == cr" section
+				 * at the end of this module in terms of book-keeping array maintenance.
+				 */
+				crarray_index = 0;
+				for (curcr = cr_lo; curcr < cr_top;  curcr++)
+				{
+					blocking_pid = curcr->in_tend;
+					if (!blocking_pid || (blocking_pid == process_id))
+						continue;
+					/* If we do not hold crit, the existence of one dead pid is enough for us to know we
+					 * cannot return TRUE (because we are waiting for all phase2 commits to finish and one
+					 * dead pid means all commits will never complete on its own) so return FALSE right away
+					 * that way caller can invoke "wcs_recover" and try to fix the situation.
+					 * If we hold crit though, we cannot return FALSE right away in this situation. Only if
+					 * we examine all non-zero "cr->in_tend" entries and confirm all of them are dead can
+					 * we return FALSE. If at least one process is still alive, we have to wait for the
+					 * timeout period (1-minute or so) before returning FALSE.
+					 * We use "crarray" to hold the list of alive pids in the !was_crit case and to hold
+					 * the list of dead pids in the was_crit case.
+					 */
+					for (index = 0; index < crarray_index; ++index)
+						if (crarray[index].blocking_pid == blocking_pid)
+							break;
+					if (index == crarray_index)
+					{	/* cache-record with PID different from what we have seen till now */
+						is_alive = is_proc_alive(blocking_pid, 0);
+						if (!is_alive && !was_crit)
+							return FALSE;	/* Process is not alive. We can return
+									 * right away with failure.
+									 */
+						if (is_alive && was_crit)
+						{	/* We found one pid that is still alive and has phase2 commit in
+							 * progress. Stop the search of the cache-array to find if all
+							 * phase2 commit pids are dead. We will anyways have to continue
+							 * waiting (for this alive pid to finish its phase2 commit).
+							 */
+							break;
+						}
+						/* Process is alive (if "!was_crit") or dead (if "was_crit"). Add it to array to
+						 * avoid "is_proc_alive" check on other "cr"s which point to this same pid.
+						 */
+						assert(ARRAYSIZE(crarray) >= crarray_index);
+						if (ARRAYSIZE(crarray) > crarray_index)
+						{
+							crarray[crarray_index].blocking_pid = blocking_pid;
+							crarray[crarray_index].cr = curcr;
+							crarray_index++;
+						}
+					}
+				}
+				if (was_crit && crarray_index && (curcr == cr_top))
+				{	/* We hold crit and found at least one dead pid and found no alive pids in phase2 commit.
+					 * No need to wait any more. Return FALSE right away. Caller will invoke "wcs_recover"
+					 * to fix the situation.
+					 */
+					return FALSE;
+				}
+				lcnt_isprcalv_next += lcnt_isprcalv_freq;
 			}
 		} 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
-			 * at the cache-record, cr->in_tend is set to the same pid even though the block could have
-			 * been updated as part of multiple transactions. But we could have stopped the wait the moment the
-			 * same buffer gets updated for the next transaction (even if by the same pid). To recognize that
-			 * we note down the current db tn at the start of the wait and check if the block header tn
-			 * throughout the wait gets higher than this. If so, we return right away even though cr->in_tend
-			 * is non-zero. But since this comparison is done outside of crit it is possible that the block
-			 * header tn could be temporarily GREATER than the db tn because of concurrent updates AND because
-			 * an update to the 8-byte transaction number is not necessarily atomic AND because the block's tn
-			 * that we read could be a mish-mash of low-order and high-order bytes taken from BEFORE and AFTER
-			 * an update. Doing less than checks with these bad values is considered risky as a false return
-			 * means a GTMASSERT (BYPASSOK) in "t_end" or "tp_tend" in the PIN_CACHE_RECORD macro. Since this
-			 * situation is almost an impossibility in practice, we handle this by returning FALSE after timing
-			 * out and requiring the caller (t_qread) to restart. Eventually we will get crit (in the final retry)
-			 * where we are guaranteed not to end up in this situation.
-			 */
+		{
 			value = cr->in_tend;
 			if (value != start_in_tend)
 			{
-				if (use_timer)
-					TIMEOUT_DONE(timedout);
 				assert(!was_crit || !value);
 				return TRUE;
 			}
@@ -217,18 +225,15 @@ 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 (lcnt == lcnt_isprcalv_next)
+			{	/* Do "is_proc_alive" check */
+				if (!is_proc_alive(value, 0))
+					return FALSE;	/* Process is not alive. We can return right away with failure. */
+				lcnt_isprcalv_next += lcnt_isprcalv_freq;
+			}
 		}
-		if (use_timer)
-		{
-			if (spincnt < maxspincnt)
-				continue;
-			assert(spincnt == maxspincnt);
-		}
-		spincnt = 0;
 		lcnt++;
 		DEBUG_ONLY(waitarray[lcnt % waitarray_size] = value;)
 		if (NULL != cr)
@@ -237,40 +242,13 @@ boolean_t	wcs_phase2_commit_wait(sgmnt_addrs *csa, cache_rec_ptr_t cr)
 			{
 				BG_TRACE_PRO_ANY(csa, phase2_commit_wait_sleep_in_crit);
 			} else
-			{
 				BG_TRACE_PRO_ANY(csa, phase2_commit_wait_sleep_no_crit);
-			}
 		} else
-		{
 			BG_TRACE_PRO_ANY(csa, phase2_commit_wait_pidcnt);
-		}
-		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 (timedout)
-			{
-#				ifdef DEBUG
-				if(!half_time)
-				{
-					half_time = TRUE;
-					TIMEOUT_DONE(timedout);
-					TIMEOUT_INIT(timedout, PHASE2_COMMIT_WAIT_MS / 2);
-				}
-				else
-					break;
-#				else
-				break;
-#				endif
-			}
-			rel_quant();
-		} else
-		{
-			if (lcnt >= PHASE2_COMMIT_WAIT)
-				break;
-			DEBUG_ONLY(half_time = (phase2_commit_half_wait == lcnt));
-			wcs_sleep(PHASE2_COMMIT_SLEEP);
-		}
+		if (lcnt >= PHASE2_COMMIT_WAIT)
+			break;
+		DEBUG_ONLY(half_time = (phase2_commit_half_wait == lcnt));
+		wcs_sleep(lcnt);
 #		ifdef DEBUG
 		if (half_time)
 		{
@@ -289,15 +267,12 @@ 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
 		 * down one cache record for each representative PID. We don't expect the list of distinct PIDs to be large.
-		 * In any case, note down only as many as we can
+		 * In any case, note down only as many as we have space allocated.
 		 */
 		crarray_index = 0;
 		for (curcr = cr_lo; curcr < cr_top;  curcr++)
@@ -318,8 +293,8 @@ boolean_t	wcs_phase2_commit_wait(sgmnt_addrs *csa, cache_rec_ptr_t cr)
 						break;
 				if (index == crarray_index)
 				{	/* cache-record with distinct PID */
-					assert(crarray_size >= crarray_index);
-					if (crarray_size <= crarray_index)
+					assert(ARRAYSIZE(crarray) >= crarray_index);
+					if (ARRAYSIZE(crarray) <= crarray_index)
 						break;
 					crarray[crarray_index].blocking_pid = blocking_pid;
 					crarray[crarray_index].cr = curcr;
@@ -337,8 +312,8 @@ boolean_t	wcs_phase2_commit_wait(sgmnt_addrs *csa, cache_rec_ptr_t cr)
 			SEND_COMMITWAITPID_GET_STACK_IF_NEEDED(blocking_pid, stuck_cnt, curcr, csa);
 		}
 	} else
-	{	/* This is the case where we wait for a particular cache-record. Take the c-stack of the PID that is still
-		 * holding this cr
+	{	/* This is the case where we wait for a particular cache-record.
+		 * Take the c-stack of the PID that is still holding this cr.
 		 */
 		blocking_pid = cr->in_tend;
 		SEND_COMMITWAITPID_GET_STACK_IF_NEEDED(blocking_pid, stuck_cnt, cr, csa);
diff --git a/sr_port/wcs_recover.c b/sr_port/wcs_recover.c
index 48ea310..3d5833f 100644
--- a/sr_port/wcs_recover.c
+++ b/sr_port/wcs_recover.c
@@ -121,7 +121,7 @@ void wcs_recover(gd_region *reg)
 	inctn_opcode_t		save_inctn_opcode;
 	unsigned int		bplmap, lcnt, total_rip_wait;
 	sm_uc_ptr_t		buffptr;
-	blk_hdr_ptr_t		blk_ptr;
+	blk_hdr_ptr_t		blk_ptr, cr_buff, cr_alt_buff;
 	INTPTR_T		bp_lo, bp_top;
 	boolean_t		asyncio, twinning_on, wcs_wtfini_ret;
 	jnl_private_control	*jpc;
@@ -194,6 +194,18 @@ void wcs_recover(gd_region *reg)
 		 * decrementing cnl->wcs_phase2_commit_pidcnt). Anyways wcs_verify reports and clears this field so no problems.
 		 */
 	}
+	if (JNL_ENABLED(csd))
+	{
+		jpc = csa->jnl;
+		assert(NULL != jpc);
+		jbp = jpc->jnl_buff;
+		assert(NULL != jbp);
+		/* Since we have already done a "wcs_phase2_commit_wait" above, we do not need to do a
+		 * "jnl_phase2_commit_wait" call separately here. But we might need to do a "jnl_phase2_cleanup"
+		 * in case there are orphaned phase2 jnl writes still lying around. Take this opportunity to do that.
+		 */
+		jnl_phase2_cleanup(csa, jbp);
+	}
 	asyncio = csd->asyncio;
 	twinning_on = TWINNING_ON(csd);
 	wip_head = &csa->acc_meth.bg.cache_state->cacheq_wip;
@@ -237,17 +249,18 @@ void wcs_recover(gd_region *reg)
 	cr_hi = cr_lo + csd->n_bts;
 	blk_size = csd->blk_size;
 	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
-	 * to one less than the final db tn. This is done by decrementing the database current transaction number at the
-	 * start of the recovery and incrementing it at the end. To keep early_tn and curr_tn in sync, decrement early_tn as well.
+	/* After recovering the cache, we normally increment the db curr_tn. But this should not be done if
+	 * 	a) Caller is forward journal recovery, since we want the final database transaction number to match
+	 *		the journal file's eov_tn (to avoid JNLDBTNNOMATCH errors) OR
+	 *	b) TREF(donot_write_inctn_in_wcs_recover) is TRUE.
+	 * Therefore in this case, make sure all "tn" fields in the bt and cache are set to one less than the final db tn.
+	 * This is done by decrementing the database current transaction number at the start of the recovery and incrementing
+	 * it at the end. To keep early_tn and curr_tn in sync, decrement early_tn as well.
 	 */
-	if (!TREF(donot_write_inctn_in_wcs_recover) && mupip_jnl_recover && !JNL_ENABLED(csd))
+	if (TREF(donot_write_inctn_in_wcs_recover) || (mupip_jnl_recover && !JNL_ENABLED(csd)))
 	{
 		csd->trans_hist.curr_tn--;
-		csd->trans_hist.early_tn--;
-		assert(csd->trans_hist.early_tn == (csd->trans_hist.curr_tn + 1));
+		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;
 	}
@@ -335,8 +348,8 @@ void wcs_recover(gd_region *reg)
 			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;
+			if (cr->jnl_addr > jbp->rsrv_freeaddr)
+				cr->jnl_addr = jbp->rsrv_freeaddr;
 		} else
 			cr->jnl_addr = 0;	/* just be safe */
 		if (cr->data_invalid)
@@ -509,13 +522,17 @@ void wcs_recover(gd_region *reg)
 			} else
 			{	/* The bt already has an entry for the block */
 				cr_alt = (cache_rec_ptr_t)GDS_ANY_REL2ABS(csa, bt->cache_index);
+				cr_buff = ((blk_hdr_ptr_t)GDS_ANY_REL2ABS(csa, cr->buffaddr));
+				cr_alt_buff = ((blk_hdr_ptr_t)GDS_ANY_REL2ABS(csa, cr_alt->buffaddr));
 				assert((bt_rec_ptr_t)GDS_ANY_REL2ABS(csa, cr_alt->bt_index) == bt);
-				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);
+				if ((LATCH_CLEAR < WRITE_LATCH_VAL(cr_alt)) || (cr_buff->tn > cr_alt_buff->tn))
+				{	/* The previous cache record is WIP or not-WIP (possible if process in "wcs_wtstart" got
+					 * killed older twin write was issued), but the current cache record is the more
+					 * recent twin.
+					 */
 					cr_alt->bt_index = 0;
-					WRITE_LATCH_VAL(cr_alt) = LATCH_CONFLICT;
+					if (LATCH_CLEAR < WRITE_LATCH_VAL(cr_alt))
+						WRITE_LATCH_VAL(cr_alt) = LATCH_CONFLICT;
 					cr_alt->twin = GDS_ANY_ABS2REL(csa, cr);
 					cr->twin = GDS_ANY_ABS2REL(csa, cr_alt);
 					bt->cache_index = (int4)GDS_ANY_ABS2REL(csa, cr);
@@ -529,8 +546,6 @@ void wcs_recover(gd_region *reg)
 				{	/* 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));
 					cr->cycle++;	/* increment cycle whenever blk number changes (tp_hist depends on this) */
 					cr->blk = CR_BLKEMPTY;
@@ -632,38 +647,33 @@ void wcs_recover(gd_region *reg)
 	 * if called from mu_rndwn_file(), we have standalone access to shared memory so no need to increment db curr_tn
 	 * or write inctn (since no concurrent GT.M process is present in order to restart because of this curr_tn change)
 	 */
-	if (!TREF(donot_write_inctn_in_wcs_recover))
+	if (!TREF(donot_write_inctn_in_wcs_recover) && JNL_ENABLED(csd))
 	{
-		jpc = csa->jnl;
-		if (JNL_ENABLED(csd) && (NULL != jpc) && (NULL != jpc->jnl_buff))
+		assert(&FILE_INFO(jpc->region)->s_addrs == csa);
+		if (!jgbl.dont_reset_gbl_jrec_time)
 		{
-			assert(&FILE_INFO(jpc->region)->s_addrs == csa);
-			if (!jgbl.dont_reset_gbl_jrec_time)
-			{
-				SET_GBL_JREC_TIME; /* needed for jnl_ensure_open, jnl_put_jrt_pini and jnl_write_inctn_rec */
-			}
-			assert(jgbl.gbl_jrec_time);
-			jbp = jpc->jnl_buff;
-			/* 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 as that could write
-			 * journal records (if it decides to switch to a new journal file).
-			 */
-			ADJUST_GBL_JREC_TIME(jgbl, jbp);
-			jnl_status = jnl_ensure_open(reg, csa);
-			if (0 == jnl_status)
-			{
-				if (0 == jpc->pini_addr)
-					jnl_put_jrt_pini(csa);
-				save_inctn_opcode = inctn_opcode; /* in case caller does not expect inctn_opcode
-												to be changed here */
-				inctn_opcode = inctn_wcs_recover;
-				jnl_write_inctn_rec(csa);
-				inctn_opcode = save_inctn_opcode;
-			} else
-				jnl_file_lost(jpc, jnl_status);
+			SET_GBL_JREC_TIME; /* needed for jnl_ensure_open, jnl_write_pini and jnl_write_inctn_rec */
 		}
-		INCREMENT_CURR_TN(csd);
+		assert(jgbl.gbl_jrec_time);
+		/* 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 as that could write
+		 * journal records (if it decides to switch to a new journal file).
+		 */
+		ADJUST_GBL_JREC_TIME(jgbl, jbp);
+		jnl_status = jnl_ensure_open(reg, csa);
+		if (0 == jnl_status)
+		{
+			if (0 == jpc->pini_addr)
+				jnl_write_pini(csa);
+			save_inctn_opcode = inctn_opcode; /* in case caller does not expect inctn_opcode
+											to be changed here */
+			inctn_opcode = inctn_wcs_recover;
+			jnl_write_inctn_rec(csa);
+			inctn_opcode = save_inctn_opcode;
+		} else
+			jnl_file_lost(jpc, jnl_status);
 	}
+	INCREMENT_CURR_TN(csd);
 	csa->wbuf_dqd = 0;	/* reset this so the wcs_wtstart below will work */
 	SIGNAL_WRITERS_TO_RESUME(cnl);
 	in_wcs_recover = FALSE;
diff --git a/sr_port/wcs_verify.c b/sr_port/wcs_verify.c
old mode 100755
new mode 100644
index 442e82b..11827c9
--- a/sr_port/wcs_verify.c
+++ b/sr_port/wcs_verify.c
@@ -40,7 +40,8 @@
 #define FAKE_DIRTY		((trans_num)(-1))
 #define SEND_MSG_CSA(...)	send_msg_csa(CSA_ARG(csa) __VA_ARGS__)	/* to avoid formatting various send_msg calls */
 
-GBLREF 	uint4			process_id;
+GBLREF 	uint4		process_id;
+GBLREF sgmnt_addrs	*cs_addrs;
 
 error_def(ERR_DBADDRALIGN);
 error_def(ERR_DBADDRANGE);
@@ -69,12 +70,12 @@ boolean_t	wcs_verify(gd_region *reg, boolean_t expect_damage, boolean_t caller_i
         ssize_t			offset ;
         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		asyncio, ret;
+	sm_uc_ptr_t		bptmp, bp_bmp;
+	boolean_t		asyncio, do_cert_blk, ret;
 	sgmnt_addrs		*csa;
 	sgmnt_data_ptr_t	csd;
 	node_local_ptr_t	cnl;
-	cache_rec_ptr_t		cr, cr0, cr_tmp, cr_tmp2, cr_prev, cr_hi, cr_lo, cr_qbase;
+	cache_rec_ptr_t		cr, cr0, cr_bmp, 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,7 +86,10 @@ boolean_t	wcs_verify(gd_region *reg, boolean_t expect_damage, boolean_t caller_i
 	boolean_t		(*blkque_array)[] = NULL; /* TRUE indicates we saw the cr or bt of that array index */
 	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;
+	int4			bml_status, in_wtstart, intent_wtstart, wcs_phase2_commit_pidcnt;
+	block_id		curbmp;
+	jnl_private_control	*jpc;
+	jnl_buffer_ptr_t	jbp;
 #	ifdef DEBUG
 	mval			rand_lru;
 #	endif
@@ -201,22 +205,25 @@ boolean_t	wcs_verify(gd_region *reg, boolean_t expect_damage, boolean_t caller_i
 	}
 	if (JNL_ALLOWED(csd))
 	{
-		if (NULL == csa->jnl)
+		jpc = csa->jnl;
+		jbp = NULL;
+		if (NULL == jpc)
 			SEND_MSG_CSA(VARLSTCNT(8) ERR_DBFHEADERRANY, 6, DB_LEN_STR(reg),
 				RTS_ERROR_TEXT("csa->jnl"), csa->jnl, (UINTPTR_T)-1);
-		else if (NULL == csa->jnl->jnl_buff)
+		else if (NULL == (jbp = jpc->jnl_buff))
 			SEND_MSG_CSA(VARLSTCNT(8) ERR_DBFHEADERRANY, 6, DB_LEN_STR(reg),
-					RTS_ERROR_TEXT("csa->jnl->jnl_buff"), csa->jnl->jnl_buff, (UINTPTR_T)-1);
+					RTS_ERROR_TEXT("csa->jnl->jnl_buff"), jbp, (UINTPTR_T)-1);
 		else
 		{
 			jnl_buff_expected = ((sm_uc_ptr_t)(cnl) + NODE_LOCAL_SPACE(csd) + JNL_NAME_EXP_SIZE);
-			if (csa->jnl->jnl_buff != (jnl_buffer_ptr_t)jnl_buff_expected)
+			if (jbp != (jnl_buffer_ptr_t)jnl_buff_expected)
 			{
 				assert(expect_damage);
 				ret = FALSE;
 				SEND_MSG_CSA(VARLSTCNT(8) ERR_DBFHEADERRANY, 6, DB_LEN_STR(reg),
-					RTS_ERROR_TEXT("csa->jnl->jnl_buff_expected"), csa->jnl->jnl_buff, jnl_buff_expected);
-				csa->jnl->jnl_buff = (jnl_buffer_ptr_t)jnl_buff_expected;
+					RTS_ERROR_TEXT("csa->jnl->jnl_buff_expected"), jbp, jnl_buff_expected);
+				jbp = (jnl_buffer_ptr_t)jnl_buff_expected;
+				jpc->jnl_buff = jbp;
 			}
 		}
 	}
@@ -264,17 +271,17 @@ boolean_t	wcs_verify(gd_region *reg, boolean_t expect_damage, boolean_t caller_i
 					in_wtstart, 0);
 				assert(expect_damage);
 				cnl->in_wtstart = 0;
-				csa->in_wtstart = FALSE; /* To allow wcs_wtstart() after wcs_recover() */
+				csa->in_wtstart = FALSE; /* To allow "wcs_wtstart" after "wcs_recover" */
 			}
 			intent_wtstart = cnl->intent_wtstart;
 			if (0 != intent_wtstart)
 			{	/* Two situations are possible.
-				 *	a) A wcs_wtstart() call is concurrently in progress and that the process has just now
+				 *	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 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.
+				 *	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.
 				 *	Since the writer uses the DECR_INTENT_WTSTART macro which does not do DECR_CNTs if the value
 				 *	is already 0, it is okay to do the decrement even in case (a). There is a very small window
 				 *	that still exists. If the DECR_INTENT_WTSTART macro did the > 0 check when the field was
@@ -644,25 +651,58 @@ boolean_t	wcs_verify(gd_region *reg, boolean_t expect_damage, boolean_t caller_i
 					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);
 				}
-			} else if ((-1 == cr->read_in_progress) && !caller_is_wcs_recover && (CR_BLKEMPTY != cr->blk)
-				&& !cr->data_invalid
-				&& (!IS_BITMAP_BLK(cr->blk) || (0 == cr->twin) || (0 != cr->bt_index)))
+			} else if ((-1 == cr->read_in_progress) && !caller_is_wcs_recover
+						&& (CR_BLKEMPTY != cr->blk) && !cr->data_invalid)
 			{	/* 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().
-				 * 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
-				 * wcs_recover() call is that wcs_recover() is supposed to check the integrity of the data
+				 * to a valid non-empty block, check the content of cr->buffaddr through a "cert_blk".
+				 * The reason why the "cert_blk" is done only from a DSE CACHE -VERIFY call and not from a
+				 * "wcs_recover" call is that "wcs_recover" is supposed to check the integrity of the data
 				 * structures in the cache and not the integrity of the data (global buffers) in the cache. If the
-				 * database has an integrity error, a global buffer will fail cert_blk() but the cache structures
-				 * as such are not damaged. wcs_recover() should not return failure in that case.
+				 * database has an integrity error, a global buffer will fail "cert_blk" but the cache structures
+				 * as such are not damaged. "wcs_recover" should not return failure in that case.
+				 */
+				/* Use "bp" to derive the buffer as cr->buffaddr might have been detected as corrupt
+				 * by the buffaddr checks above.
 				 */
 				bptmp = (sm_uc_ptr_t)GDS_ANY_REL2ABS(csa, bp);
-				if (!cert_blk(reg, cr->blk, (blk_hdr_ptr_t)bptmp, 0, FALSE, NULL))
+				if (!IS_BITMAP_BLK(cr->blk))
+				{	/* Note that it is possible a FREE/REUSABLE block was brought from disk in to the cache
+					 * by "t_qread" due to restartable circumstances (e.g. a process read the wrong child
+					 * block # while traversing an index block). In that case, this block would have a header
+					 * of all 0's and "cert_blk" would issue a DBBSIZMN error. So skip the "cert_blk".
+					 * We check the FREE status by examining the bitmap block if it is in the cache already.
+					 * If not, we examine the block-header for all 0's and if so assume it is a FREE block.
+					 */
+					curbmp = ROUND_DOWN2(cr->blk, BLKS_PER_LMAP);
+					cs_addrs = csa;		/* needed by "db_csh_get" so temporarily set global variable */
+					cr_bmp = db_csh_get(curbmp);
+					csa = cs_addrs;		/* undo temporary global variable set */
+					if (((cache_rec_ptr_t)CR_NOTVALID != cr_bmp) && (NULL != cr_bmp))
+					{
+						bp_bmp = (sm_uc_ptr_t)GDS_ANY_REL2ABS(csa, cr_bmp->buffaddr);
+						GET_BM_STATUS(bp_bmp, (cr->blk - curbmp), bml_status);
+						do_cert_blk = (BLK_BUSY == bml_status);
+					} else
+					{	/* We do the all 0's check by checking TWO 8-byte values in the 16-byte blk header.
+						 * The asserts below ensure we adjust the below code if/ever the block header
+						 * size changes.
+						 */
+						assert(16 == SIZEOF(blk_hdr));
+						assert(8 == SIZEOF(tmp_8byte));
+						tmp_8byte = ((trans_num *)bptmp)[0];
+						if (!tmp_8byte)
+							tmp_8byte = ((trans_num *)bptmp)[1];
+						do_cert_blk = (0 != tmp_8byte);
+					}
+				} else
+				{	/* If it is a bitmap block, we could have twins so do check only on newtest twin as
+					 * older twin could have an incorrect master-bitmap full/free status (DBBMMSTR error).
+					 */
+					do_cert_blk = ((0 == cr->twin) || (0 != cr->bt_index));
+				}
+				if (do_cert_blk && !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"),
@@ -670,6 +710,7 @@ boolean_t	wcs_verify(gd_region *reg, boolean_t expect_damage, boolean_t caller_i
 					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);
+					assert(expect_damage);
 				}
 			}
 			if (0 != cr->in_cw_set)
@@ -679,17 +720,15 @@ boolean_t	wcs_verify(gd_region *reg, boolean_t expect_damage, boolean_t caller_i
 				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);
 			}
-			assert(!JNL_ALLOWED(csd) || (NULL != csa->jnl) && (NULL != csa->jnl->jnl_buff));
+			assert(!JNL_ALLOWED(csd) || (NULL != jpc) && (NULL != jbp));
 			if (JNL_ENABLED(csd))
 			{
-				if ((NULL != csa->jnl) && (NULL != csa->jnl->jnl_buff)
-					&& (0 != cr->dirty) && (cr->jnl_addr > csa->jnl->jnl_buff->freeaddr))
+				if ((0 != cr->dirty) && (cr->jnl_addr > jbp->rsrv_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, jbp->rsrv_freeaddr);
 				}
 			} else if (!JNL_ALLOWED(csd) && (cr->jnl_addr != 0))
 			{
@@ -823,7 +862,7 @@ boolean_t	wcs_verify(gd_region *reg, boolean_t expect_damage, boolean_t caller_i
 					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);
 					if (caller_is_wcs_recover && !cr->stopped)
-					{	/* if cr->stopped is TRUE, then the buffer was created by secshr_db_clnup(),
+					{	/* 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
 						 * the hash value and consider cr->blk to be invalid and hence make this buffer
 						 * empty
@@ -840,10 +879,10 @@ boolean_t	wcs_verify(gd_region *reg, boolean_t expect_damage, boolean_t caller_i
 						 * better to copy this buffer into another area in shared-memory dedicated to
 						 * holding such information so a later DSE session can then dump the information.
 						 *
-						 * Ideally, it should be wcs_recover() that fixes the cache-record, but then the
+						 * Ideally, it should be "wcs_recover" that fixes the cache-record, but then the
 						 * blk_que traversing logic has to be redone there in order to determine this
 						 * disparity in the hash value. To avoid that we reset cr->blk here itself but
-						 * do it only if called from wcs_recover().
+						 * do it only if called from "wcs_recover".
 						 */
 						assert(expect_damage);
 						cr->blk = CR_BLKEMPTY;
diff --git a/sr_port/zco_init.c b/sr_port/zco_init.c
index fef9a0f..b544b1c 100755
--- a/sr_port/zco_init.c
+++ b/sr_port/zco_init.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	*
@@ -31,24 +32,22 @@ void zco_init(void)
 	SETUP_THREADGBL_ACCESS;
 	if ((TREF(dollar_zcompile)).addr)
 		free((TREF(dollar_zcompile)).addr);
+	(TREF(dollar_zcompile)).len = 0; /* default */
 	val.addr = ZCOMPILE;
 	val.len = SIZEOF(ZCOMPILE) - 1;
 	status = TRANS_LOG_NAME(&val, &tn, buf1, SIZEOF(buf1), dont_sendmsg_on_log2long);
-	if ((SS_NORMAL != status) && (SS_NOLOGNAM != status))
+	if (SS_NORMAL != status)
 	{
-#		ifdef UNIX
-		if (SS_LOG2LONG == status)
-			rts_error(VARLSTCNT(5) ERR_LOGTOOLONG, 3, val.len, val.addr, SIZEOF(buf1) - 1);
+		if (SS_NOLOGNAM == status)
+			return;
+		else if (SS_LOG2LONG == status)
+			rts_error_csa(CSA_ARG(NULL) VARLSTCNT(5) ERR_LOGTOOLONG, 3, val.len, val.addr, SIZEOF(buf1) - 1);
 		else
-#		endif
-			rts_error(VARLSTCNT(1) status);
-	}
-	if (status == SS_NOLOGNAM)
-		(TREF(dollar_zcompile)).len = 0;
-	else
-	{
-		(TREF(dollar_zcompile)).len = tn.len;
-		(TREF(dollar_zcompile)).addr = (char *) malloc (tn.len);
-		memcpy ((TREF(dollar_zcompile)).addr, buf1, tn.len);
+			rts_error_csa(CSA_ARG(NULL) VARLSTCNT(1) status);
 	}
+	if (0 == tn.len)
+		return;
+	(TREF(dollar_zcompile)).len = tn.len;
+	(TREF(dollar_zcompile)).addr = (char *) malloc (tn.len);
+	memcpy ((TREF(dollar_zcompile)).addr, buf1, tn.len);
 }
diff --git a/sr_port/zdate_form_init.c b/sr_port/zdate_form_init.c
index c3ae326..03d53f5 100755
--- a/sr_port/zdate_form_init.c
+++ b/sr_port/zdate_form_init.c
@@ -1,6 +1,7 @@
 /****************************************************************
  *								*
- *	Copyright 2002, 2010 Fidelity Information Services, Inc	*
+ * Copyright (c) 2002-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	*
@@ -35,17 +36,19 @@ void zdate_form_init(struct startup_vector *svec)
 	SETUP_THREADGBL_ACCESS;
 	val.addr = ZDATE_FORM;
 	val.len = STR_LIT_LEN(ZDATE_FORM);
-	if (SS_NORMAL == (status = TRANS_LOG_NAME(&val, &tn, buf, SIZEOF(buf), dont_sendmsg_on_log2long)))
+	TREF(zdate_form) = svec->zdate_form; /* default */
+	if (SS_NORMAL != (status = TRANS_LOG_NAME(&val, &tn, buf, SIZEOF(buf), dont_sendmsg_on_log2long)))
 	{
-		assert(tn.len < SIZEOF(buf));
-		buf[tn.len] = '\0';
-		TREF(zdate_form) = (int4)(STRTOL(buf, NULL, 10));
-	} else if (SS_NOLOGNAM == status)
-		TREF(zdate_form) = svec->zdate_form;
-#	ifdef UNIX
-	else if (SS_LOG2LONG == status)
-		rts_error(VARLSTCNT(5) ERR_LOGTOOLONG, 3, val.len, val.addr, SIZEOF(buf) - 1);
-#	endif
-	else
-		rts_error(VARLSTCNT(5) ERR_TRNLOGFAIL, 2, LEN_AND_LIT(ZDATE_FORM), status);
+		if (SS_NOLOGNAM == status)
+			return;
+		else if (SS_LOG2LONG == status)
+			rts_error_csa(CSA_ARG(NULL) VARLSTCNT(5) ERR_LOGTOOLONG, 3, val.len, val.addr, SIZEOF(buf) - 1);
+		else
+			rts_error_csa(CSA_ARG(NULL) VARLSTCNT(5) ERR_TRNLOGFAIL, 2, LEN_AND_LIT(ZDATE_FORM), status);
+	}
+	if (0 == tn.len)
+		return;
+	assert(tn.len < SIZEOF(buf));
+	buf[tn.len] = '\0';
+	TREF(zdate_form) = (int4)(STRTOL(buf, NULL, 10));
 }
diff --git a/sr_port/zr_unlink_rtn.c b/sr_port/zr_unlink_rtn.c
index bf75f7c..6c7e5c7 100644
--- a/sr_port/zr_unlink_rtn.c
+++ b/sr_port/zr_unlink_rtn.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	*
@@ -83,7 +83,7 @@ void zr_unlink_rtn(rhdtyp *old_rhead, boolean_t free_all)
 			 */
 			zlmov_lnames(old_rhead); 	/* Copy the label names from literal pool to malloc'd area */
 #		ifdef AUTORELINK_SUPPORTED
-		if (old_rhead->shared_object)
+		if (TRUE == old_rhead->shared_object)
 			rtnobj_shm_free(old_rhead, LATCH_GRABBED_FALSE); /* Object is shared via rtnobj shared memory */
 		else
 #		endif
@@ -103,7 +103,7 @@ void zr_unlink_rtn(rhdtyp *old_rhead, boolean_t free_all)
 	free(old_rhead->linkage_adr);		/* Release the old linkage section */
 	old_rhead->linkage_adr = NULL;
 #	ifdef AUTORELINK_SUPPORTED
-	if (old_rhead->shared_object)		/* If this is a shared object (not shared library), release rtn name/path text */
+	if (TRUE == old_rhead->shared_object)	/* If this is a shared object (not shared library), release rtn name/path text */
 	{	/* After freeing, these names should be reset by incr_link() but in case not - set them to NULL */
 		free(old_rhead->src_full_name.addr);
 		old_rhead->src_full_name.addr = old_rhead->routine_name.addr = NULL;
diff --git a/sr_port/zro_init.c b/sr_port/zro_init.c
index eb82b01..3cc4609 100755
--- a/sr_port/zro_init.c
+++ b/sr_port/zro_init.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	*
@@ -38,20 +39,19 @@ void zro_init(void)
 	status = TRANS_LOG_NAME(&val, &tn, buf1, SIZEOF(buf1), dont_sendmsg_on_log2long);
 	if ((SS_NORMAL != status) && (SS_NOLOGNAM != status))
 	{
-#		ifdef UNIX
 		if (SS_LOG2LONG == status)
 			rts_error_csa(CSA_ARG(NULL) VARLSTCNT(5) ERR_LOGTOOLONG, 3, val.len, val.addr, SIZEOF(buf1) - 1);
 		else
-#		endif
 			rts_error_csa(CSA_ARG(NULL) VARLSTCNT(1) status);
 	}
-	if (status == SS_NOLOGNAM)
-		(TREF(dollar_zroutines)).len = 0;
-	else
+	if ((0 == tn.len) || (SS_NOLOGNAM == status))
 	{
-		(TREF(dollar_zroutines)).len = tn.len;
-		(TREF(dollar_zroutines)).addr = (char *)malloc (tn.len);
-		memcpy ((TREF(dollar_zroutines)).addr, buf1, tn.len);
+		tn.len = 1;
+		tn.addr = buf1;
+		buf1[0] = '.';
 	}
+	(TREF(dollar_zroutines)).len = tn.len;
+	(TREF(dollar_zroutines)).addr = (char *)malloc (tn.len);
+	memcpy ((TREF(dollar_zroutines)).addr, buf1, tn.len);
 	zro_load(TADR(dollar_zroutines));
 }
diff --git a/sr_port/ztrap_form_init.c b/sr_port/ztrap_form_init.c
index e838a4f..6a23317 100755
--- a/sr_port/ztrap_form_init.c
+++ b/sr_port/ztrap_form_init.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,28 +41,28 @@ void ztrap_form_init(void)
 	ztrap_form = ZTRAP_CODE;	/* default */
 	val.addr = ZTRAP_FORM;
 	val.len = STR_LIT_LEN(ZTRAP_FORM);
-	if (SS_NORMAL == (status = TRANS_LOG_NAME(&val, &tn, buf, SIZEOF(buf), dont_sendmsg_on_log2long)))
+	if (SS_NORMAL != (status = TRANS_LOG_NAME(&val, &tn, buf, SIZEOF(buf), dont_sendmsg_on_log2long)))
 	{
-		if (STR_LIT_LEN(ZTRAP_FORM_POP) < tn.len && !STRNCASECMP(buf_ptr, ZTRAP_FORM_POP, STR_LIT_LEN(ZTRAP_FORM_POP)))
-		{
-			buf_ptr += STR_LIT_LEN(ZTRAP_FORM_POP);
-			tn.len -= STR_LIT_LEN(ZTRAP_FORM_POP);
-			ztrap_form |= ZTRAP_POP;
-		}
-		if (!STRNCASECMP(buf_ptr, ZTRAP_FORM_ENTRYREF, MIN(STR_LIT_LEN(ZTRAP_FORM_ENTRYREF), tn.len)))
-		{
-			ztrap_form |= ZTRAP_ENTRYREF;
-			ztrap_form &= ~ZTRAP_CODE;
-		} else if (!STRNCASECMP(buf_ptr, ZTRAP_FORM_ADAPTIVE, MIN(STR_LIT_LEN(ZTRAP_FORM_ADAPTIVE), tn.len)))
-			ztrap_form |= ZTRAP_ENTRYREF;
-	} else if (SS_NOLOGNAM != status)
-	{
-#		ifdef UNIX
-		if (SS_LOG2LONG == status)
-			rts_error(VARLSTCNT(5) ERR_LOGTOOLONG, 3, val.len, val.addr, SIZEOF(buf) - 1);
+		if (SS_NOLOGNAM == status)
+			return;
+		else if (SS_LOG2LONG == status)
+			rts_error_csa(CSA_ARG(NULL) VARLSTCNT(5) ERR_LOGTOOLONG, 3, val.len, val.addr, SIZEOF(buf) - 1);
 		else
-#		endif
-			rts_error(VARLSTCNT(5) ERR_TRNLOGFAIL, 2, LEN_AND_LIT(ZTRAP_FORM), status);
+			rts_error_csa(CSA_ARG(NULL) VARLSTCNT(5) ERR_TRNLOGFAIL, 2, LEN_AND_LIT(ZTRAP_FORM), status);
+	}
+	if ((STR_LIT_LEN(ZTRAP_FORM_POP) < tn.len) && !STRNCASECMP(buf_ptr, ZTRAP_FORM_POP, STR_LIT_LEN(ZTRAP_FORM_POP)))
+	{	/* "pop" can be a prefix to both entryref and adaptive */
+		buf_ptr += STR_LIT_LEN(ZTRAP_FORM_POP);
+		tn.len -= STR_LIT_LEN(ZTRAP_FORM_POP);
+		ztrap_form |= ZTRAP_POP;
 	}
+	if ((STR_LIT_LEN(ZTRAP_FORM_ENTRYREF) == tn.len)
+			&& !STRNCASECMP(buf_ptr, ZTRAP_FORM_ENTRYREF, MIN(STR_LIT_LEN(ZTRAP_FORM_ENTRYREF), tn.len)))
+	{
+		ztrap_form |= ZTRAP_ENTRYREF;
+		ztrap_form &= ~ZTRAP_CODE;
+	} else if ((STR_LIT_LEN(ZTRAP_FORM_ADAPTIVE) == tn.len)
+			&& !STRNCASECMP(buf_ptr, ZTRAP_FORM_ADAPTIVE, MIN(STR_LIT_LEN(ZTRAP_FORM_ADAPTIVE), tn.len)))
+		ztrap_form |= ZTRAP_ENTRYREF;
 	return;
 }
diff --git a/sr_port/zyerror_init.c b/sr_port/zyerror_init.c
index 399b392..6913aca 100755
--- a/sr_port/zyerror_init.c
+++ b/sr_port/zyerror_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,30 +20,32 @@
 
 GBLREF	mval	dollar_zyerror;
 
+error_def(ERR_LOGTOOLONG);
+error_def(ERR_TRNLOGFAIL);
+
 void zyerror_init(void)
 {
 	int4		status;
 	mstr		val, tn;
 	char		buf[1024];
 
-	error_def(ERR_LOGTOOLONG);
-	error_def(ERR_TRNLOGFAIL);
-
 	val.addr = ZYERROR;
 	val.len = SIZEOF(ZYERROR) - 1;
-	if (SS_NORMAL == (status = TRANS_LOG_NAME(&val, &tn, buf, SIZEOF(buf), dont_sendmsg_on_log2long)))
+	dollar_zyerror.str.len = 0; /* default */
+	if (SS_NORMAL != (status = TRANS_LOG_NAME(&val, &tn, buf, SIZEOF(buf), dont_sendmsg_on_log2long)))
 	{
-		dollar_zyerror.mvtype = MV_STR;
-		dollar_zyerror.str.len = tn.len;
-		dollar_zyerror.str.addr = buf;
-		s2pool(&dollar_zyerror.str);
-	} else if (SS_NOLOGNAM == status)
-		dollar_zyerror.str.len = 0;
-#	ifdef UNIX
-	else if (SS_LOG2LONG == status)
-		rts_error(VARLSTCNT(5) ERR_LOGTOOLONG, 3, val.len, val.addr, SIZEOF(buf) - 1);
-#	endif
-	else
-		rts_error(VARLSTCNT(5) ERR_TRNLOGFAIL, 2, LEN_AND_LIT(ZYERROR), status);
+		if (SS_NOLOGNAM == status)
+			return;
+		else if (SS_LOG2LONG == status)
+			rts_error_csa(CSA_ARG(NULL) VARLSTCNT(5) ERR_LOGTOOLONG, 3, val.len, val.addr, SIZEOF(buf) - 1);
+		else
+			rts_error_csa(CSA_ARG(NULL) VARLSTCNT(5) ERR_TRNLOGFAIL, 2, LEN_AND_LIT(ZYERROR), status);
+	}
+	if (0 == tn.len)
+		return;
+	dollar_zyerror.mvtype = MV_STR;
+	dollar_zyerror.str.len = tn.len;
+	dollar_zyerror.str.addr = buf;
+	s2pool(&dollar_zyerror.str);
 	return;
 }
diff --git a/sr_port_cm/gtcmd_rundown.c b/sr_port_cm/gtcmd_rundown.c
index bdede34..91d984a 100644
--- a/sr_port_cm/gtcmd_rundown.c
+++ b/sr_port_cm/gtcmd_rundown.c
@@ -66,7 +66,7 @@ void gtcmd_rundown(connection_struct *cnx, bool clean_exit)
 			if (JNL_ENABLED(cs_data))
 			{
 				jpc->pini_addr = ptr->pini_addr;
-				SET_GBL_JREC_TIME; /* jnl_ensure_open/jnl_put_jrt_pfin needs this to be set */
+				SET_GBL_JREC_TIME; /* jnl_ensure_open/jnl_write_pfin needs this to be set */
 				jbp = jpc->jnl_buff;
 				/* 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 as that could write
@@ -77,7 +77,7 @@ void gtcmd_rundown(connection_struct *cnx, bool clean_exit)
 				if (0 == jnl_status)
 				{
 					if (0 != jpc->pini_addr)
-						jnl_put_jrt_pfin(cs_addrs);
+						jnl_write_pfin(cs_addrs);
 				} else
 					send_msg_csa(CSA_ARG(cs_addrs) VARLSTCNT(6) jnl_status, 4,
 							JNL_LEN_STR(cs_data), DB_LEN_STR(gv_cur_region));
@@ -86,7 +86,7 @@ void gtcmd_rundown(connection_struct *cnx, bool clean_exit)
 				rel_crit(gv_cur_region);
 		}
 		refcnt = --region->refcnt;
-		/* Dont know how refcnt can become negative but in pro handle it by bypassing this region. The reason is the
+		/* Don't know how refcnt can become negative but in pro handle it by bypassing this region. The reason is the
 		 * following. refcnt should have originally been a positive value. Every time this function is invoked, it would
 		 * be decremented by one. There should have been one invocation that saw refcnt to be zero. That would have
 		 * done the rundown of the region or if it is still in the stack the rundown is still in progress. Therefore
diff --git a/sr_port_cm/gtcmtr_increment.c b/sr_port_cm/gtcmtr_increment.c
old mode 100755
new mode 100644
index 57ec8ea..bf6ba4a
--- a/sr_port_cm/gtcmtr_increment.c
+++ b/sr_port_cm/gtcmtr_increment.c
@@ -1,6 +1,7 @@
 /****************************************************************
  *								*
- *	Copyright 2004, 2009 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	*
@@ -37,6 +38,10 @@ GBLREF	gv_key			*gv_currkey;
 GBLREF	connection_struct	*curr_entry;
 GBLREF	jnl_process_vector	*originator_prc_vec;
 
+error_def(ERR_KEY2BIG);
+error_def(ERR_GVIS);
+error_def(ERR_DBPRIVERR);
+
 bool	gtcmtr_increment(void)
 {
 	cm_region_list	*reg_ref;
@@ -47,10 +52,6 @@ bool	gtcmtr_increment(void)
 	unsigned short	top, len, temp_short;
 	static readonly	gds_file_id file;
 
-	error_def(ERR_KEY2BIG);
-	error_def(ERR_GVIS);
-	error_def(ERR_DBPRIVERR);
-
 	ptr = curr_entry->clb_ptr->mbf;
 	assert(*ptr == CMMS_Q_INCREMENT);
 	ptr++;
@@ -62,7 +63,7 @@ bool	gtcmtr_increment(void)
 	CM_GET_GVCURRKEY(ptr, len);
 	gtcm_bind_name(reg_ref->reghead, TRUE);
 	if (gv_cur_region->read_only)
-		rts_error(VARLSTCNT(4) ERR_DBPRIVERR, 2, DB_LEN_STR(gv_cur_region));
+		rts_error_csa(CSA_ARG(cs_addrs) VARLSTCNT(4) ERR_DBPRIVERR, 2, DB_LEN_STR(gv_cur_region));
 	if (JNL_ALLOWED(cs_addrs))
 	{	/* we need to copy client's specific prc_vec into the global variable in order that the gvcst* routines
 		 *	do the right job. actually we need to do this only if JNL_ENABLED(cs_addrs), but since it is not
@@ -71,7 +72,7 @@ bool	gtcmtr_increment(void)
 		 *	if JNL_ALLOWED(cs_addrs) is TRUE instead of checking for JNL_ENABLED(cs_addrs) to be TRUE.
 		 * this approach has the overhead that we will be doing the following assignments even though JNL_ENABLED
 		 * 	might not be TRUE but since the following two are just pointer copies, it is not considered a big overhead.
-		 * this approach ensures that the jnl_put_jrt_pini gets the appropriate prc_vec for writing into the
+		 * this approach ensures that the jnl_write_pini gets the appropriate prc_vec for writing into the
 		 * 	journal record in case JNL_ENABLED turns out to be TRUE in t_end time.
 		 * note that the value of JNL_ALLOWED(cs_addrs) cannot be changed on the fly without obtaining standalone access
 		 * 	and hence the correctness of prc_vec (whenever it turns out necessary) is guaranteed.
@@ -88,7 +89,7 @@ bool	gtcmtr_increment(void)
 	{
 		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(11) ERR_KEY2BIG, 4, n, (int4)gv_cur_region->max_key_size,
+		rts_error_csa(CSA_ARG(cs_addrs) VARLSTCNT(11) ERR_KEY2BIG, 4, n, (int4)gv_cur_region->max_key_size,
 			REG_LEN_STR(gv_cur_region), 0, ERR_GVIS, 2, end - buff, buff);
 	}
 	MV_FORCE_NUMD(&incr_delta);
diff --git a/sr_port_cm/gtcmtr_kill.c b/sr_port_cm/gtcmtr_kill.c
old mode 100755
new mode 100644
index ead0cd8..68f05e8
--- a/sr_port_cm/gtcmtr_kill.c
+++ b/sr_port_cm/gtcmtr_kill.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	*
@@ -36,6 +37,8 @@ GBLREF gv_namehead	*gv_target;
 GBLREF gv_key 		*gv_currkey;
 GBLREF jnl_process_vector *originator_prc_vec;
 
+error_def(ERR_DBPRIVERR);
+
 bool gtcmtr_kill(void)
 {
 	cm_region_list	*reg_ref;
@@ -43,8 +46,6 @@ bool gtcmtr_kill(void)
 	unsigned short	len;
 	static readonly	gds_file_id file;
 
-	error_def(ERR_DBPRIVERR);
-
 	ptr = curr_entry->clb_ptr->mbf;
 	assert(*ptr == CMMS_Q_KILL);
 	ptr++;
@@ -56,7 +57,7 @@ bool gtcmtr_kill(void)
 	CM_GET_GVCURRKEY(ptr, len);
 	gtcm_bind_name(reg_ref->reghead, TRUE);
 	if (gv_cur_region->read_only)
-		rts_error(VARLSTCNT(4) ERR_DBPRIVERR, 2, DB_LEN_STR(gv_cur_region));
+		rts_error_csa(CSA_ARG(cs_addrs) VARLSTCNT(4) ERR_DBPRIVERR, 2, DB_LEN_STR(gv_cur_region));
 	if (JNL_ALLOWED(cs_addrs))
 	{	/* we need to copy client's specific prc_vec into the global variable in order that the gvcst* routines
 		 *	do the right job. actually we need to do this only if JNL_ENABLED(cs_addrs), but since it is not
@@ -65,7 +66,7 @@ bool gtcmtr_kill(void)
 		 *	if JNL_ALLOWED(cs_addrs) is TRUE instead of checking for JNL_ENABLED(cs_addrs) to be TRUE.
 		 * this approach has the overhead that we will be doing the following assignments even though JNL_ENABLED
 		 * 	might not be TRUE but since the following two are just pointer copies, it is not considered a big overhead.
-		 * this approach ensures that the jnl_put_jrt_pini gets the appropriate prc_vec for writing into the
+		 * this approach ensures that the jnl_write_pini gets the appropriate prc_vec for writing into the
 		 * 	journal record in case JNL_ENABLED turns out to be TRUE in t_end time.
 		 * note that the value of JNL_ALLOWED(cs_addrs) cannot be changed on the fly without obtaining standalone access
 		 * 	and hence the correctness of prc_vec (whenever it turns out necessary) is guaranteed.
diff --git a/sr_port_cm/gtcmtr_put.c b/sr_port_cm/gtcmtr_put.c
old mode 100755
new mode 100644
index ee32e1b..ec78334
--- a/sr_port_cm/gtcmtr_put.c
+++ b/sr_port_cm/gtcmtr_put.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	*
@@ -36,6 +37,11 @@ GBLREF gv_key		*gv_currkey;
 GBLREF connection_struct *curr_entry;
 GBLREF jnl_process_vector *originator_prc_vec;
 
+error_def(ERR_KEY2BIG);
+error_def(ERR_REC2BIG);
+error_def(ERR_GVIS);
+error_def(ERR_DBPRIVERR);
+
 bool gtcmtr_put(void)
 {
 	cm_region_list	*reg_ref;
@@ -46,11 +52,6 @@ bool gtcmtr_put(void)
 	unsigned short	top, len;
 	static readonly gds_file_id file;
 
-	error_def(ERR_KEY2BIG);
-	error_def(ERR_REC2BIG);
-	error_def(ERR_GVIS);
-	error_def(ERR_DBPRIVERR);
-
 	ptr = curr_entry->clb_ptr->mbf;
 	assert(*ptr == CMMS_Q_PUT);
 	ptr++;
@@ -62,7 +63,7 @@ bool gtcmtr_put(void)
 	CM_GET_GVCURRKEY(ptr, len);
 	gtcm_bind_name(reg_ref->reghead, TRUE);
 	if (gv_cur_region->read_only)
-		rts_error(VARLSTCNT(4) ERR_DBPRIVERR, 2, DB_LEN_STR(gv_cur_region));
+		rts_error_csa(CSA_ARG(cs_addrs) VARLSTCNT(4) ERR_DBPRIVERR, 2, DB_LEN_STR(gv_cur_region));
 	if (JNL_ALLOWED(cs_addrs))
 	{	/* we need to copy client's specific prc_vec into the global variable in order that the gvcst* routines
 		 *	do the right job. actually we need to do this only if JNL_ENABLED(cs_addrs), but since it is not
@@ -71,7 +72,7 @@ bool gtcmtr_put(void)
 		 *	if JNL_ALLOWED(cs_addrs) is TRUE instead of checking for JNL_ENABLED(cs_addrs) to be TRUE.
 		 * this approach has the overhead that we will be doing the following assignments even though JNL_ENABLED
 		 * 	might not be TRUE but since the following two are just pointer copies, it is not considered a big overhead.
-		 * this approach ensures that the jnl_put_jrt_pini() gets the appropriate prc_vec for writing into the
+		 * this approach ensures that the jnl_write_pini() gets the appropriate prc_vec for writing into the
 		 * 	journal record in case JNL_ENABLED turns out to be TRUE in t_end() time.
 		 * note that the value of JNL_ALLOWED(cs_addrs) cannot be changed on the fly without obtaining standalone access
 		 * 	and hence the correctness of prc_vec (whenever it turns out necessary) is guaranteed.
@@ -88,14 +89,14 @@ bool gtcmtr_put(void)
 	{
 		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(11) ERR_KEY2BIG, 4, n, (int4)gv_cur_region->max_key_size,
+		rts_error_csa(CSA_ARG(cs_addrs) VARLSTCNT(11) ERR_KEY2BIG, 4, n, (int4)gv_cur_region->max_key_size,
 			REG_LEN_STR(gv_cur_region), 0, ERR_GVIS, 2, end - buff, buff);
 	}
 	if (n + v.str.len + SIZEOF(rec_hdr) > gv_cur_region->max_rec_size)
 	{
 		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(10) ERR_REC2BIG, 4, n + v.str.len + SIZEOF(rec_hdr),
+		rts_error_csa(CSA_ARG(cs_addrs) VARLSTCNT(10) ERR_REC2BIG, 4, n + v.str.len + SIZEOF(rec_hdr),
 			(int4)gv_cur_region->max_rec_size, REG_LEN_STR(gv_cur_region),
 			ERR_GVIS, 2, end - buff, buff);
 	}
diff --git a/sr_port_cm/gvcmz_neterr.c b/sr_port_cm/gvcmz_neterr.c
index 9304395..6086d53 100755
--- a/sr_port_cm/gvcmz_neterr.c
+++ b/sr_port_cm/gvcmz_neterr.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	*
@@ -32,6 +33,8 @@
 GBLREF	struct NTD	*ntd_root;
 GBLDEF	bool		neterr_pending;
 
+LITREF	mval		literal_notimeout;
+
 error_def(ERR_LCKSCANCELLED);
 
 void	gvcmz_neterr(INTPTR_T *err)
@@ -45,8 +48,7 @@ void	gvcmz_neterr(INTPTR_T *err)
 	boolean_t	locks = FALSE;
 
 	neterr_pending = FALSE;
-	if (NULL == ntd_root)
-		GTMASSERT;
+	assertpro(NULL != ntd_root);
 	for (p = (struct CLB *)RELQUE2PTR(ntd_root->cqh.fl);  p != (struct CLB *)ntd_root;  p = pn)
 	{
 		/* Get the forward link, in case a close removes the current entry */
@@ -88,9 +90,8 @@ void	gvcmz_neterr(INTPTR_T *err)
 							p1->mbf = temp;
 						}
 					}
-					op_lkinit();
 					op_unlock();
-					op_zdeallocate(NO_M_TIMEOUT);
+					op_zdeallocate((mval *)&literal_notimeout);
 				}
 			}
 			/* Cycle through all active global directories */
@@ -116,7 +117,7 @@ void	gvcmz_neterr(INTPTR_T *err)
 			err_buff[0] += 3;
 			callg_signal(err_buff);
 		} else
-			rts_error(VARLSTCNT(1) ERR_LCKSCANCELLED);
+			rts_error_csa(NULL, VARLSTCNT(1) ERR_LCKSCANCELLED);
 	} else  if (NULL != err)
 		callg_signal(err);
 
diff --git a/sr_unix/Makefile.mk b/sr_unix/Makefile.mk
index 5ea7db1..4d5a3bd 100644
--- a/sr_unix/Makefile.mk
+++ b/sr_unix/Makefile.mk
@@ -17,8 +17,6 @@ thirdparty = gcrypt
 algo = AES256CFB
 # If the machine has a libgcrypt version <= 1.4.1, then FIPS mode cannot be turned on.
 gcrypt_nofips = 0
-# Default HP-UX OpenSSL include/lib base directory.
-HPUX_OPENSSL_ROOT = /opt/openssl/1.0.1e/
 
 # Verify that $gtm_dist is defined
 ifndef gtm_dist
@@ -58,6 +56,8 @@ ifeq ($(HAVE_GPG21),1)
 	USE_LOOPBACK = "-DUSE_GPGME_PINENTRY_MODE_LOOPBACK"
 endif
 
+# Determine if libgcrypt is installed.
+HAVE_GPGCRYPT = $(shell which libgcrypt-config 2> /dev/null)
 
 # Default installation target. This allows for the build system to randomize `thirdparty' and `algo' thereby changing the default
 # gtmcrypt install link.
@@ -109,29 +109,6 @@ ifneq (,$(findstring Linux,$(UNAMESTR)))
 	endif
 endif
 
-# Solaris
-ifneq (,$(findstring Solaris,$(UNAMESTR)))
-	# -fPIC for Position Independent Code; -m64 for 64-bit
-	CFLAGS += -fPIC -m64
-	LDFLAGS = -Wl,-64 -m64
-	# So that dependent libraries are loaded from the parent library's load path at runtime
-	RPATHFLAGS = -Wl,-R,'$$ORIGIN'
-	LDSHR = -G
-endif
-
-# HP-UX
-ifneq (,$(findstring HP-UX,$(UNAMESTR)))
-	# +Z is for Position Independent Code; -Ae for Extended ANSI mode and +DD64 for 64-bit
-	CFLAGS += +Z -Ae  +DD64
-	LDFLAGS = +DD64
-	# So that dependent libraries are loaded from the parent library's load path at runtime
-	RPATHFLAGS = -Wl,+b,\$$ORIGIN
-	# -b for shared library and -B,symbolic for assigning protected export calls to symbols.
-	LDSHR = -Wl,-b,-B,symbolic
-	LIBFLAGS = -L $(HPUX_OPENSSL_ROOT)/lib
-	IFLAGS = -I $(HPUX_OPENSSL_ROOT)/include
-endif
-
 # AIX
 ifneq (,$(findstring AIX,$(UNAMESTR)))
 	# -qchars=signed forces `char' type to be treated as signed chars.
@@ -157,6 +134,9 @@ ifneq (,$(findstring AIX,$(UNAMESTR)))
 	# On AIX, build maskpass and libgtmcryptutil.so with OpenSSL's libcrypto instead of libgcrypt.
 	default_thirdparty_CFLAGS = -DUSE_OPENSSL
 	default_thirdparty_LDFLAGS = -lcrypto
+	# Set the default library
+	thirdparty = openssl
+	install_targ = libgtmcrypt_$(thirdparty)_$(algo).so
 endif
 
 # Common header and library paths
@@ -196,12 +176,16 @@ maskpass: maskpass.c $(crypt_util_srcfiles) $(crypt_util_hdrfiles)
 	$(CC) $(CFLAGS) -DUSE_SYSLIB_FUNCS $(default_thirdparty_CFLAGS) maskpass.c $(crypt_util_srcfiles)	\
 		$(LDFLAGS) $@ $(default_thirdparty_LDFLAGS)
 
+ifneq ($(HAVE_GPGCRYPT),)
 gcrypt: libgtmcrypt_gcrypt_AES256CFB.so
 
 libgtmcrypt_gcrypt_AES256CFB.so: $(crypt_srcfiles) $(crypt_hdrfiles) libgtmcryptutil.so
 	@echo ; echo "Compiling $@..."
 	$(CC) $(CFLAGS) -DUSE_GCRYPT -DUSE_AES256CFB $(gcrypt_nofips_flag) $(crypt_srcfiles) $(LDSHR)		\
 		$(RPATHFLAGS) $(LDFLAGS) $@ -lgcrypt -lgpgme -lgpg-error $(COMMON_LIBS)
+else
+gcrypt:
+endif
 
 openssl: libgtmcrypt_openssl_AES256CFB.so
 
diff --git a/sr_unix/anticipatory_freeze.c b/sr_unix/anticipatory_freeze.c
index 6c363c6..5ce35b3 100644
--- a/sr_unix/anticipatory_freeze.c
+++ b/sr_unix/anticipatory_freeze.c
@@ -120,7 +120,8 @@ STATICFNDEF int		get_mnemonic_offset(hash_table_str **err_hashtab, char *mnemoni
 	{	/* create and populate hash-table for future lookups */
 		tmp_err_hashtab = (hash_table_str *)malloc(SIZEOF(hash_table_str));
 		DEBUG_ONLY(tmp_err_hashtab->base = NULL);
-		init_hashtab_str(tmp_err_hashtab, 0, HASHTAB_NO_COMPACT, HASHTAB_NO_SPARE_TABLE);
+		init_hashtab_str(tmp_err_hashtab, (msg_top - msg_beg) * (100.0 / HT_LOAD_FACTOR),
+				HASHTAB_NO_COMPACT, HASHTAB_NO_SPARE_TABLE);
 		assert(tmp_err_hashtab->base);
 		for (msg_info = (err_msg *)msg_beg; msg_info < msg_top; msg_info++)
 		{
@@ -183,17 +184,8 @@ void		set_anticipatory_freeze(sgmnt_addrs *csa, int msg_id)
 	boolean_t			was_crit;
 	sgmnt_addrs			*repl_csa;
 	const err_msg			*msginfo;
-#	ifdef DEBUG
-	qw_off_t			write_addr;
-	uint4				write;
-#	endif
 
 	assert(is_anticipatory_freeze_needed(csa, msg_id));
-	DEBUG_ONLY(
-		write_addr = jnlpool_ctl->write_addr;
-		write = jnlpool_ctl->write;
-	)
-	assert(write == write_addr % jnlpool_ctl->jnlpool_size);
 	repl_csa = &FILE_INFO(jnlpool.jnlpool_dummy_reg)->s_addrs;
 	assert(NULL != repl_csa);
 	was_crit = repl_csa->now_crit;
@@ -234,7 +226,7 @@ boolean_t		init_anticipatory_freeze_errors()
 	 * to check if cmerrors/cmierrors also need to be included in this list or not.
 	 */
 	assert(IS_MUPIP_IMAGE); 				/* is_src_server is not initialized at this point */
-	assert(jnlpool_ctl && !jnlpool_ctl->pool_initialized);	/* should be invoked BEFORE the journal pool is fully-initialized */
+	assert(jnlpool_ctl && !jnlpool_ctl->instfreeze_environ_inited);	/* invoke when not previously initialized */
 	assert(holds_sem[SOURCE][JNL_POOL_ACCESS_SEM]);		/* should hold journal pool access control semaphore */
 	/* Now, read the custom errors file and populate the journal pool */
 	custom_err_file = TREF(gtm_custom_errors);
diff --git a/sr_unix/backup_buffer_flush.c b/sr_unix/backup_buffer_flush.c
index e6c78f4..c5f0266 100755
--- a/sr_unix/backup_buffer_flush.c
+++ b/sr_unix/backup_buffer_flush.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	*
@@ -91,7 +92,8 @@ boolean_t backup_buffer_flush(gd_region *reg)
 			sbufh_p->failed = process_id;
 			sbufh_p->backup_errno = errno;
 			csa->nl->nbb = BACKUP_NOT_IN_PROGRESS;
-			send_msg(VARLSTCNT(5) ERR_BKUPTMPFILOPEN, 2, LEN_AND_STR(sbufh_p->tempfilename), sbufh_p->backup_errno);
+			send_msg_csa(CSA_ARG(csa) VARLSTCNT(5) ERR_BKUPTMPFILOPEN, 2,
+					LEN_AND_STR(sbufh_p->tempfilename), sbufh_p->backup_errno);
 			assert(EACCES == sbufh_p->backup_errno);
 			shmpool_unlock_hdr(reg);
 			return FALSE;
@@ -139,7 +141,8 @@ boolean_t backup_buffer_flush(gd_region *reg)
 				sbufh_p->backup_errno = status;
 				csa->nl->nbb = BACKUP_NOT_IN_PROGRESS;
 				assert(FALSE);
-				send_msg(VARLSTCNT(8) ERR_BKUPTMPFILWRITE, 2, LEN_AND_STR(sbufh_p->tempfilename), status);
+				send_msg_csa(CSA_ARG(csa) VARLSTCNT(8) ERR_BKUPTMPFILWRITE, 2,
+						LEN_AND_STR(sbufh_p->tempfilename), status);
 				break;	/* close file, release lock and return now.. */
 			}
 			/* Update disk addr with record just written */
diff --git a/sr_unix/check_encrypt_support.sh b/sr_unix/check_encrypt_support.sh
index 8b6b39f..e623a8b 100755
--- a/sr_unix/check_encrypt_support.sh
+++ b/sr_unix/check_encrypt_support.sh
@@ -107,7 +107,7 @@ fi
 lib_search_path="/usr/local/lib64 /usr/local/lib /usr/lib64 /usr/lib /lib64 /lib /usr/local/ssl/lib /usr/lib/x86_64-linux-gnu"
 lib_search_path="$lib_search_path /usr/lib/i386-linux-gnu /lib/x86_64-linux-gnu /lib/i386-linux-gnu /opt/openssl/0.9.8/lib/hpux64"
 include_search_path="/usr/include /usr/local/include /usr/local/include/gpgme /usr/local/ssl/include /opt/openssl/0.9.8/include"
-include_search_path="$include_search_path /usr/include/x86_64-linux-gnu"
+include_search_path="$include_search_path /usr/include/i386-linux-gnu /usr/include/x86_64-linux-gnu"
 bin_search_path="/usr/bin /usr/local/bin /bin"
 
 mandate_headers="gpgme.h gpg-error.h"
diff --git a/sr_unix/cms_load.csh b/sr_unix/cms_load.csh
index 4b6ae15..73df77f 100755
--- a/sr_unix/cms_load.csh
+++ b/sr_unix/cms_load.csh
@@ -270,6 +270,18 @@ foreach ref_library ( $ref_libs )
 end
 cp sr_unix_cm/makefile* $gtm_ver/tools
 
+########### Copy files from tools repo or $cms_tools to $dst_dir/tools ############
+
+if (-d $cms_dir/../tools/cms_tools/gtmpcat) then
+	set gtmpcat_dir=$cms_dir/../tools/cms_tools/gtmpcat
+else if (-d $cms_tools/gtmpcat) then
+	set gtmpcat_dir=$cms_tools/gtmpcat
+endif
+
+if ($?gtmpcat_dir) then
+	cp $gtmpcat_dir/gtmpcat{{,fldbld}.m,_{field_def,sh}.txt} ${gtm_root}/${dst_ver}/tools
+endif
+
 ######################## Rename .mpt files to _*.m files #######################
 
 if ($mods_only == 0) then
diff --git a/sr_unix/comlist.csh b/sr_unix/comlist.csh
index 467facb..06383fc 100755
--- a/sr_unix/comlist.csh
+++ b/sr_unix/comlist.csh
@@ -738,6 +738,23 @@ if (-e GTMDefinedTypesInit.m) then
 	endif
 endif
 
+echo "Generating gtmpcat field build"
+set old_gtmroutines = "$gtmroutines"
+setenv gtmroutines "$gtm_obj($gtm_tools)"
+pushd $gtm_tools
+chmod +w .
+rm -f gtmpcat*On*.m gtm_threadgbl_undefs.h
+$gtm_exe/mumps -r gtmpcatfldbld gtmpcat_field_def.txt ${gtm_verno}
+if ($status) then
+	set errmsg = "COMLIST-E-FAIL Failed to generate gtmpcat field build"
+	@ comlist_status++
+	echo "${errmsg}" >> $errorlog
+endif
+ls -l gtmpcat*
+popd
+setenv gtmroutines "$old_gtmroutines"
+rm $gtm_obj/gtmpcatfldbld.o
+
 # Create the GT.M/GDE/MUPIP/DSE/LKE help databases
 $gtm_tools/generate_help.csh $gtm_pct $errorlog
 if ($status) then
diff --git a/sr_unix/comque.csh b/sr_unix/comque.csh
index 7755cfe..af91a21 100755
--- a/sr_unix/comque.csh
+++ b/sr_unix/comque.csh
@@ -1,7 +1,8 @@
 #!/usr/local/bin/tcsh
 #################################################################
 #								#
-#	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	#
@@ -147,6 +148,7 @@ if ( ! -d $gtm_ver/log ) then
 	chmod 775 $gtm_ver/log
 endif
 
+rm -f $gtm_ver/log/comlist.$comque_image.log
 if ( $?comque_no_background != 0) then
 	if ( $?comque_batch_mode != 0) then
 		/usr/local/bin/tcsh $gtm_tools/comlist.csh \
diff --git a/sr_unix/configure.gtc b/sr_unix/configure.gtc
index b9bb576..c8c92a9 100755
--- a/sr_unix/configure.gtc
+++ b/sr_unix/configure.gtc
@@ -218,8 +218,15 @@ if [ -d "utf8" ]; then
 		if [ "$resp" = "Y" -o "$resp" = "y" ] ; then
 			$echo "Enter ICU version (at least ICU version 3.6 is required. Enter as <major-ver>.<minor-ver>): \c"
 			read gtm_icu_version
-			icu_ver=`$echo $gtm_icu_version | sed 's/\.//'`
-			majmin=`$echo $icu_ver | cut -f 1 -d "."`
+			maj=`$echo $gtm_icu_version | cut -f 1 -d "."`
+			if [ "$maj" -ge "49" ] ; then
+				# Assuming the input is of the form 52.1. As of ICU 49 (aka 4.9),
+				# the version reported by icu-config --version is <major><minor>.<milli> and not <major>.<minor>
+				majmin=$maj
+			else
+				# Assuming the input is of the form 4.2.1
+				majmin=`$echo $gtm_icu_version | cut -d "." -f 1,2 | sed 's/\.//'`
+			fi
 			if [ "$majmin" -lt "36" ] ; then
 				$echo "WARNING: ICU version $gtm_icu_version is less than 3.6. \c"
 				$echo "UTF-8 support will not be installed"
@@ -246,7 +253,9 @@ if [ -d "utf8" ]; then
 				# Find the actual version'ed library to which libicuio.{so,sl,a} points to
 				icu_versioned_lib=`ls -l $libpath/libicuio$icu_ext | awk '{print $NF}'`
 				# Find out vital parameters
-				if [ $arch = "ibm" ]; then
+				if [ "$libpath/libicuio$icu_ext" = "$icu_versioned_lib" ]; then
+					majmin=""
+				elif [ $arch = "ibm" ]; then
 					# From the version'ed library(eg. libicuio36.0.a) extract out
 					# 36.0.a
 					full_icu_ver_string=`$echo $icu_versioned_lib | sed 's/libicuio//g'`
@@ -274,6 +283,7 @@ if [ -d "utf8" ]; then
 					is64bit_icu=`file $libpath/$icu_full_ver_lib 2>/dev/null | grep "64-bit" | wc -l`
 				elif [ $arch = "ibm" ] ; then
 					icu_full_ver_lib=`ls -l $libpath/libicuio$majmin$icu_ext 2>/dev/null | awk '{print $NF}'`
+					icu_full_ver_lib=`basename $icu_full_ver_lib`
 					is64bit_icu=`nm -X64 $libpath/$icu_full_ver_lib 2>/dev/null | head -n 1 | wc -l`
 				fi
 				# Make sure both GTM and ICU are in sync with object mode compatibility (eg both are 32 bit/64 bit )
@@ -284,6 +294,8 @@ if [ -d "utf8" ]; then
 				else
 					found_icu=0
 				fi
+				# The default ICU library on AIX is unversioned
+				if [ "$found_icu" -eq 1 -a "$majmin" = "" ] ; then majmin=0; fi
 				# If we have everything we want, then save the libpath that contains the proper ICU library and
 				# set the gtm_icu_version
 				if [ "$found_icu" -eq 1 -a "$majmin" -ge 36 ] ; then
diff --git a/sr_unix/dse.c b/sr_unix/dse.c
old mode 100755
new mode 100644
index d0b696b..e13e902
--- a/sr_unix/dse.c
+++ b/sr_unix/dse.c
@@ -53,7 +53,6 @@
 #include "lke.h"
 #include "gtm_startup_chk.h"
 #include "generic_signal_handler.h"
-#include "init_secshr_addrs.h"
 #include "cli_parse.h"
 #include "getzdir.h"
 #include "dse_exit.h"
@@ -68,6 +67,7 @@
 #include "have_crit.h"
 #include "gt_timers_add_safe_hndlrs.h"
 #include "continue_handler.h"
+#include "restrict.h"
 
 #ifdef UNICODE_SUPPORTED
 #include "gtm_icu_api.h"
@@ -82,7 +82,7 @@ GBLREF gd_addr			*original_header;
 GBLREF bool			licensed;
 GBLREF void			(*func)(void);
 GBLREF gv_namehead		*gv_target;
-GBLREF int			(*op_open_ptr)(mval *v, mval *p, int t, mval *mspace);
+GBLREF int			(*op_open_ptr)(mval *v, mval *p, mval *t, mval *mspace);
 GBLREF boolean_t		dse_running;
 GBLREF spdesc			rts_stringpool, stringpool;
 GBLREF global_latch_t		defer_latch;
@@ -90,6 +90,7 @@ GBLREF VSIG_ATOMIC_T		util_interrupt;
 GBLREF char			cli_err_str[];
 GBLREF boolean_t		write_after_image;
 GBLREF CLI_ENTRY		dse_cmd_ary[];
+GBLREF ch_ret_type		(*stpgc_ch)();			/* Function pointer to stp_gcol_ch */
 
 GBLDEF block_id			patch_curr_blk;
 GBLDEF CLI_ENTRY		*cmd_ary = &dse_cmd_ary[0];	/* Define cmd_ary to be the DSE specific cmd table */
@@ -99,6 +100,8 @@ static void 		display_prompt(void);
 static readonly char	prompt[]="DSE> ";
 
 error_def(ERR_CTRLC);
+error_def(ERR_RESTRICTEDOP);
+
 int main(int argc, char *argv[])
 {
 	DCL_THREADGBL_ACCESS;
@@ -119,15 +122,17 @@ int main(int argc, char *argv[])
 	atexit(util_exit_handler);
 	SET_LATCH_GLOBAL(&defer_latch, LOCK_AVAILABLE);
 	stp_init(STP_INITSIZE);
+	stpgc_ch = &stp_gcol_ch;
 	rts_stringpool = stringpool;
 	getjobname();
-	INVOKE_INIT_SECSHR_ADDRS;
 	io_init(TRUE);
 	getzdir();
 	gtm_chk_dist(argv[0]);
 	prealloc_gt_timers();
 	gt_timers_add_safe_hndlrs();
 	initialize_pattern_table();
+	if (RESTRICTED(dse))
+		rts_error_csa(CSA_ARG(NULL) VARLSTCNT(3) ERR_RESTRICTEDOP, 1, "DSE");
 	gvinit();
 	region_init(FALSE);
 	util_out_print("!/File  !_!AD", TRUE, DB_LEN_STR(gv_cur_region));
diff --git a/sr_unix/dse_open.c b/sr_unix/dse_open.c
index dc34309..4002f69 100755
--- a/sr_unix/dse_open.c
+++ b/sr_unix/dse_open.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	*
@@ -45,10 +46,12 @@
 #pragma pointer_size (long)
 #endif
 
-GBLREF int	(*op_open_ptr)(mval *v, mval *p, int t, mval *mspace);
+GBLREF int	(*op_open_ptr)(mval *v, mval *p, mval *t, mval *mspace);
 GBLREF spdesc stringpool;
 GBLREF gtm_chset_t	dse_over_chset;
 
+LITREF	mval		literal_zero;
+
 #ifdef	__osf__
 #pragma pointer_size (restore)
 #endif
@@ -116,7 +119,7 @@ void	dse_open (void)
 		open_pars.mvtype = MV_STR;
 		open_pars.str.len = SIZEOF(open_params_list);
 		open_pars.str.addr = (char *)open_params_list;
-		(*op_open_ptr)(&val, &open_pars, 0, NULL);
+		(*op_open_ptr)(&val, &open_pars, (mval *)&literal_zero, NULL);
 		use_pars.mvtype = MV_STR;
 		use_pars.str.len = SIZEOF(use_params_list);
 		use_pars.str.addr = (char *)use_params_list;
diff --git a/sr_unix/dsk_write_nocache.c b/sr_unix/dsk_write_nocache.c
index e90c931..f4ed6b8 100755
--- a/sr_unix/dsk_write_nocache.c
+++ b/sr_unix/dsk_write_nocache.c
@@ -100,8 +100,9 @@ int	dsk_write_nocache(gd_region *reg, block_id blk, sm_uc_ptr_t buff, enum db_ve
 	else
 		assert(GDSV6 == ondsk_blkver);
 #	endif
-	if (csa->do_fullblockwrites)
-		size =(int)ROUND_UP(size, csa->fullblockwrite_len); /* round size up to next full logical filesys block. */
+	if (csa->do_fullblockwrites) /* See similiar lobic in wcs_wtstart.c */
+		size = (int)ROUND_UP(size, (FULL_DATABASE_WRITE == csa->do_fullblockwrites)
+				? csd->blk_size : csa->fullblockwrite_len);
 	assert(size <= csd->blk_size);
 	assert(FALSE == reg->read_only);
 	/* This function is called by "bml_init" which in turn can be called by "mucregini" or "gdsfilext". The former is
diff --git a/sr_unix/errorsp.h b/sr_unix/errorsp.h
index f04d9f8..4f5ea5a 100644
--- a/sr_unix/errorsp.h
+++ b/sr_unix/errorsp.h
@@ -568,9 +568,11 @@ CONDITION_HANDLER(dbopen_ch);
 CONDITION_HANDLER(gtmci_ch);
 CONDITION_HANDLER(gtmci_init_ch);
 CONDITION_HANDLER(gtmsecshr_cond_hndlr);
+CONDITION_HANDLER(gvcst_init_autoDB_ch);
 CONDITION_HANDLER(gvtr_tpwrap_ch);
 CONDITION_HANDLER(iob_io_error1);
 CONDITION_HANDLER(iob_io_error2);
+CONDITION_HANDLER(mu_cre_file_ch);
 CONDITION_HANDLER(mu_extract_handler);
 CONDITION_HANDLER(mu_extract_handler1);
 CONDITION_HANDLER(mu_extract_handler2);
diff --git a/sr_unix/fake_enospc.c b/sr_unix/fake_enospc.c
index 95298b5..f63dac3 100644
--- a/sr_unix/fake_enospc.c
+++ b/sr_unix/fake_enospc.c
@@ -85,7 +85,12 @@ void fake_enospc(void)
 		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)
+	/* If ok_to_interrupt is FALSE and intrpt_ok_state == INTRPT_IN_SHMDT, it is possible we have detached
+	 * from the shared memory (i.e. in the middle of the shmdt()) when the timer interrupt occurs and so
+	 * we cannot do a IS_REPL_INST_FROZEN check which looks at a field inside jnlpool_ctl. Account for that below.
+	 */
+	if (syslog_deferred
+		|| (!ok_to_interrupt && ((INTRPT_IN_SHMDT == intrpt_ok_state) || !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);
diff --git a/sr_unix/file_input.c b/sr_unix/file_input.c
index f9df5d9..b7353ff 100644
--- a/sr_unix/file_input.c
+++ b/sr_unix/file_input.c
@@ -1,6 +1,7 @@
 /****************************************************************
  *								*
- *	Copyright 2010, 2014 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	*
@@ -31,10 +32,13 @@
 
 #define BUFF_SIZE	65535
 
-GBLREF int		(*op_open_ptr)(mval *v, mval *p, int t, mval *mspace);
+GBLREF int		(*op_open_ptr)(mval *v, mval *p, mval *t, mval *mspace);
 GBLREF	uint4		dollar_tlevel;
 GBLREF io_pair		io_curr_device;
 
+LITREF	mval		literal_notimeout;
+LITREF	mval		literal_zero;
+
 error_def(ERR_LOADFILERR);
 error_def(ERR_FILEOPENFAIL);
 error_def(ERR_PREMATEOF);
@@ -96,7 +100,7 @@ void file_input_init(char *fn, short fn_len, open_params_flags params_flag)
 	val.str.len = fn_len;
 	val.str.addr = (char *)fn;
 	/* The mode will be set to M for reads */
-	status = (*op_open_ptr)(&val, &pars, 0, 0);
+	status = (*op_open_ptr)(&val, &pars, (mval *)&literal_zero, NULL);
 	if (!status)
 		rts_error_csa(CSA_ARG(NULL) VARLSTCNT(4) ERR_FILEOPENFAIL, 2, fn_len, fn);
 	pars.str.len = SIZEOF(iop_eol);
@@ -227,7 +231,7 @@ int file_input_get_xchar(char *in_ptr, int max_chars_to_read) /* uses opreadfl w
 	int		rd_len;
 	mval		val;
 
-	op_readfl(&val, max_chars_to_read, dollar_tlevel ? 0: NO_M_TIMEOUT);
+	op_readfl(&val, max_chars_to_read, (mval *)(dollar_tlevel ? &literal_zero : &literal_notimeout));
 	rd_len = val.str.len;
 	if ((0 == rd_len) && io_curr_device.in->dollar.zeof)
 		return -1;
@@ -265,7 +269,7 @@ int file_input_get(char **in_ptr, int max_len)
 	ret_len = 0;
 	for (;;)
 	{	/* one-time only reads if in TP to avoid TPNOTACID, otherwise use untimed reads */
-		op_read(&val, dollar_tlevel ? 0: NO_M_TIMEOUT);
+		op_read(&val, (mval *)(dollar_tlevel ? &literal_zero: &literal_notimeout));
 		rd_len = val.str.len;
 		if ((0 == rd_len) && io_curr_device.in->dollar.zeof)
 		{
diff --git a/sr_unix/filestruct.h b/sr_unix/filestruct.h
old mode 100755
new mode 100644
index f747965..4866167
--- a/sr_unix/filestruct.h
+++ b/sr_unix/filestruct.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	*
@@ -127,6 +127,7 @@ typedef struct unix_file_info_struct
 } unix_file_info;
 
 #define	FC2UDI(FILE_CNTL)	((unix_db_info *)(FILE_CNTL->file_info))
+#define	FILE_CNTL(reg)		(reg)->dyn.addr->file_cntl
 #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
diff --git a/sr_unix/ftok_sem_get_common.c b/sr_unix/ftok_sem_get_common.c
new file mode 100755
index 0000000..77d6ce9
--- /dev/null
+++ b/sr_unix/ftok_sem_get_common.c
@@ -0,0 +1,206 @@
+/****************************************************************
+ *								*
+ * 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_ipc.h"
+#include "gtm_unistd.h"
+#include "gtm_string.h"
+#include "gtm_stdlib.h"
+#include "gtm_fcntl.h"
+#include "gtm_stdio.h"
+#include "gtm_stat.h"
+#include "gtm_signal.h" /* for kill(), SIGTERM, SIGQUIT */
+
+#include <sys/mman.h>
+#include <sys/sem.h>
+#include <sys/shm.h>
+#include <sys/time.h>
+#include <errno.h>
+
+#include "gtm_sem.h"
+#include "gdsroot.h"
+#include "gtm_facility.h"
+#include "fileinfo.h"
+#include "gdsbt.h"
+#include "gdsblk.h"
+#include "gdsfhead.h"
+#include "filestruct.h"
+#include "gtm_c_stack_trace.h"
+#include "eintr_wrapper_semop.h"
+#include "eintr_wrappers.h"
+#include "mu_rndwn_file.h"
+#include "error.h"
+#include "io.h"
+#include "gt_timer.h"
+#include "iosp.h"
+#include "gtmio.h"
+#include "gtmimagename.h"
+#include "do_semop.h"
+#include "ipcrmid.h"
+#include "gtmmsg.h"
+#include "util.h"
+#include "semwt2long_handler.h"
+#include "repl_sem.h"
+#include "jnl.h"
+#include "repl_msg.h"
+#include "gtmsource.h"
+#include "gtmrecv.h"
+#include "gtm_semutils.h"
+#include "ftok_sems.h"
+#include "wbox_test_init.h"
+
+GBLREF	gd_region		*ftok_sem_reg;
+
+error_def(ERR_CRITSEMFAIL);
+error_def(ERR_FTOKERR);
+error_def(ERR_MAXSEMGETRETRY);
+error_def(ERR_SEMWT2LONG);
+
+#define	MAX_SEM_DSE_WT	(MILLISECS_IN_SEC * (30 / 2)) /* Actually 30 seconds before giving up - two semops with 15 second */
+#define	MAX_SEM_WT	(MILLISECS_IN_SEC * (60 / 2)) /* Actually 60 seconds before giving up - two semops with 30 second */
+
+/* If running in-house we want to debug live semop hangs. So, we will be continuing to hang until we get a successful semop with
+ * stack traces taken every MAX_SEM_DSE_WT/MAX_SEM_WT seconds.
+ */
+#define MAX_SEMOP_TRYCNT	2	/* effective wait time - 30 seconds for DSE and 1 minute for other images */
+#define MAX_SEMOP_DBG_TRYCNT	604800	/* effective wait time - 3.5 days for DSE and 1 week for other images */
+
+#define	OLD_VERSION_SEM_PER_SET 2
+
+#define ISSUE_CRITSEMFAIL_AND_RETURN(REG, FAILED_OP, ERRNO)									\
+{																\
+	gtm_putmsg_csa(CSA_ARG(REG2CSA(REG)) VARLSTCNT(4) ERR_CRITSEMFAIL, 2, DB_LEN_STR(REG));					\
+	gtm_putmsg_csa(CSA_ARG(REG2CSA(REG)) VARLSTCNT(8) ERR_SYSCALL, 5, RTS_ERROR_LITERAL(FAILED_OP), CALLFROM, ERRNO);	\
+	return FALSE;														\
+}
+
+#define CANCEL_TIMER_AND_RETURN_SUCCESS(REG)										\
+{															\
+	cancel_timer((TID)semwt2long_handler);										\
+	RETURN_SUCCESS(REG);												\
+}
+
+#define RETURN_SUCCESS(REG)												\
+{															\
+	ftok_sem_reg = REG;												\
+	udi->grabbed_ftok_sem = TRUE;											\
+	return TRUE;													\
+}
+
+boolean_t ftok_sem_get_common(gd_region *reg, boolean_t incr_cnt, int project_id, boolean_t immediate, boolean_t *stacktrace_time,
+				boolean_t *timedout, semwait_status_t *retstat, boolean_t *bypass, boolean_t *ftok_counter_halted)
+{
+	int			status = SS_NORMAL, save_errno;
+	int			ftok_sopcnt, sem_pid;
+	uint4			lcnt, loopcnt;
+	unix_db_info		*udi;
+	union semun		semarg;
+	sgmnt_addrs             *csa;
+	node_local_ptr_t        cnl;
+	boolean_t		shared_mem_available;
+	int4			lcl_ftok_ops_index;
+	key_t			ftokid;
+	struct sembuf		ftok_sop[3];
+	char			*msgstr;
+
+	DCL_THREADGBL_ACCESS;
+
+	SETUP_THREADGBL_ACCESS;
+	udi = FILE_INFO(reg);
+	assert(!udi->grabbed_ftok_sem && !udi->grabbed_access_sem);
+	assert(NULL == ftok_sem_reg);
+	if (-1 == (udi->key = FTOK(udi->fn, project_id)))
+		RETURN_SEMWAIT_FAILURE(retstat, errno, op_ftok, 0, ERR_FTOKERR, 0);
+	/* First try is always IPC_NOWAIT */
+	SET_GTM_SOP_ARRAY(ftok_sop, ftok_sopcnt, incr_cnt, (SEM_UNDO | IPC_NOWAIT));
+	/* The following loop deals with the possibility that the semaphores can be deleted by someone else AFTER a successful
+	 * semget but BEFORE semop locks it, in which case we should retry.
+	 */
+	*ftok_counter_halted = FALSE;
+	for (lcnt = 0; MAX_SEMGET_RETRIES > lcnt; lcnt++)
+	{
+		if (INVALID_SEMID == (udi->ftok_semid = semget(udi->key, FTOK_SEM_PER_ID, RWDALL | IPC_CREAT)))
+		{
+			save_errno = errno;
+			RETURN_SEMWAIT_FAILURE(retstat, save_errno, op_semget, 0, ERR_CRITSEMFAIL, 0);
+		}
+		ftokid = udi->ftok_semid;
+		SET_GTM_ID_SEM(ftokid, status); /* Set 3rd semaphore's value to GTM_ID = 43 */
+		if (-1 == status)
+		{
+			save_errno = errno;
+			if (SEM_REMOVED(save_errno))
+			{	/* start afresh for next iteration of for loop with new semid and initial operations */
+				*ftok_counter_halted = FALSE;
+				SET_GTM_SOP_ARRAY(ftok_sop, ftok_sopcnt, incr_cnt, (SEM_UNDO | IPC_NOWAIT));
+				continue;
+			}
+			RETURN_SEMWAIT_FAILURE(retstat, save_errno, op_semctl, 0, ERR_CRITSEMFAIL, 0);
+		}
+		/* First try is always non-blocking */
+		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);
+		}
+		save_errno = errno;
+		assert(EINTR != save_errno);
+		if (ERANGE == save_errno)
+		{	/* We have no access to file header to check so just assume qdbrundown is set in the file header.
+			 * If it turns out to be FALSE, after we read the file header, we will issue an error
+			 */
+			assert(!*ftok_counter_halted);
+			*ftok_counter_halted = TRUE;
+			ftok_sopcnt = FTOK_SOPCNT_NO_INCR_COUNTER; /* Ignore increment operation */
+			lcnt--; /* Do not count this attempt */
+			continue;
+		}
+		if (immediate)
+			RETURN_SEMWAIT_FAILURE(retstat, save_errno, op_semop, 0, ERR_CRITSEMFAIL, 0);
+		if (EAGAIN == save_errno)
+		{	/* someone else is holding it */
+			if (NO_SEMWAIT_ON_EAGAIN == TREF(dbinit_max_delta_secs))
+			{
+				sem_pid = semctl(ftokid, DB_CONTROL_SEM, 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, stacktrace_time, timedout, retstat, reg, bypass,
+						     ftok_counter_halted, incr_cnt))
+			{	/* ftok_counter_halted and bypass set by "do_blocking_semop" */
+				udi->counter_ftok_incremented = incr_cnt && !(*ftok_counter_halted);
+				if (*bypass)
+					return TRUE;
+				else
+					RETURN_SUCCESS(reg);
+			} else if (!SEM_REMOVED(retstat->save_errno))
+				return FALSE; /* retstat will already have the necessary error information */
+			save_errno = retstat->save_errno; /* some other error. Fall-through */
+		}
+		if (SEM_REMOVED(save_errno))
+		{	/* start afresh for next iteration of for loop with new semid and ftok_sopcnt */
+			*ftok_counter_halted = FALSE;
+			SET_GTM_SOP_ARRAY(ftok_sop, ftok_sopcnt, incr_cnt, (SEM_UNDO | IPC_NOWAIT));
+			continue;
+		}
+		assert(EINTR != save_errno);
+		RETURN_SEMWAIT_FAILURE(retstat, save_errno, op_semctl_or_semop, 0, ERR_CRITSEMFAIL, 0);
+	}
+	assert(FALSE);
+	RETURN_SEMWAIT_FAILURE(retstat, 0, op_invalid_sem_syscall, 0, ERR_MAXSEMGETRETRY, 0);
+}
diff --git a/sr_unix/ftok_sems.c b/sr_unix/ftok_sems.c
index 9204fee..11f0603 100755
--- a/sr_unix/ftok_sems.c
+++ b/sr_unix/ftok_sems.c
@@ -59,15 +59,11 @@
 #include "ftok_sems.h"
 #include "wbox_test_init.h"
 
-GBLREF	gd_region		*gv_cur_region;
 GBLREF	uint4			process_id;
 GBLREF	gd_region		*ftok_sem_reg;
-GBLREF	int4			exi_condition;
 GBLREF	boolean_t		holds_sem[NUM_SEM_SETS][NUM_SRC_SEMS];
 GBLREF	jnlpool_addrs		jnlpool;
-GBLREF	recvpool_addrs		recvpool;
 GBLREF	jnl_gbls_t		jgbl;
-DEBUG_ONLY(GBLREF boolean_t	mupip_jnl_recover;)
 
 error_def(ERR_CRITSEMFAIL);
 error_def(ERR_FTOKERR);
@@ -75,7 +71,6 @@ error_def(ERR_MAXSEMGETRETRY);
 error_def(ERR_SEMKEYINUSE);
 error_def(ERR_SEMWT2LONG);
 error_def(ERR_SYSCALL);
-error_def(ERR_TEXT);
 
 #define	MAX_SEM_DSE_WT	(MILLISECS_IN_SEC * (30 / 2)) /* Actually 30 seconds before giving up - two semops with 15 second */
 #define	MAX_SEM_WT	(MILLISECS_IN_SEC * (60 / 2)) /* Actually 60 seconds before giving up - two semops with 30 second */
@@ -102,107 +97,20 @@ error_def(ERR_TEXT);
 }
 
 #define RETURN_SUCCESS(REG)												\
-{															\
+MBSTART {														\
 	ftok_sem_reg = REG;												\
 	udi->grabbed_ftok_sem = TRUE;											\
 	return TRUE;													\
-}
+} MBEND
 
 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;
-	uint4			lcnt, loopcnt;
-	unix_db_info		*udi;
-	key_t			ftokid;
-	struct sembuf		ftok_sop[3];
+	boolean_t	immediate = FALSE;
+	int		project_id = GTM_ID;
 
-	DCL_THREADGBL_ACCESS;
-
-	SETUP_THREADGBL_ACCESS;
-	udi = FILE_INFO(reg);
-	assert(!udi->grabbed_ftok_sem && !udi->grabbed_access_sem);
-	assert(NULL == ftok_sem_reg);
-	if (-1 == (udi->key = FTOK(udi->fn, GTM_ID)))
-		RETURN_SEMWAIT_FAILURE(retstat, errno, op_ftok, 0, ERR_FTOKERR, 0);
-	/* First try is always IPC_NOWAIT */
-	SET_GTM_SOP_ARRAY(ftok_sop, ftok_sopcnt, incr_cnt, (SEM_UNDO | IPC_NOWAIT));
-	/* The following loop deals with the possibility that the semaphores can be deleted by someone else AFTER a successful
-	 * semget but BEFORE semop locks it, in which case we should retry.
-	 */
-	*ftok_counter_halted = FALSE;
-	for (lcnt = 0; MAX_SEMGET_RETRIES > lcnt; lcnt++)
-	{
-		if (INVALID_SEMID == (udi->ftok_semid = semget(udi->key, FTOK_SEM_PER_ID, RWDALL | IPC_CREAT)))
-		{
-			save_errno = errno;
-			RETURN_SEMWAIT_FAILURE(retstat, save_errno, op_semget, 0, ERR_CRITSEMFAIL, 0);
-		}
-		ftokid = udi->ftok_semid;
-		SET_GTM_ID_SEM(ftokid, status); /* Set 3rd semaphore's value to GTM_ID = 43 */
-		if (-1 == status)
-		{
-			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_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, stacktrace_time, timedout, retstat, reg, bypass,
-						     ftok_counter_halted))
-			{
-				if (*ftok_counter_halted)	/* set by "do_blocking_semop" */
-					ftok_sopcnt = FTOK_SOPCNT_NO_INCR_COUNTER;
-				udi->counter_ftok_incremented = (FTOK_SOPCNT_NO_INCR_COUNTER != ftok_sopcnt);
-				if (*bypass)
-					return TRUE;
-				else
-					RETURN_SUCCESS(reg);
-			} else if (!SEM_REMOVED(retstat->save_errno))
-				return FALSE; /* retstat will already have the necessary error information */
-			save_errno = retstat->save_errno; /* some other error. Fall-through */
-		} else if (ERANGE == save_errno)
-		{	/* We have no access to file header to check so just assume qdbrundown is set in the file header.
-			 * If it turns out to be FALSE, after we read the file header, we will issue an error
-			 */
-			*ftok_counter_halted = TRUE;
-			ftok_sopcnt = FTOK_SOPCNT_NO_INCR_COUNTER; /* Ignore increment operation */
-			lcnt--; /* Do not count this attempt */
-			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);
-	}
-	assert(FALSE);
-	RETURN_SEMWAIT_FAILURE(retstat, 0, op_invalid_sem_syscall, 0, ERR_MAXSEMGETRETRY, 0);
+	return ftok_sem_get_common(reg, incr_cnt, project_id, immediate, stacktrace_time, timedout, retstat, bypass,
+					ftok_counter_halted);
 }
 
 /*
@@ -220,18 +128,10 @@ boolean_t ftok_sem_get2(gd_region *reg, boolean_t *stacktrace_time, boolean_t *t
  */
 boolean_t ftok_sem_get(gd_region *reg, boolean_t incr_cnt, int project_id, boolean_t immediate, boolean_t *ftok_counter_halted)
 {
-	int			sem_pid, save_errno, ftok_sopcnt, stuck_cnt = 0;
-	int4			status;
-	uint4			semop_wait_time, lcnt, semop_trycnt, max_semop_trycnt, tot_wait_time;
+	uint4			semop_wait_time;
 	unix_db_info		*udi;
-	union semun		semarg;
-	sgmnt_addrs             *csa;
-	node_local_ptr_t        cnl;
-	boolean_t		shared_mem_available;
-	int4			lcl_ftok_ops_index;
-	struct sembuf		ftok_sop[3];
-	char			*msgstr;
-	boolean_t		stacktrace_issued = FALSE;
+	boolean_t		stacktrace_time = FALSE, sem_timeout, bypass = FALSE, result;
+	semwait_status_t	retstat;
 	DCL_THREADGBL_ACCESS;
 
 	SETUP_THREADGBL_ACCESS;
@@ -245,150 +145,21 @@ boolean_t ftok_sem_get(gd_region *reg, boolean_t incr_cnt, int project_id, boole
 	assert((reg != jnlpool.jnlpool_dummy_reg)
 		|| (jgbl.mur_rollback && !jgbl.mur_options_forward) || !holds_sem[SOURCE][JNL_POOL_ACCESS_SEM]);
 	udi = FILE_INFO(reg);
-	csa = &udi->s_addrs;
 	assert(!udi->grabbed_ftok_sem && !udi->grabbed_access_sem);
 	assert(NULL == ftok_sem_reg);
-	if (-1 == (udi->key = FTOK(udi->fn, project_id)))
+	semop_wait_time = !IS_DSE_IMAGE ? MAX_SEM_WT : MAX_SEM_DSE_WT;
+	TIMEOUT_INIT(sem_timeout, semop_wait_time);
+	result = ftok_sem_get_common(reg, incr_cnt, project_id, immediate, &stacktrace_time, &sem_timeout, &retstat, &bypass,
+						ftok_counter_halted);
+	TIMEOUT_DONE(sem_timeout);
+	assert(!bypass);
+	if (!result)
 	{
-		gtm_putmsg_csa(CSA_ARG(csa) VARLSTCNT(5) ERR_FTOKERR, 2, DB_LEN_STR(reg), errno);
+		PRINT_SEMWAIT_ERROR(&retstat, reg, udi, "ftok");
 		return FALSE;
 	}
-	/* The following loop deals with the possibility that the semaphores can be deleted by someone else AFTER a successful
-	 * semget but BEFORE semop locks it, in which case we should retry.
-	 */
-	for (lcnt = 0; MAX_SEMGET_RETRIES > lcnt; lcnt++)
-	{
-		if (-1 == (udi->ftok_semid = semget(udi->key, FTOK_SEM_PER_ID, RWDALL | IPC_CREAT)))
-		{
-			udi->ftok_semid = INVALID_SEMID;
-			save_errno = errno;
-			if (EINVAL == save_errno)
-			{
-				/* Possibly the key is in use by older GTM version */
-				if (-1 != semget(udi->key, OLD_VERSION_SEM_PER_SET, RALL))
-					gtm_putmsg_csa(CSA_ARG(csa) VARLSTCNT(4) ERR_SEMKEYINUSE, 1, udi->key, errno);
-			}
-			ISSUE_CRITSEMFAIL_AND_RETURN(reg, "semget()", save_errno);
-		}
-		SET_GTM_ID_SEM(udi->ftok_semid, status); /* sets 3rd semaphore's value to GTM_ID = 43 */
-		if (-1 != status)
-		{
-			SET_GTM_SOP_ARRAY(ftok_sop, ftok_sopcnt, incr_cnt, (SEM_UNDO | IPC_NOWAIT));
-			/* First try is always non-blocking */
-			SEMOP(udi->ftok_semid, ftok_sop, ftok_sopcnt, status, NO_WAIT);
-			if (-1 != status)
-			{
-				SENDMSG_SEMOP_SUCCESS_IF_NEEDED(stacktrace_issued, gtm_ftok_sem);
-				udi->counter_ftok_incremented = incr_cnt;
-				RETURN_SUCCESS(reg);
-			}
-			assert(-1 == status);
-			if ((ERANGE == errno) && (!*ftok_counter_halted))
-			{	/* We have no access to file header to check so just assume qdbrundown is set in the file header.
-				 * If it turns out to be FALSE, after we read the file header, we will issue an error.
-				 */
-				*ftok_counter_halted = TRUE;
-				incr_cnt = FALSE; /* Ignore increment operation */
-				lcnt--; /* Do not count this attempt */
-				continue;
-			}
-		} else
-		{
-			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;
-		if (immediate)
-			ISSUE_CRITSEMFAIL_AND_RETURN(reg, "semop()", save_errno);
-		if (EAGAIN == save_errno)
-		{	/* Someone else is holding it */
-			sem_pid = semctl(udi->ftok_semid, DB_CONTROL_SEM, GETPID);
-			if (-1 != sem_pid)
-			{
-				ftok_sop[0].sem_flg = ftok_sop[1].sem_flg = ftok_sop[2].sem_flg = SEM_UNDO; /* blocking calls */
-				semop_wait_time = !IS_DSE_IMAGE ? MAX_SEM_WT : MAX_SEM_DSE_WT;
-				max_semop_trycnt = !(TREF(gtm_environment_init)) ? MAX_SEMOP_TRYCNT : MAX_SEMOP_DBG_TRYCNT;
-				for (semop_trycnt = 0; max_semop_trycnt > semop_trycnt; ++semop_trycnt)
-				{
-					TREF(semwait2long) = FALSE;
-					start_timer((TID)semwt2long_handler, semop_wait_time, semwt2long_handler, 0, NULL);
-					do
-					{
-						status = semop(udi->ftok_semid, ftok_sop, ftok_sopcnt); /* blocking semop */
-						if ((-1 == status) && (ERANGE == errno))
-                                                {
-                                                        if (!*ftok_counter_halted)
-							{	/* We have no access to file header to check so just assume
-								 * qdbrundown is set in the file header. If it turns out to be
-								 * FALSE, after we read the file header, we will issue an error
-								 */
-								*ftok_counter_halted = TRUE;
-								ftok_sopcnt = FTOK_SOPCNT_NO_INCR_COUNTER; /* Skip increment */
-								assert(incr_cnt);
-								incr_cnt = FALSE;
-								continue;
-							}
-                                                }
-					} while ((-1 == status) && ((EINTR == errno) || (ERANGE == errno))
-						 && !(TREF(semwait2long)));
-					if (-1 != status) /* success ? */
-					{
-						SENDMSG_SEMOP_SUCCESS_IF_NEEDED(stacktrace_issued, gtm_ftok_sem);
-						udi->counter_ftok_incremented = incr_cnt;
-						CANCEL_TIMER_AND_RETURN_SUCCESS(reg);
-					}
-					save_errno = errno;
-					if (EINTR == save_errno)
-					{	/* Timer popped. If not, we would have continued in the do..while loop */
-						assert(TREF(semwait2long));
-						sem_pid = semctl(udi->ftok_semid, DB_CONTROL_SEM, GETPID);
-						if (-1 != sem_pid)
-						{
-							stuck_cnt++;
-							msgstr = (1 == stuck_cnt) ? "SEMWT2LONG_FTOK_INFO" : "SEMWT2LONG_FTOK";
-							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;
-							}
-							continue;
-						} else
-							save_errno = errno; /* for the failed semctl */
-					}
-					cancel_timer((TID)semwt2long_handler);
-					break; /* semop/semctl failed for some other reason (for instance, EIDRM/EINVAL) */
-				}
-				if (max_semop_trycnt <= semop_trycnt)
-				{	/* we exhausted maximum attempts to do blocking semop. Issue SEMWT2LONG error and return */
-					assert(-1 != sem_pid);
-					tot_wait_time = (semop_wait_time * max_semop_trycnt) / MILLISECS_IN_SEC;
-					gtm_putmsg_csa(CSA_ARG(csa) VARLSTCNT(9) ERR_SEMWT2LONG, 7, process_id, tot_wait_time,
-						       LEN_AND_LIT("ftok"), DB_LEN_STR(reg), sem_pid);
-					return FALSE;
-				}
-				/* fall-through */
-			} else
-				save_errno = errno; /* for the failed semctl */
-			/* fall-through */
-		}
-		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);
-	assert(MAX_SEMGET_RETRIES < lcnt);
-	assert(FALSE);
-	gtm_putmsg_csa(CSA_ARG(csa) VARLSTCNT(8) ERR_CRITSEMFAIL, 2, DB_LEN_STR(reg),
-			ERR_TEXT, 2, RTS_ERROR_LITERAL("failed to obtain ftok semaphore after maximum retries"));
-	return FALSE;
+	else
+		RETURN_SUCCESS(reg);
 }
 
 /*
@@ -535,7 +306,10 @@ boolean_t ftok_sem_release(gd_region *reg,  boolean_t decr_cnt, boolean_t immedi
 				return TRUE;
 			}
 		}
-		if (0 != (save_errno = do_semop(udi->ftok_semid, DB_COUNTER_SEM, -DB_COUNTER_SEM_INCR, semflag)))
+		/* Always set IPC_NOWAIT for counter decrement. In the rare case where the counter is already zero, is it better
+		 * to handle the error than it is to wait indefinitely for another process to wake us up.
+		 */
+		if (0 != (save_errno = do_semop(udi->ftok_semid, DB_COUNTER_SEM, -DB_COUNTER_SEM_INCR, (SEM_UNDO | IPC_NOWAIT))))
 		{
 			GTM_SEM_CHECK_EINVAL(TREF(gtm_environment_init), save_errno, udi);
 			ISSUE_CRITSEMFAIL_AND_RETURN(reg, "semop()", save_errno);
diff --git a/sr_unix/ftok_sems.h b/sr_unix/ftok_sems.h
index 97c753a..ff53dc3 100755
--- a/sr_unix/ftok_sems.h
+++ b/sr_unix/ftok_sems.h
@@ -23,6 +23,8 @@ boolean_t ftok_sem_get2(gd_region *reg, boolean_t *stacktrace_time, boolean_t *t
 			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_get_common(gd_region *reg, boolean_t incr_cnt, int project_id, boolean_t immediate, boolean_t *stacktrace_time,
+				boolean_t *timedout, semwait_status_t *retstat, boolean_t *bypass, boolean_t *ftok_counter_halted);
 boolean_t ftok_sem_lock(gd_region *reg, boolean_t immediate);
 boolean_t ftok_sem_release(gd_region *reg, boolean_t decr_cnt, boolean_t immediate);
 
diff --git a/sr_unix/gdeverif.m b/sr_unix/gdeverif.m
index af0e7ff..dd7ec9d 100755
--- a/sr_unix/gdeverif.m
+++ b/sr_unix/gdeverif.m
@@ -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	;
@@ -17,6 +17,7 @@ ALL()	;external
 	s gqual="REGION" d ALLREG,usereg
 	s gqual="SEGMENT" d ALLSEG,useseg
 	d ALLTEM
+	s:('verified)&('$zstatus) $zstatus=gdeerr("VERIFY")
 	zm gdeerr("VERIFY"):$s(verified:"OK",1:"FAILED") w !
 	q verified
 
diff --git a/sr_unix/gds_rundown.c b/sr_unix/gds_rundown.c
index 5f029c9..b0377ba 100644
--- a/sr_unix/gds_rundown.c
+++ b/sr_unix/gds_rundown.c
@@ -165,6 +165,7 @@ int4 gds_rundown(boolean_t cleanup_udi)
 	sgmnt_addrs		*baseDBcsa;
 	node_local_ptr_t	baseDBnl;
 	sgm_info		*si;
+	DEBUG_ONLY(boolean_t	orig_we_are_last_writer = FALSE);
 
 	jnl_status = 0;
 	reg = gv_cur_region;			/* Local copy */
@@ -484,8 +485,8 @@ int4 gds_rundown(boolean_t cleanup_udi)
 			if (!was_crit)
 				grab_crit(reg);
 			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"),
+			BG_TRACE_PRO_ANY(csa, wcb_gds_rundown1);
+                        send_msg_csa(CSA_ARG(csa) VARLSTCNT(8) ERR_WCBLOCKED, 6, LEN_AND_LIT("wcb_gds_rundown1"),
 				     process_id, &csa->ti->curr_tn, DB_LEN_STR(reg));
 			csa->wbuf_dqd = 0;
 			wcs_recover(reg);
@@ -519,17 +520,34 @@ int4 gds_rundown(boolean_t cleanup_udi)
 			}
 			/* Note WCSFLU_SYNC_EPOCH ensures the epoch is synced to the journal and indirectly
 			 * 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.
+			 * "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
+			if (!cnl->remove_shm)
+			{	/* If "wcs_flu" call fails, then we should not remove shm or reset anything in the db fileheader.
+				 * So reset "we_are_last_writer" variable itself as that makes it more safer to fall through to
+				 * the cleanup code below. Before doing so, take a copy for debugging purposes.
+				 */
+				DEBUG_ONLY(orig_we_are_last_writer = TRUE;)
+				we_are_last_writer = FALSE;
+				/* Since "wcs_flu" failed, set wc_blocked to TRUE if not already set. */
+				if (!cnl->wc_blocked)
+				{
+					SET_TRACEABLE_VAR(cnl->wc_blocked, TRUE);
+					BG_TRACE_PRO_ANY(csa, wcb_gds_rundown2);
+					send_msg_csa(CSA_ARG(csa) VARLSTCNT(8) ERR_WCBLOCKED, 6,
+							LEN_AND_LIT("wcb_gds_rundown2"), process_id, &csa->ti->curr_tn,
+							DB_LEN_STR(reg));
+				}
+			}
+			/* "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
+			/* 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.
 			 */
@@ -546,10 +564,10 @@ int4 gds_rundown(boolean_t cleanup_udi)
 			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() */
+			/* 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 */
+			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))
@@ -566,6 +584,12 @@ int4 gds_rundown(boolean_t cleanup_udi)
                                 assert(FALSE);
                                 COMPSWAP_UNLOCK(&jbp->io_in_prog_latch, process_id, 0, LOCK_AVAILABLE, 0);
                         }
+			/* If we are last writer, it is possible cnl->remove_shm is set to FALSE from the "wcs_flu" call
+			 * above (e.g. we are source server and "wcs_flu" noticed a phase2 commit that need to be cleaned up
+			 * which needs a "wcs_recover" call but that is a no-op for the source server). So check that
+			 * additionally. Thankfully "we_are_last_writer" would have already factored that into account above
+			 * ("we_are_last_writer && cnl->remove_shm" code block above). So no additional check needed below.
+			 */
 			if ((((NOJNL != jpc->channel) && !JNL_FILE_SWITCHED(jpc))
 			     || 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
@@ -579,7 +603,7 @@ int4 gds_rundown(boolean_t cleanup_udi)
 					grab_crit(reg);
 				if (JNL_ENABLED(csd))
 				{
-					SET_GBL_JREC_TIME; /* jnl_ensure_open/jnl_put_jrt_pini/pfin/jnl_file_close all need it */
+					SET_GBL_JREC_TIME; /* jnl_ensure_open/jnl_write_pini/pfin/jnl_file_close all need it */
 					/* 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 as that could write
 					 * journal records (if it decides to switch to a new journal file).
@@ -587,19 +611,20 @@ int4 gds_rundown(boolean_t cleanup_udi)
 					ADJUST_GBL_JREC_TIME(jgbl, jbp);
 					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
+					{	/* 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
 						 * since we are the last writer. So, just close the journal.
 						 * If the freeaddr == post_epoch_freeaddr, wcs_flu may have skipped writing
 						 * 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
+							|| ((jbp->freeaddr == jbp->post_epoch_freeaddr)
+								&& (jbp->freeaddr == jbp->rsrv_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);
+							jnl_write_pfin(csa);
 							wrote_pfin = TRUE;
 						} else
 							wrote_pfin = FALSE;
@@ -614,6 +639,7 @@ int4 gds_rundown(boolean_t cleanup_udi)
 							else if (SS_NORMAL == (jnl_status = jnl_flush(reg)))
 							{
 								assert(jbp->freeaddr == jbp->dskaddr);
+								assert(jbp->freeaddr == jbp->rsrv_freeaddr);
 								jnl_fsync(reg, jbp->dskaddr);
 								assert(jbp->fsync_dskaddr == jbp->dskaddr);
 							} else
@@ -650,12 +676,15 @@ int4 gds_rundown(boolean_t cleanup_udi)
 			if (!was_crit)
 				grab_crit(reg);			/* To satisfy crit requirement in fileheader_sync() */
 			memset(csd->machine_name, 0, MAX_MCNAMELEN); /* clear the machine_name field */
-			if (!have_standalone_access && we_are_last_user)
-			{	/* mupip_exit_handler will do this after mur_close_file */
-				csd->semid = INVALID_SEMID;
+			if (we_are_last_user)
+			{
 				csd->shmid = INVALID_SHMID;
-				csd->gt_sem_ctime.ctime = 0;
 				csd->gt_shm_ctime.ctime = 0;
+				if (!have_standalone_access)
+				{	/* "mupip_exit_handler" will delete semid later in "mur_close_file"-->"db_ipcs_reset" */
+					csd->semid = INVALID_SEMID;
+					csd->gt_sem_ctime.ctime = 0;
+				}
 			}
 			fileheader_sync(reg);
 			if (!was_crit)
@@ -693,13 +722,16 @@ int4 gds_rundown(boolean_t cleanup_udi)
 	 * any timers, cancel them BEFORE setting reg->open to FALSE (assert in wcs_clean_dbsync relies on this).
 	 */
 	CANCEL_DB_TIMERS(reg, csa, canceled_dbsync_timer);
-	if (reg->read_only && we_are_last_user && !have_standalone_access && cnl->remove_shm)
+	if (reg->read_only && we_are_last_user && 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;
+		if (!have_standalone_access)
+		{	/* "mupip_exit_handler" will delete semid later in "mur_close_file"-->"db_ipcs_reset" */
+			db_ipcs.semid = INVALID_SEMID;
+			db_ipcs.gt_sem_ctime = 0;
+		}
 		db_ipcs.fn_len = seg->fname_len;
 		memcpy(db_ipcs.fn, seg->fname, seg->fname_len);
 		db_ipcs.fn[seg->fname_len] = 0;
@@ -728,7 +760,7 @@ int4 gds_rundown(boolean_t cleanup_udi)
 		 * 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
+		 * "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);
@@ -812,7 +844,7 @@ int4 gds_rundown(boolean_t cleanup_udi)
 	ipc_deleted = FALSE;
 	/* If we are the very last user, remove shared storage id and the semaphores */
 	if (we_are_last_user)
-	{	/* remove shared storage, only if last writer to rundown did a successful wcs_flu() */
+	{	/* remove shared storage, only if last writer to rundown did a successful "wcs_flu" */
 		assert(!vermismatch);
 		if (remove_shm)
 		{
@@ -822,8 +854,8 @@ int4 gds_rundown(boolean_t cleanup_udi)
 					      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
-			 * mur_close_files())
+			/* mupip recover/rollback don't release the semaphore here, but do it later in "db_ipcs_reset"
+			 * (invoked from "mur_close_files")
 			 */
 			if (!have_standalone_access)
 			{
@@ -929,6 +961,7 @@ int4 gds_rundown(boolean_t cleanup_udi)
 			{
 				PROBE_FREEUP_BUDDY_LIST(si->format_buff_list);
 				PROBE_FREEUP_BUDDY_LIST(si->jnl_list);
+				FREE_JBUF_RSRV_STRUCT(si->jbuf_rsrv_ptr);
 			}
 			PROBE_FREEUP_BUDDY_LIST(si->recompute_list);
 			PROBE_FREEUP_BUDDY_LIST(si->new_buff_list);
@@ -954,11 +987,6 @@ int4 gds_rundown(boolean_t cleanup_udi)
 		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);
diff --git a/sr_unix/gdsfilext.c b/sr_unix/gdsfilext.c
index 6859405..5aead7f 100644
--- a/sr_unix/gdsfilext.c
+++ b/sr_unix/gdsfilext.c
@@ -110,27 +110,6 @@ error_def(ERR_WAITDSKSPACE);
 
 OS_PAGE_SIZE_DECLARE
 
-#if !defined(__sun) && !defined(__hpux)
-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;
-
-	/* Attempt to fallocate 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 */
-	do
-	{
-		if ((to_wait == cs_data->wait_disk_space) || (to_wait % to_msg == 0))
-			ISSUE_WAITDSKSPACE(to_wait, wait_period, send_msg_csa);
-		hiber_start(1000);
-		to_wait--;
-		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, int blk_size, off_t new_eof);
 STATICFNDEF int extend_wait_for_write(unix_db_info *udi, int blk_size, off_t new_eof)
 {
@@ -156,12 +135,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;
-	int			result, save_errno, status;
+	int			fd, result, save_errno, status, to_msg, to_wait, wait_period;
 	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, new_size;
+	off_t			new_eof, new_size, old_size;
 	trans_num		curr_tn;
 	unix_db_info		*udi;
 	inctn_opcode_t		save_inctn_opcode;
@@ -187,9 +166,6 @@ uint4	 gdsfilext(uint4 blocks, uint4 filesize, boolean_t trans_in_prog)
 	   overflow and end up doing silly things.
 	*/
 	assert((blocks <= (MAXTOTALBLKS(cs_data) - cs_data->trans_hist.total_blks)) || WBTEST_ENABLED(WBTEST_FILE_EXTEND_ERROR));
-#	if defined(__sun) || defined(__hpux)
-	cs_data->defer_allocate = TRUE;
-#	endif
 	if (!blocks && (cs_data->defer_allocate || (TRANS_IN_PROG_TRUE == trans_in_prog)))
 		return (uint4)(NO_FREE_SPACE); /* should this be changed to show extension not enabled ? */
 	bplmap = cs_data->bplmap;
@@ -385,25 +361,42 @@ 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->start_vbn) + ((off_t)new_total * cs_data->blk_size);
-#	if !defined(__sun) && !defined(__hpux)
 	if (!cs_data->defer_allocate)
 	{
 		new_size = new_eof + cs_data->blk_size;
-		save_errno = posix_fallocate(udi->fd, 0, new_size);
+		old_size = new_blocks ? BLK_ZERO_OFF(cs_data->start_vbn) + ((off_t)old_total * cs_data->blk_size) : 0;
+		fd = udi->fd;
+		/* There seems to be a discrepancy between the manpage for posix_fallocate and the actual usage;
+		 * if you try to reserve space, it checks "current_size + len", versus "offset + len". This means that if
+		 * the file is more than half the size of the partition, the next posix_fallocate will fail
+		 * for a 0 increase use the documented way
+		 */
+		save_errno = posix_fallocate(fd, old_size, new_size - old_size);
 		DEBUG_ONLY(first_save_errno = save_errno);
 		if ((ENOSPC == save_errno) && IS_GTM_IMAGE)
-			save_errno = extend_wait_for_fallocate(udi, new_size);
+		{
+			/* Attempt to fallocate 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 */
+			do
+			{
+				if ((to_wait == cs_data->wait_disk_space) || (to_wait % to_msg == 0))
+					ISSUE_WAITDSKSPACE(to_wait, wait_period, send_msg_csa);
+				hiber_start(1000);
+				to_wait--;
+				save_errno = posix_fallocate(fd, old_size, new_size - old_size);
+			} while ((to_wait > 0) && (ENOSPC == save_errno));
+		}
 		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);
+					save_errno);
 			return (uint4)(NO_FREE_SPACE);
 		}
 	}
-#	endif
 	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, cs_data->blk_size, new_eof);
@@ -430,7 +423,7 @@ uint4	 gdsfilext(uint4 blocks, uint4 filesize, boolean_t trans_in_prog)
 		{
 			GDSFILEXT_CLNUP;
 			send_msg_csa(CSA_ARG(cs_addrs) VARLSTCNT(8) ERR_DBFILERR, 5,
-						RTS_ERROR_LITERAL("fsync1()"), CALLFROM, status);
+				RTS_ERROR_LITERAL("fsync1()"), CALLFROM, status);
 			return (uint4)(NO_FREE_SPACE);
 		}
 	}
@@ -442,7 +435,7 @@ uint4	 gdsfilext(uint4 blocks, uint4 filesize, boolean_t trans_in_prog)
 	DEBUG_ONLY(prev_extend_blks_to_upgrd = cs_data->blks_to_upgrd;)
 	/* inctn_detail.blks_to_upgrd_delta holds the increase in "csd->blks_to_upgrd" due to the file extension */
 	inctn_detail.blks2upgrd_struct.blks_to_upgrd_delta =
-			(IS_GDS_BLK_DOWNGRADE_NEEDED(cs_data->desired_db_format) ? new_bit_maps : 0);
+		(IS_GDS_BLK_DOWNGRADE_NEEDED(cs_data->desired_db_format) ? new_bit_maps : 0);
 	if (JNL_ENABLED(cs_data))
 	{
 		save_inctn_opcode = inctn_opcode;
@@ -451,7 +444,7 @@ uint4	 gdsfilext(uint4 blocks, uint4 filesize, boolean_t trans_in_prog)
 		else
 			inctn_opcode = inctn_gdsfilext_gtm;
 		if (0 == jpc->pini_addr)
-			jnl_put_jrt_pini(cs_addrs);
+			jnl_write_pini(cs_addrs);
 		jnl_write_inctn_rec(cs_addrs);
 		inctn_opcode = save_inctn_opcode;
 		/* Harden INCTN to disk before updating/flushing database. This will ensure that any positive adjustment to the
@@ -575,6 +568,6 @@ uint4	 gdsfilext(uint4 blocks, uint4 filesize, boolean_t trans_in_prog)
 	INCR_GVSTATS_COUNTER(cs_addrs, cs_addrs->nl, n_db_extends, 1);
 	if (!gtm_dbfilext_syslog_disable)
 		send_msg_csa(CSA_ARG(cs_addrs) VARLSTCNT(7) ERR_DBFILEXT, 5, DB_LEN_STR(gv_cur_region), blocks, new_total,
-				&curr_tn);
+			&curr_tn);
 	return (SS_NORMAL);
 }
diff --git a/sr_unix/get_command_line.c b/sr_unix/get_command_line.c
index 8c14ad0..b3e2141 100755
--- a/sr_unix/get_command_line.c
+++ b/sr_unix/get_command_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	*
@@ -16,6 +17,7 @@
 
 #include "stringpool.h"
 #include "get_command_line.h"
+#include "restrict.h"
 
 GBLREF spdesc		stringpool;
 GBLREF int 		cmd_cnt;
@@ -36,6 +38,12 @@ void get_command_line(mval *result, boolean_t zcmd_line)
 	int		first_item, len, word_cnt;
 	unsigned char	*cp;
 
+	if (RESTRICTED(zcmdline))
+	{
+		result->mvtype = MV_STR;
+		result->str.len = result->str.char_len = 0;
+		return;
+	}
 	result->mvtype = 0; /* so stp_gcol, if invoked below, can free up space currently occupied by this to-be-overwritten mval */
 	len = -1;							/* to compensate for no space at the end */
 	if (cmd_cnt > 1)
diff --git a/sr_unix/go_load.c b/sr_unix/go_load.c
index 3b156d1..da12c78 100644
--- a/sr_unix/go_load.c
+++ b/sr_unix/go_load.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	*
@@ -58,6 +58,9 @@ GBLREF io_pair		io_curr_device;
 GBLREF sgmnt_addrs	*cs_addrs;
 GBLREF spdesc		stringpool;
 
+LITREF	mval		literal_notimeout;
+LITREF	mval		literal_zero;
+
 error_def(ERR_LOADCTRLY);
 error_def(ERR_LOADEOF);
 error_def(ERR_LOADFILERR);
@@ -304,7 +307,7 @@ int go_get(char **in_ptr, int max_len, uint4 max_rec_size)
 	/* one-time only reads if in TP to avoid TPNOTACID, otherwise use untimed reads */
 	for (ret_len = 0; ; )
 	{
-		op_read(&val, dollar_tlevel ? 0 : NO_M_TIMEOUT);
+		op_read(&val, (mval *)(dollar_tlevel ? &literal_zero : &literal_notimeout));
 		rd_len = val.str.len;
 		if ((0 == rd_len) && io_curr_device.in->dollar.zeof)
 		{
diff --git a/sr_unix/grab_latch.c b/sr_unix/grab_latch.c
index ffafef0..77c513f 100644
--- a/sr_unix/grab_latch.c
+++ b/sr_unix/grab_latch.c
@@ -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	*
@@ -41,6 +41,7 @@ boolean_t grab_latch(sm_global_latch_ptr_t latch, int max_timeout_in_secs)
 	ABS_TIME	cur_time, end_time, remain_time;
 	int		maxspins, retries, spins;
 	int4		max_sleep_mask;
+	boolean_t	skip_time_calc;
 
 	assert(process_id == getpid());	/* Make sure "process_id" global variable is reliable (used below in an assert) */
 	if (process_id == latch->u.parts.latch_pid)
@@ -48,12 +49,16 @@ boolean_t grab_latch(sm_global_latch_ptr_t latch, int max_timeout_in_secs)
 		assert(FALSE);	/* Don't expect caller to call us if we hold the lock already. in pro be safe and return */
 		return TRUE;
 	}
-	sys_get_curr_time(&cur_time);
-	add_int_to_abs_time(&cur_time, max_timeout_in_secs * 1000, &end_time);
-	remain_time.at_sec = 0;		/* ensure one try */
+	skip_time_calc = !max_timeout_in_secs || (GRAB_LATCH_INDEFINITE_WAIT == max_timeout_in_secs);
+	if (!skip_time_calc)
+	{
+		sys_get_curr_time(&cur_time);
+		add_int_to_abs_time(&cur_time, max_timeout_in_secs * 1000, &end_time);
+		remain_time.at_sec = 0;		/* ensure one try */
+	}
 	/* Define number of hard-spins the inner loop does */
 	maxspins = num_additional_processors ? MAX_LOCK_SPINS(LOCK_SPINS, num_additional_processors) : 1;
-	for (retries = 1; 0 <= remain_time.at_sec ; retries++)
+	for (retries = 1; ; retries++)
 	{
 		++fast_lock_count;	/* Disable interrupts (i.e. wcs_stale) for duration to avoid potential deadlocks */
 		for (spins = maxspins; spins > 0 ; spins--)
@@ -67,9 +72,19 @@ boolean_t grab_latch(sm_global_latch_ptr_t latch, int max_timeout_in_secs)
 			}
 		}
 		--fast_lock_count;
-		REST_FOR_LATCH(latch, USEC_IN_NSEC_MASK, retries);
-		sys_get_curr_time(&cur_time);
-		remain_time = sub_abs_time(&end_time, &cur_time);
+		if (!max_timeout_in_secs)
+			break;
+		if (!skip_time_calc)
+		{
+			REST_FOR_LATCH(latch, USEC_IN_NSEC_MASK, retries);
+			sys_get_curr_time(&cur_time);
+			remain_time = sub_abs_time(&end_time, &cur_time);
+			if (0 > remain_time.at_sec)
+				break;
+		} else
+		{	/* Indefinite wait for lock. Periodically check if latch is held by dead pid. If so get it back. */
+			SLEEP_FOR_LATCH(latch, retries);
+		}
 	}
 	assert(0 <= fast_lock_count);
 	assert(FALSE);
diff --git a/sr_unix/gtm_env_init_sp.c b/sr_unix/gtm_env_init_sp.c
index 8442819..6d8161e 100755
--- a/sr_unix/gtm_env_init_sp.c
+++ b/sr_unix/gtm_env_init_sp.c
@@ -180,7 +180,7 @@ void	gtm_env_init_sp(void)
 	/* 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, GTM_PATH_MAX, do_sendmsg_on_log2long)))
+	if ((SS_NORMAL != (status = TRANS_LOG_NAME(&val, &trans, buf, GTM_PATH_MAX, do_sendmsg_on_log2long))) || (0 == trans.len))
 	{	/* Nothing for $gtm_tmp either - use DEFAULT_GTM_TMP which is already a string */
 		MEMCPY_LIT(buf, DEFAULT_GTM_TMP);
 		trans.addr = buf;
@@ -209,7 +209,7 @@ void	gtm_env_init_sp(void)
 #	ifdef GTM_TRIGGER
 	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)))
+	if ((SS_NORMAL == (status = TRANS_LOG_NAME(&val, &trans, buf, SIZEOF(buf), do_sendmsg_on_log2long))) && (0 < trans.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);
@@ -341,7 +341,7 @@ void	gtm_env_init_sp(void)
 	/* 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, GTM_PATH_MAX, do_sendmsg_on_log2long)))
+	if ((SS_NORMAL == (status = TRANS_LOG_NAME(&val, &trans, buf, GTM_PATH_MAX, do_sendmsg_on_log2long))) && (0 < trans.len))
 	{
 		assert(GTM_PATH_MAX > trans.len);
 		(TREF(gtm_custom_errors)).addr = malloc(trans.len + 1); /* +1 for '\0'; This memory is never freed */
@@ -356,7 +356,7 @@ void	gtm_env_init_sp(void)
 	/* Initialize which ever error trap we are using (ignored in the utilities except the update process) */
 	val.addr = GTM_ETRAP;
 	val.len = SIZEOF(GTM_ETRAP) - 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, SIZEOF(buf), do_sendmsg_on_log2long))) && (0 < trans.len))
 	{
 		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);
@@ -372,7 +372,7 @@ void	gtm_env_init_sp(void)
 	/* Initiaalize $ZSTEP fro $gtm_zstep enviroment variable. Default value is initailzed in gbldefs.c */
 	val.addr = GTM_ZSTEP;
 	val.len = SIZEOF(GTM_ZSTEP) - 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, SIZEOF(buf), do_sendmsg_on_log2long))) && (0 < 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);
@@ -397,7 +397,8 @@ void	gtm_env_init_sp(void)
 		{	/* 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, GTM_PATH_MAX, do_sendmsg_on_log2long)))
+			if ((SS_NORMAL != (status = TRANS_LOG_NAME(&val, &trans, buf, GTM_PATH_MAX, do_sendmsg_on_log2long)))
+					|| (0 < trans.len))
 			{	/* 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;
@@ -572,14 +573,16 @@ void	gtm_env_init_sp(void)
 	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)))
+	if ((SS_NORMAL != (status = TRANS_LOG_NAME(&val, &trans, buf, MAX_STATSDIR_LEN, do_sendmsg_on_log2long)))
+			|| (0 == trans.len))
 	{	/* 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)))
+		if ((SS_NORMAL != (status = TRANS_LOG_NAME(&val, &trans, buf, MAX_STATSDIR_LEN, do_sendmsg_on_log2long)))
+				|| (0 == trans.len))
 		{	/* Nothing for $gtm_tmp - use DEFAULT_GTM_TMP instead */
 			trans.addr = DEFAULT_GTM_TMP;
 			trans.len = SIZEOF(DEFAULT_GTM_TMP) - 1;
diff --git a/sr_unix/gtm_exit_handler.c b/sr_unix/gtm_exit_handler.c
index df1de36..1e6ada5 100755
--- a/sr_unix/gtm_exit_handler.c
+++ b/sr_unix/gtm_exit_handler.c
@@ -54,8 +54,13 @@ 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;
+GBLREF	volatile int4		fast_lock_count;
 GBLREF	boolean_t		skip_exit_handler;
 GBLREF 	boolean_t		is_tracing_on;
+#ifdef DEBUG
+GBLREF 	boolean_t		stringpool_unusable;
+GBLREF 	boolean_t		stringpool_unexpandable;
+#endif
 
 enum rundown_state
 {
@@ -73,6 +78,8 @@ static	enum rundown_state	attempting;
 GBLREF	int			process_exiting;
 #endif
 
+LITREF	mval		literal_notimeout;
+
 /* This macro is a framework to help perform ONE type of rundown (e.g. db or lock or io rundown etc.).
  * "gtm_exit_handler" invokes this macro for each type of rundown that is needed and passes appropriate
  * parameters to indicate the detail needed for each rundown.
@@ -117,9 +124,8 @@ GBLREF	int			process_exiting;
 	 */												\
 	secshr_db_clnup(NORMAL_TERMINATION);								\
 	zcall_halt();											\
-	op_lkinit();											\
 	op_unlock();											\
-	op_zdeallocate(NO_M_TIMEOUT);									\
+	op_zdeallocate((mval *)&literal_notimeout);									\
 }
 
 #define	IO_RUNDOWN_MACRO											\
@@ -170,6 +176,14 @@ void gtm_exit_handler(void)
 	attempting = rundown_state_lock;
 	actual_exi_condition = 0;
 	ESTABLISH_NORET(exi_ch, error_seen);	/* "error_seen" is initialized inside this macro */
+#ifdef DEBUG
+	if (WBTEST_ENABLED(WBTEST_CRASH_SHUTDOWN_EXPECTED) && (TRUE == TREF(statshare_opted_in)))
+	{	/* Forced to FALSE when killing processes and we may need to rundown statsdbs */
+		stringpool_unusable = FALSE;
+		stringpool_unexpandable = FALSE;
+		fast_lock_count = 0;
+	}
+#endif
 	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 */
diff --git a/sr_unix/gtm_getpwuid.c b/sr_unix/gtm_getpwuid.c
index 07810cf..69199d6 100644
--- a/sr_unix/gtm_getpwuid.c
+++ b/sr_unix/gtm_getpwuid.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	*
@@ -15,6 +15,8 @@
 #include "gtm_unistd.h"
 #include "gtm_pwd.h"
 #include "gtm_signal.h"	/* for SIGPROCMASK */
+#include "gtm_string.h"
+#include "wbox_test_init.h"
 
 #undef	getpwuid	/* since we are going to use the system level "getpwuid" function, undef the alias to "gtm_getpwuid" */
 
@@ -28,8 +30,11 @@ GBLREF	struct		passwd getpwuid_struct;	/* cached copy of "getpwuid" to try avoid
  */
 struct passwd	*gtm_getpwuid(uid_t uid)
 {
+	struct passwd	temp_passwd;
 	struct passwd	*retval;
 	sigset_t	savemask;
+	char		*buff;
+	size_t		buff_size;
 	int		rc;
 	DEBUG_ONLY(static boolean_t	first_time = TRUE;)
 
@@ -39,14 +44,33 @@ struct passwd	*gtm_getpwuid(uid_t uid)
 		assert(blocksig_initialized);	/* the set of blocking signals should be initialized at process startup */
 		if (blocksig_initialized)	/* In pro, dont take chances and handle case where it is not initialized */
 			SIGPROCMASK(SIG_BLOCK, &block_sigsent, &savemask, rc);
-		retval = getpwuid(uid);
+		buff_size = sysconf(_SC_GETPW_R_SIZE_MAX);
+		if (-1 == buff_size)
+			buff_size = 2048;
+		buff = malloc(buff_size);
+		if (NULL == buff)
+		{
+			return NULL;
+		}
+		getpwuid_r(uid, &temp_passwd, buff, buff_size, &retval);
 		if (blocksig_initialized)
 			SIGPROCMASK(SIG_SETMASK, &savemask, NULL, rc);
 		if (NULL == retval)
 			return NULL;	/* error or "uid" record not found */
-		/* Cache return from "getpwuid" call and avoid future calls to this function */
 		getpwuid_struct = *retval;
-		DEBUG_ONLY(first_time = FALSE;)
+		/* Cache return from "getpwuid" call and avoid future calls to this function */
+#ifdef DEBUG
+		if (gtm_white_box_test_case_enabled &&
+			(WBTEST_GETPWUID_CHECK_OVERWRITE == gtm_white_box_test_case_number))
+		{
+			/* White box test case for the issue GTM-8415. getpwuid_struct should not
+		   	overwrite by calling getpwuid */
+			/* uid 1 is a daemon process id */
+			retval = getpwuid((uid_t)1);
+			assert(STRCMP(getpwuid_struct.pw_name, retval->pw_name));
+		}
+		first_time = FALSE;
+#endif
 	}
 	return &getpwuid_struct;
 }
diff --git a/sr_unix/gtm_icu.c b/sr_unix/gtm_icu.c
index b3cd6b9..1dafb51 100755
--- a/sr_unix/gtm_icu.c
+++ b/sr_unix/gtm_icu.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	*
@@ -162,9 +162,9 @@ static boolean_t parse_gtm_icu_version(char *icu_ver_buf, int len, char *icusymv
 	int4		major_ver, minor_ver;
 	int		i;
 
-	if (NULL == icu_ver_buf)
+	if ((NULL == icu_ver_buf) || (0 == len))
 		return FALSE;	/* empty string */
-	
+
 	/* Deconstruct the two known forms of gtm_icu_version "[0-9].[0-9]" and "[0-9][0-9]" ignoring trailing values */
 	ptr = icu_ver_buf;
 	if (-1 == (major_ver = asc2i((uchar_ptr_t)ptr++, 1)))
@@ -325,7 +325,8 @@ void gtm_icu_init(void)
 			buflen = 0;
 			/* real_path = /usr/local/lib64/libicuio36.0.a */
 			ptr = basename(real_path);
-			SNPRINTF(buf, ICU_LIBNAME_LEN, "%s(%s", real_path, ptr); /* buf = /usr/local/lib64/libicuio36.0.a(libicuio36.0.a */
+			/* buf = /usr/local/lib64/libicuio36.0.a(libicuio36.0.a */
+			SNPRINTF(buf, ICU_LIBNAME_LEN, "%s(%s", real_path, ptr);
 			buflen += (STRLEN(real_path) + STRLEN(ptr) + 1);
 			ptr = strrchr(buf, '.');
 			strcpy(ptr, ".so)");			/* buf = /usr/local/lib64/libicuio36.0.a(libicuio36.0.so) */
diff --git a/sr_unix/gtm_ipc.h b/sr_unix/gtm_ipc.h
old mode 100755
new mode 100644
index 9fa37ef..7a9eaff
--- a/sr_unix/gtm_ipc.h
+++ b/sr_unix/gtm_ipc.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	*
@@ -15,6 +15,7 @@
 #define GTM_IPCH
 
 #include <sys/ipc.h>
+#include "gtm_fcntl.h"  /* Needed for AIX's silly open to open64 translations (open used in JNLPOOL_CLEAR_FIELDS macro) */
 
 #ifdef __MVS__
 /* For shmget with __IPC_MEGA or _LP64 */
@@ -24,18 +25,32 @@
 #define FTOK		gtm_ftok
 #define FTOK_OLD	ftok
 
-#define JNLPOOL_SHMDT(RC, SAVE_ERRNO)				\
+#define	JNLPOOL_CLEAR_FIELDS(JNLPOOL)				\
+{								\
+	GBLREF	boolean_t	pool_init;			\
+								\
+	jnlpool_ctl = JNLPOOL.jnlpool_ctl = NULL;		\
+	JNLPOOL.gtmsrc_lcl_array = NULL;			\
+	JNLPOOL.gtmsource_local_array = NULL;			\
+	JNLPOOL.jnldata_base = NULL;				\
+	JNLPOOL.repl_inst_filehdr = NULL;			\
+	JNLPOOL.jnlpool_dummy_reg->open = FALSE;		\
+	pool_init = FALSE;					\
+}
+
+#define JNLPOOL_SHMDT(JNLPOOL, RC, SAVE_ERRNO)			\
 {								\
 	jnlpool_ctl_ptr_t	save_jnlpool_ctl;		\
 	intrpt_state_t		prev_intrpt_state;		\
 								\
 	SAVE_ERRNO = 0; /* clear any left-over value */		\
 	assert(NULL != jnlpool_ctl);				\
+	assert(jnlpool_ctl == JNLPOOL.jnlpool_ctl);		\
 	DEFER_INTERRUPTS(INTRPT_IN_SHMDT, prev_intrpt_state);	\
-	save_jnlpool_ctl = jnlpool.jnlpool_ctl;			\
-	jnlpool_ctl = jnlpool.jnlpool_ctl = NULL;		\
+	save_jnlpool_ctl = JNLPOOL.jnlpool_ctl;			\
 	RC = SHMDT(save_jnlpool_ctl);				\
 	SAVE_ERRNO = errno;					\
+	JNLPOOL_CLEAR_FIELDS(JNLPOOL);				\
 	ENABLE_INTERRUPTS(INTRPT_IN_SHMDT, prev_intrpt_state);	\
 }
 
diff --git a/sr_unix/gtm_main.c b/sr_unix/gtm_main.c
index 39473b5..f2834b0 100644
--- a/sr_unix/gtm_main.c
+++ b/sr_unix/gtm_main.c
@@ -38,6 +38,8 @@
 #include "io.h"
 #include "common_startup_init.h"
 #include "gtm_threadgbl_init.h"
+#include "job.h"
+#include "restrict.h"
 
 #ifdef UNICODE_SUPPORTED
 #include "gtm_icu_api.h"
@@ -85,6 +87,7 @@ error_def(ERR_CRYPTDLNOOPEN);
 error_def(ERR_CRYPTDLNOOPEN2);
 error_def(ERR_CRYPTINIT);
 error_def(ERR_CRYPTINIT2);
+error_def(ERR_RESTRICTEDOP);
 error_def(ERR_TEXT);
 error_def(ERR_TLSDLLNOOPEN);
 error_def(ERR_TLSINIT);
@@ -144,7 +147,14 @@ int gtm_main (int argc, char **argv, char **envp)
 	if (parse_ret && (EOF != parse_ret))
 		rts_error_csa(CSA_ARG(NULL) VARLSTCNT(4) parse_ret, 2, LEN_AND_STR(cli_err_str));
 	if (cli_present("DIRECT_MODE"))
+	{
+		if (!((ptr = GETENV(CHILD_FLAG_ENV)) && strlen(ptr)) && (RESTRICTED(dmode))) /* note assignment */
+		{	/* first tell them it's a no-no without engaging the condition handling so we keep control */
+			dec_err(VARLSTCNT(3) MAKE_MSG_SEVERE(ERR_RESTRICTEDOP), 1, "mumps -direct");
+			stop_image_no_core();		/* then kill them off without further delay */
+		}
 		invocation_mode = MUMPS_DIRECT;
+	}
 	else if (cli_present("RUN"))
 		invocation_mode = MUMPS_RUN;
 	gtm_chk_dist(argv[0]);
diff --git a/sr_unix/gtm_multi_proc.c b/sr_unix/gtm_multi_proc.c
index 50d3290..2f16b41 100644
--- a/sr_unix/gtm_multi_proc.c
+++ b/sr_unix/gtm_multi_proc.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	*
@@ -46,7 +46,6 @@
 #include "tp.h"
 #include "repl_msg.h"
 #include "gtmsource.h"
-#include "init_secshr_addrs.h"
 #include "mutex.h"
 
 #ifdef DEBUG
@@ -214,8 +213,22 @@ int	gtm_multi_proc(gtm_multi_proc_fnptr_t fnptr, int ntasks, int max_procs,
 				return -1;
 			}
 			if (0 == child_pid)
-			{	/* The child process should operate as a regular process so re-enable interrupts */
+			{	/* The child process should operate as a regular process so re-enable interrupts.
+				 * But before that, set "process_id" to a value different from the parent
+				 * as the ENABLE_INTERRUPTS macro could end up calling
+				 * deferred_signal_handler -> forced_exit_err_display -> gtm_putmsg_csa -> grab_latch
+				 * and grab_latch would fail an assert otherwise.
+				 */
+				getjobnum();    /* set "process_id" to a value different from parent */
+				/* Skip exit handler, as otherwise we would reduce reference counts in database
+				 * shared memory etc. for each forked off process when they go to gds_rundown when
+				 * actually they did not do any db_init (they inherited the db from the parent).
+				 * Do it here instead of in the helper in case enabling interrupts causes us to exit.
+				 */
+				skip_exit_handler = TRUE;
+				DEBUG_ONLY(multi_proc_key_exception = TRUE);	/* Allow error messages without a key */
 				ENABLE_INTERRUPTS(INTRPT_IN_GTM_MULTI_PROC, prev_intrpt_state);
+				DEBUG_ONLY(multi_proc_key_exception = FALSE);
 				gtm_multi_proc_helper();	/* Note: does not return */
 			}
 			mp_hdr->pid[tasknum] = child_pid;
@@ -240,17 +253,10 @@ void	gtm_multi_proc_helper(void)
 	gtm_multi_proc_fnptr_t	fnptr;
 	boolean_t		release_latch;
 
-	getjobnum();    /* set "process_id" to a value different from parent */
 #	ifdef MUR_DEBUG
 	fprintf(stderr, "pid = %d : Started\n", process_id);
 #	endif
-	skip_exit_handler = TRUE;	/* as otherwise we would reduce reference counts in database shared memory etc. for each
-					 * forked off process when they go to gds_rundown when actually they did not do any
-					 * db_init (they inherited the db from the parent).
-					 */
 	/* Do process-level reinitialization of a few things (see gtmrecv.c, gtmsource.c for example usage) */
-	/* Reinvoke secshr related initialization with the child's pid */
-	INVOKE_INIT_SECSHR_ADDRS;
 	/* Re-initialize mutex socket, memory semaphore etc. with child's pid if already done by parent */
 	if (mutex_per_process_init_pid)
 	{
@@ -329,7 +335,7 @@ int	gtm_multi_proc_finish(gtm_multi_proc_fnptr_t finish_fnptr)
 		num_pids_to_wait++;
 	}
 	assert(num_pids_to_wait == max_procs);
-	/* It is possible the child pids terminate in an arbitrary order. In that case, we dont want to be
+	/* It is possible the child pids terminate in an arbitrary order. In that case, we don't want to be
 	 * stuck doing a WAITPID of the first pid when the second pid has finished since it is possible the
 	 * second pid terminated abnormally (e.g. holding a latch) and until we do the WAITPID for that pid
 	 * it would be a defunct pid and "is_proc_alive" calls from the first pid will return the second pid
diff --git a/sr_unix/gtm_permissions.c b/sr_unix/gtm_permissions.c
index 397e412..2c9b3c0 100755
--- a/sr_unix/gtm_permissions.c
+++ b/sr_unix/gtm_permissions.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	*
@@ -27,10 +27,11 @@
 #include "send_msg.h"
 #include "eintr_wrappers.h"
 
+GBLDEF		gid_t		*gid_list = NULL;
+GBLDEF		int		gid_list_len = 0;
+
 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(__MVS__)
 #	define LIBGTMSHR "%s/libgtmshr.dll"
@@ -39,28 +40,40 @@ STATICDEF	int		gid_list_len = 0;
 #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
+void gtm_init_gid_list(void)
+{
+	int	tmp_gid_list_len;
 
+	assert(NULL == 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;
+		}
+	}
+}
+
+/* Search through the supplementary gid list for a match */
+boolean_t	gtm_gid_in_gid_list(gid_t gid)
+{
+	int	i;
+
+	assert(NULL != gid_list);
+	if (NULL == gid_list)
+		return FALSE;
+	for (i = 0; i < gid_list_len; i++)
+		if (gid == gid_list[i])
+			return TRUE;
+	return FALSE;
+}
 /* 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.
@@ -100,12 +113,12 @@ 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;
 
 #	ifdef DEBUG
 	if (WBTEST_HELPOUT_FAILGROUPCHECK == gtm_white_box_test_case_number)
 	{
-		GETGROUPS;
+		if (NULL == gid_list)
+			gtm_init_gid_list();
 		return FALSE;
 	}
 #	endif
@@ -114,13 +127,8 @@ boolean_t gtm_member_group_id(uid_t uid, gid_t gid, struct perm_diag_data *pdd)
 	{	/* 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;
+		/* EUID == uid but check if gid is in any groups associated with the process */
+		return GID_IN_GID_LIST(gid);
 	}
 	/* Get "uid" details */
 	pwd = getpwuid(uid);
diff --git a/sr_unix/gtm_permissions.h b/sr_unix/gtm_permissions.h
index 6c92750..096c3bf 100644
--- a/sr_unix/gtm_permissions.h
+++ b/sr_unix/gtm_permissions.h
@@ -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	*
@@ -15,7 +15,6 @@
 
 #include <mdefsp.h>
 
-
 enum perm_target_types
 {
     PERM_FILE = 0x01,			/* Request permissions for creating a new file */
@@ -51,9 +50,16 @@ error_def(ERR_PERMGENDIAG);
 		(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);
+GBLREF	gid_t		*gid_list;
+GBLREF	int		gid_list_len;
+
+#define GID_IN_GID_LIST(GID)	((NULL == gid_list) ? (gtm_init_gid_list(), gtm_gid_in_gid_list(GID)) : gtm_gid_in_gid_list(GID))
+
+void		gtm_init_gid_list(void);
+boolean_t	gtm_gid_in_gid_list(gid_t);
+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/gtm_rel_quant.h b/sr_unix/gtm_rel_quant.h
index d6809bc..8e3b46e 100644
--- a/sr_unix/gtm_rel_quant.h
+++ b/sr_unix/gtm_rel_quant.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	*
@@ -56,13 +56,26 @@ MBSTART {												\
 		RELQUANT;										\
 } MBEND
 
+/* Sleep/rel_quant <= 1 micro-second every 4 iterations and also perform caslatch check every ~4 seconds */
 #define	REST_FOR_LATCH(LATCH, MAX_SLEEP_MASK, RETRIES)									\
 MBSTART {														\
 	if (0 == (RETRIES & LOCK_SPIN_HARD_MASK))	/* On every so many passes, sleep rather than spinning */	\
 	{														\
 		GTM_REL_QUANT((MAX_SLEEP_MASK));	/* Release processor to holder of lock (hopefully) */		\
 		/* Check if we're due to check for lock abandonment check or holder wakeup */				\
-		if (0 == (RETRIES & (LOCK_CASLATCH_CHKINTVL - 1)))							\
+		if (0 == (RETRIES & (LOCK_CASLATCH_CHKINTVL_USEC - 1)))							\
+			performCASLatchCheck(LATCH, TRUE);								\
+	}														\
+} MBEND
+
+/* Sleep 1 micro-second every 4 iterations and also perform caslatch check every ~4 seconds */
+#define	SLEEP_FOR_LATCH(LATCH, RETRIES)										\
+MBSTART {														\
+	if (0 == (RETRIES & LOCK_SPIN_HARD_MASK))	/* On every so many passes, sleep rather than spinning */	\
+	{														\
+		SLEEP_USEC(1, FALSE);	/* Release processor to holder of lock (hopefully) */				\
+		/* Check if we're due to check for lock abandonment check or holder wakeup */				\
+		if (0 == (RETRIES & (LOCK_CASLATCH_CHKINTVL_USEC - 1)))							\
 			performCASLatchCheck(LATCH, TRUE);								\
 	}														\
 } MBEND
diff --git a/sr_unix/gtm_semutils.c b/sr_unix/gtm_semutils.c
index 8c201d6..60d6fc2 100644
--- a/sr_unix/gtm_semutils.c
+++ b/sr_unix/gtm_semutils.c
@@ -57,7 +57,8 @@ error_def(ERR_TEXT);
 
 
 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)
+				semwait_status_t *retstat, gd_region *reg, boolean_t *bypass, boolean_t *sem_halted,
+				boolean_t incr_cnt)
 {
 	boolean_t			need_stacktrace, indefinite_wait;
 	char				*msgstr;
@@ -75,7 +76,7 @@ boolean_t do_blocking_semop(int semid, enum gtm_semtype semtype, boolean_t *stac
 	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));
+	SET_GTM_SOP_ARRAY(sop, sopcnt, (incr_cnt && (IS_FTOK_SEM || !reg->read_only)), (SEM_UNDO | IPC_NOWAIT));
 	/* 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.
 	 */
@@ -134,7 +135,7 @@ boolean_t do_blocking_semop(int semid, enum gtm_semtype semtype, boolean_t *stac
 					/* If this is a readonly access, we don't increment access semaphore's counter. See
 					 * SET_GTM_SOP_ARRAY definition in gtm_semutils.h and how it is called from db_init().
 					 */
-					if (!(*sem_halted) && (IS_FTOK_SEM || !reg->read_only))
+					if (!(*sem_halted) && incr_cnt && (IS_FTOK_SEM || !reg->read_only))
 					{
 						/* Increase the counter semaphore. */
 						save_errno = do_semop(semid, DB_COUNTER_SEM, DB_COUNTER_SEM_INCR, SEM_UNDO);
diff --git a/sr_unix/gtm_semutils.h b/sr_unix/gtm_semutils.h
index 3d7dd84..2d08276 100644
--- a/sr_unix/gtm_semutils.h
+++ b/sr_unix/gtm_semutils.h
@@ -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	*
@@ -69,7 +69,8 @@ typedef struct semwait_status_struct
 } semwait_status_t;
 
 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);
+				semwait_status_t *status, gd_region *reg, boolean_t *bypass, boolean_t *sem_halted,
+				boolean_t incr_sem);
 
 #define SENDMSG_SEMOP_SUCCESS_IF_NEEDED(STACKTRACE_ISSUED, SEMTYPE)								 \
 {																 \
@@ -85,15 +86,15 @@ boolean_t do_blocking_semop(int semid, enum gtm_semtype semtype, boolean_t *stac
 
 #define DBFILERR_PARAMS(REG)			ERR_DBFILERR, 2, DB_LEN_STR(REG)
 #define CRITSEMFAIL_PARAMS(REG)			ERR_CRITSEMFAIL,2, DB_LEN_STR(REG)
-#define SYSCALL_PARAMS(RETSTAT, OP)		ERR_SYSCALL, 5, LEN_AND_STR(OP), LEN_AND_STR(RETSTAT->module), RETSTAT->line_no
+#define SYSCALL_PARAMS(RETSTAT, OP)		ERR_SYSCALL, 5, LEN_AND_STR(OP), LEN_AND_STR((RETSTAT)->module), (RETSTAT)->line_no
 #define SEMKEYINUSE_PARAMS(UDI)			ERR_SEMKEYINUSE, 1, UDI->key
-#define SEMWT2LONG_PARAMS(REG, RETSTAT, GTM_SEMTYPE, TOT_WAIT_TIME)						\
-						ERR_SEMWT2LONG, 7, process_id, TOT_WAIT_TIME,			\
-							LEN_AND_LIT(GTM_SEMTYPE), DB_LEN_STR(REG), RETSTAT->sem_pid
+#define SEMWT2LONG_PARAMS(REG, RETSTAT, GTM_SEMTYPE, TOT_WAIT_TIME)							\
+						ERR_SEMWT2LONG, 7, process_id, TOT_WAIT_TIME,				\
+							LEN_AND_LIT(GTM_SEMTYPE), DB_LEN_STR(REG), (RETSTAT)->sem_pid
 
 #define GET_OP_STR(RETSTAT, OP)												\
 {															\
-	switch (RETSTAT->op)												\
+	switch ((RETSTAT)->op)												\
 	{														\
 		case op_semget:												\
 			OP = "semget()";										\
@@ -113,45 +114,47 @@ boolean_t do_blocking_semop(int semid, enum gtm_semtype semtype, boolean_t *stac
 	}														\
 }
 
-#define ISSUE_SEMWAIT_ERROR(RETSTAT, REG, UDI, GTM_SEMTYPE)							\
-{														\
+#define ISSUE_SEMWAIT_ERROR(RETSTAT, REG, UDI, GTM_SEMTYPE) SEMWAIT_ERROR_COMMON(RETSTAT, REG, UDI, GTM_SEMTYPE, rts_error_csa)
+#define PRINT_SEMWAIT_ERROR(RETSTAT, REG, UDI, GTM_SEMTYPE) SEMWAIT_ERROR_COMMON(RETSTAT, REG, UDI, GTM_SEMTYPE, gtm_putmsg_csa)
+#define SEMWAIT_ERROR_COMMON(RETSTAT, REG, UDI, GTM_SEMTYPE, REPORT_FN)						\
+MBSTART {														\
 	const char	*op;											\
 	uint4		tot_wait_time;										\
 														\
 	GBLREF uint4	process_id;										\
 														\
-	if (ERR_CRITSEMFAIL == RETSTAT->status2)								\
+	if (ERR_CRITSEMFAIL == (RETSTAT)->status2)								\
 	{													\
-		if (0 == RETSTAT->status1)									\
+		if (0 == (RETSTAT)->status1)									\
 		{												\
 				GET_OP_STR(RETSTAT, op);							\
-				rts_error_csa(CSA_ARG(NULL) VARLSTCNT(16) DBFILERR_PARAMS(REG),			\
+				REPORT_FN(CSA_ARG(NULL) VARLSTCNT(16) DBFILERR_PARAMS(REG),			\
 					CRITSEMFAIL_PARAMS(REG), SYSCALL_PARAMS(RETSTAT, op),			\
-					RETSTAT->save_errno);							\
-		} else if (ERR_SEMKEYINUSE == RETSTAT->status1)							\
+					(RETSTAT)->save_errno);							\
+		} else if (ERR_SEMKEYINUSE == (RETSTAT)->status1)						\
 		{												\
-			rts_error_csa(CSA_ARG(NULL) VARLSTCNT(11) DBFILERR_PARAMS(REG), CRITSEMFAIL_PARAMS(REG),\
+			REPORT_FN(CSA_ARG(NULL) VARLSTCNT(11) DBFILERR_PARAMS(REG), CRITSEMFAIL_PARAMS(REG),	\
 				SEMKEYINUSE_PARAMS(UDI));							\
 		} else												\
 			assertpro(FALSE);									\
-	} else if (ERR_MAXSEMGETRETRY == RETSTAT->status2)							\
+	} else if (ERR_MAXSEMGETRETRY == (RETSTAT)->status2)							\
 	{													\
-		rts_error_csa(CSA_ARG(NULL) VARLSTCNT(7) DBFILERR_PARAMS(REG), ERR_MAXSEMGETRETRY, 1,		\
+		REPORT_FN(CSA_ARG(NULL) VARLSTCNT(7) DBFILERR_PARAMS(REG), ERR_MAXSEMGETRETRY, 1,		\
 				MAX_SEMGET_RETRIES);								\
-	} else if (ERR_FTOKERR == RETSTAT->status2)								\
+	} else if (ERR_FTOKERR == (RETSTAT)->status2)								\
 	{													\
-		rts_error_csa(CSA_ARG(NULL) VARLSTCNT(9) DBFILERR_PARAMS(REG), ERR_FTOKERR, 2, DB_LEN_STR(REG), \
-				RETSTAT->save_errno);								\
-	} else if (0 == RETSTAT->status2)									\
+		REPORT_FN(CSA_ARG(NULL) VARLSTCNT(9) DBFILERR_PARAMS(REG), ERR_FTOKERR, 2, DB_LEN_STR(REG),	\
+				(RETSTAT)->save_errno);								\
+	} else if (0 == (RETSTAT)->status2)									\
 	{													\
-		assert(ERR_SEMWT2LONG == RETSTAT->status1);							\
-		assert(RETSTAT->sem_pid && (-1 != RETSTAT->sem_pid));						\
+		assert(ERR_SEMWT2LONG == (RETSTAT)->status1);							\
+		assert((RETSTAT)->sem_pid && (-1 != (RETSTAT)->sem_pid));					\
 		tot_wait_time = TREF(dbinit_max_delta_secs);							\
-		rts_error_csa(CSA_ARG(NULL) VARLSTCNT(13) DBFILERR_PARAMS(REG),					\
+		REPORT_FN(CSA_ARG(NULL) VARLSTCNT(13) DBFILERR_PARAMS(REG),					\
 			SEMWT2LONG_PARAMS(REG, RETSTAT, GTM_SEMTYPE, tot_wait_time));				\
 	} else													\
 		assertpro(FALSE);										\
-}
+} MBEND
 
 /* Set the value of semaphore number 2 ( = FTOK_SEM_PER_ID - 1) as GTM_ID. This way, in case of an orphaned
  * semaphore (say, kill -9), MUPIP RUNDOWN will be able to identify GT.M semaphore from the value and will
diff --git a/sr_unix/gtm_startup.c b/sr_unix/gtm_startup.c
index 050ec2b..8d5e6dd 100644
--- a/sr_unix/gtm_startup.c
+++ b/sr_unix/gtm_startup.c
@@ -54,7 +54,6 @@
 #include "ctrlc_handler.h"
 #include "get_page_size.h"
 #include "generic_signal_handler.h"
-#include "init_secshr_addrs.h"
 #include "zcall_package.h"
 #include "getzdir.h"
 #include "getzmode.h"
@@ -142,11 +141,12 @@ void gtm_startup(struct startup_vector *svec)
 	 * 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();
-	static char 	other_mode_buf[] = "OTHER";
+	char		*temp;
 	mstr		log_name;
 	stack_frame 	*frame_pointer_lcl;
+	static char 	other_mode_buf[] = "OTHER";
+	unsigned char	*mstack_ptr;
+	void		gtm_ret_code();
 	DCL_THREADGBL_ACCESS;
 
 	SETUP_THREADGBL_ACCESS;
@@ -184,6 +184,12 @@ void gtm_startup(struct startup_vector *svec)
 		svec->user_strpl_size = STP_MAXINITSIZE;
 	stp_init(svec->user_strpl_size);
 	rts_stringpool = stringpool;
+	(TREF(tpnotacidtime)).mvtype = MV_NM | MV_INT;	/* gtm_env_init set up a numeric value, now there's a stp: string it */
+	MV_FORCE_STRD(&(TREF(tpnotacidtime)));
+	assert(6 >= (TREF(tpnotacidtime)).str.len);
+	temp = malloc((TREF(tpnotacidtime)).str.len);
+	memcpy(temp, (TREF(tpnotacidtime)).str.addr, (TREF(tpnotacidtime)).str.len);
+	(TREF(tpnotacidtime)).str.addr = temp;
 	TREF(compile_time) = FALSE;
 	/* assert that is_replicator and run_time is properly set by gtm_imagetype_init invoked at process entry */
 #	ifdef DEBUG
@@ -206,7 +212,6 @@ void gtm_startup(struct startup_vector *svec)
 	/* mstr_native_align = logical_truth_value(&log_name, FALSE, NULL) ? FALSE : TRUE; */
 	mstr_native_align = FALSE; /* TODO: remove this line and uncomment the above line */
 	getjobname();
-	INVOKE_INIT_SECSHR_ADDRS;
 	getzprocess();
 	getzmode();
 	zcall_init();
diff --git a/sr_unix/gtm_system.c b/sr_unix/gtm_system.c
index cf98d30..09c2f3f 100644
--- a/sr_unix/gtm_system.c
+++ b/sr_unix/gtm_system.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	*
@@ -14,6 +14,7 @@
 #include "gtm_unistd.h"
 #include "gtm_stdlib.h"
 #include "gtm_signal.h"
+#include "gtm_string.h"
 
 #include <sys/wait.h>
 #include <errno.h>
@@ -30,13 +31,17 @@
 	SIGPROCMASK(SIG_SETMASK, &savemask, NULL, RC);	\
 }
 
+error_def(ERR_INVSTRLEN);
+
 int gtm_system(const char *cmdline)
 {
 	struct sigaction	ignore, old_intrpt, old_quit;
+	char			*sh;
 	sigset_t		mask, savemask;
 	pid_t			pid;
 	int			stat;		/* child exit status */
 	int			rc, ret;	/* return value from waitpid */
+	int			len, shlen;
 	intrpt_state_t		prev_intrpt_state;
 	DCL_THREADGBL_ACCESS;
 
@@ -71,6 +76,8 @@ int gtm_system(const char *cmdline)
 	/* Below FORK is not used as interrupts are already disabled at the
 	 * beginning of this function
 	 */
+	sh = GETENV("SHELL");
+	sh = (NULL == sh) || ('\0' == *sh) ? "/bin/sh" : sh;
 	pid = fork(); /* BYPASSOK */
 	if (0 > pid)
 	{
@@ -81,7 +88,8 @@ int gtm_system(const char *cmdline)
 	else if (0 == pid)
 	{
 		RESTOREMASK(rc);
-		execl("/bin/sh", "sh", "-c", cmdline, (char *)0);
+		assert('\0' != *cmdline);
+		execl(sh, sh, "-c", cmdline, NULL);
 		UNDERSCORE_EXIT(127);
 	} else
 	{
diff --git a/sr_unix/gtm_test_install.csh b/sr_unix/gtm_test_install.csh
index 0edf029..1fec02a 100755
--- a/sr_unix/gtm_test_install.csh
+++ b/sr_unix/gtm_test_install.csh
@@ -215,17 +215,21 @@ cp ../test_gtm/sim.m .
 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
+if ($?gtm_icu_version) then
+	# unset gtm_icu_version to test gtmprofile.gtc setting it using icu-config
+	setenv save_icu $gtm_icu_version
+	unsetenv gtm_icu_version
+endif
 # 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
+if ($?save_icu) then
+	# restore saved gtm_icu_version
+	setenv gtm_icu_version $save_icu
+endif
 # 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
diff --git a/sr_unix/gtm_text_alloc.c b/sr_unix/gtm_text_alloc.c
index 1d218e6..df43b7b 100644
--- a/sr_unix/gtm_text_alloc.c
+++ b/sr_unix/gtm_text_alloc.c
@@ -1,6 +1,7 @@
 /****************************************************************
  *								*
- *	Copyright 2007, 2013 Fidelity Information Services, Inc	*
+ * Copyright (c) 2007-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,9 +24,9 @@
 
 #include <sys/types.h>
 #include <sys/mman.h>
-#include <signal.h>
 #include <stddef.h>
 #include <errno.h>
+#include "gtm_signal.h"
 #include "gtm_stdio.h"
 #include "gtm_string.h"
 #include "gtm_stdlib.h"
@@ -162,10 +163,10 @@ void *gtm_text_alloc(size_t size)
 		assert(FALSE);
 		rts_error_csa(CSA_ARG(NULL) VARLSTCNT(5) ERR_MEMORY, 2, tSize, CALLERID, save_errno);
 	}
-	/* On non-allocate related error, give more general error and GTMASSERT */
+	/* On non-allocate related error, give more general error and assertpro(FALSE) */
 	gtm_putmsg_csa(CSA_ARG(NULL) VARLSTCNT(14) ERR_SYSCALL, 5, LEN_AND_LIT("gtm_text_alloc()"), CALLFROM,
 		       save_errno, 0, ERR_TEXT, 3, LEN_AND_LIT("Storage call made from"), CALLERID);
-	GTMASSERT;
+	assertpro(FALSE);
 }
 
 void gtm_text_free(void *addr)
@@ -209,13 +210,13 @@ void gtm_text_free(void *addr)
 		save_errno = errno;										\
 	        if (ENOMEM == save_errno)									\
 		{												\
-			assert(FALSE);										\
+			assert(WBTEST_ENABLED(WBTEST_SKIP_CORE_FOR_MEMORY_ERROR));				\
 			rts_error_csa(CSA_ARG(NULL) VARLSTCNT(5) ERR_MEMORY, 2, rsize, CALLERID, save_errno);  	\
 		}												\
-		/* On non-allocate related error, give more general error and GTMASSERT */			\
+		/* On non-allocate related error, give more general error and assertpro(FALSE) */			\
 		gtm_putmsg_csa(CSA_ARG(NULL) VARLSTCNT(14) ERR_SYSCALL, 5, LEN_AND_LIT("mmap()"), CALLFROM,	\
 			       save_errno, 0, ERR_CALLERID, 3, LEN_AND_LIT("TEXT_ALLOC"), CALLERID);		\
-		GTMASSERT;											\
+		assertpro(FALSE);											\
 	}													\
 }
 #define TEXT_FREE(addr, rsize) 											\
@@ -229,7 +230,7 @@ void gtm_text_free(void *addr)
 		save_errno = errno;										\
 		gtm_putmsg_csa(CSA_ARG(NULL) VARLSTCNT(14) ERR_SYSCALL, 5, LEN_AND_LIT("munmap"), CALLFROM,	\
 			       save_errno, 0, ERR_CALLERID, 3, LEN_AND_LIT("TEXT_FREE"), CALLERID);		\
-		GTMASSERT;											\
+		assertpro(FALSE);											\
 	}													\
 }
 #define STE_FP(p) p->userStorage.links.fPtr
@@ -433,8 +434,8 @@ void *gtm_text_alloc(size_t size)
 	if (gtaSmInitialized)
 	{
 		hdrSize = OFFSETOF(textElem, userStorage);		/* Size of textElem header */
-		GTM64_ONLY(if (MAXUINT4 < (size + hdrSize)) GTMASSERT); /* Only deal with < 4GB requests */
-		NON_GTM64_ONLY(if ((size + hdrSize) < size) GTMASSERT); /* Check for wrap with 32 bit platforms */
+		GTM64_ONLY(if (MAXUINT4 < (size + hdrSize)) assertpro(FALSE)); /* Only deal with < 4GB requests */
+		NON_GTM64_ONLY(if ((size + hdrSize) < size) assertpro(FALSE)); /* Check for wrap with 32 bit platforms */
 		assert(hdrSize < MINTWO);
 
 		fast_lock_count++;
@@ -496,7 +497,7 @@ void gtm_text_free(void *addr)
 	if (process_exiting)	/* If we are exiting, don't bother with frees. Process destruction can do it */
 		return;
 	if (!gtaSmInitialized)	/* Storage must be init'd before can free anything */
-		GTMASSERT;
+		assertpro(FALSE);
 	++fast_lock_count;
 	++gtaSmDepth;	/* Recursion indicator */
 	if (1 < gtaSmDepth)
diff --git a/sr_unix/gtmcrypt_util.c b/sr_unix/gtmcrypt_util.c
index ce84367..65f54ae 100644
--- a/sr_unix/gtmcrypt_util.c
+++ b/sr_unix/gtmcrypt_util.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	*
@@ -96,7 +96,8 @@ GBLDEF gtm_free_fnptr_t			gtm_free_fnptr;
 
 int gc_load_gtmshr_symbols()
 {
-#	ifndef USE_SYSLIB_FUNCS
+/* CYGWIN TODO: This is to fix a linker error. Undo when it is fixed. */
+#	if !defined(USE_SYSLIB_FUNCS) && !defined(__CYGWIN__)
 	gtm_malloc_fnptr = &gtm_malloc;
 	gtm_free_fnptr = &gtm_free;
 #	endif
diff --git a/sr_unix/gtmcrypt_util.h b/sr_unix/gtmcrypt_util.h
index 92efb49..f5a855e 100644
--- a/sr_unix/gtmcrypt_util.h
+++ b/sr_unix/gtmcrypt_util.h
@@ -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	*
@@ -210,7 +210,8 @@
 	SNPRINTF(errptr, end - errptr, "%s", gcry_strerror(ERR));							\
 }
 
-#ifndef USE_SYSLIB_FUNCS
+/* CYGWIN TODO: This is to fix a linker error. Undo when it is fixed. */
+#if !defined(USE_SYSLIB_FUNCS) && !defined(__CYGWIN__)
 #define	MALLOC			(*gtm_malloc_fnptr)
 #define FREE			(*gtm_free_fnptr)
 #else
diff --git a/sr_unix/gtmhelp.m b/sr_unix/gtmhelp.m
index ea0d575..042ba0a 100755
--- a/sr_unix/gtmhelp.m
+++ b/sr_unix/gtmhelp.m
@@ -1,6 +1,7 @@
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;								;
-;	Copyright 2002, 2014 Fidelity Information Services, Inc	;
+; Copyright (c) 2002-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,30 +12,30 @@
 gtmhelp(subtopic,gbldir)
 	;
 	new (gbldir,subtopic)
+	new $zgbldir						; New $zgbldir so it is restored on exit
 	zshow "d":zshow						; to capture original $P state - assumes $P is always subscript 1
 	set IO(1)=$io						; to capture the original $IO
-	use $principal:nocenable				; do as soon as there's hope of undoing it, i.e, after 2 prior lines
+	use $principal:nocenable				; do as soon as there's hope of undoing it, ie, after 2 prior lines
 	set pio=$zwrite($io)					; in case of an early error
 	new $etrap						; also inportant to get in place
-	set $etrap="zgoto "_$zlevel_":error"			; the code below sets up pio to restore the original $P state
+	set $etrap="zgoto "_$zlevel_":error^GTMHELP"		; the code below sets up pio to restore the original $P state
 	set:$io'=IO(1) IO(0)=$io				; now capture $P state - IO(0) means there' a device other than $P
+	; Capture the existing $principal's state to restore on exit
+	set tmp="$principal:("_$select(zshow("D",1)["NOCENE":"no",1:"")_"cenable"
+	set tmp=tmp_":ctrap="_$select(zshow("D",1)["CTRA=":$piece($piece(zshow("D",1),"CTRA=",2)," "),1:"""""")
+	set exception=$zwrite($select(zshow("D",1)["EXCE=""":$piece(zshow("D",1),"EXCE=",2),1:""""""))	; assumes EXCE last
+	set tmp=tmp_":exception="_$extract(exception,3,$length(exception)-2)
+	set pio=tmp_")"
+	; Override the exception handler
 	if zshow("D",1)["TERMINAL" do
- .		set tmp="$principal:("_$select(zshow("D",1)["NOCENE":"no",1:"")_"cenable"
- .		set tmp=tmp_":ctrap="_$select(zshow("D",1)["CTRA=":$piece($piece(zshow("D",1),"CTRA=",2)," "),1:"""""")
- .		set exception=$zwrite($select(zshow("D",1)["EXCE=""":$piece(zshow("D",1),"EXCE=",2),1:""""""))	; assumes EXCE last
- .		set tmp=tmp_":exception="_$extract(exception,3,$length(exception)-2)
- .		set pio=tmp_")"					; USE below relies on $ZLEVEL so it's outside this embedded subrout
- .		quit						; the line below enables routine-private CTRAP for CTRL-C;
-	if  use $principal:(ctrap=$char(3):exception="zgoto "_$zlevel_":again:$zstatus[""CTRAP"","_$zlevel_":error")
-	set %gbldir=$zgbldir
+	. use $principal:(ctrap=$char(3):exception="zgoto "_$zlevel_":again:$zstatus[""CTRAP"","_$zlevel_":error^GTMHELP")
+	else  use $principal:(exception="zgoto "_$zlevel_":error^GTMHELP")
 	set $zgbldir=gbldir
 again	set:$data(COUNT) subtopic=""				; <CTRL-C> comes back to here and clears any topic
 	kill (%gbldir,IO,pio,subtopic)				; X-NEW is evil, but performance is not an issue here
 	set COUNT=0,IO="",NOTFOUND=0				; some initialization
 	do parse(subtopic)					; check for topic passed in
 	for  do display quit:COUNT<0				; drive the real work
-	if ($zsearch(%gbldir)'="") set $zgbldir=%gbldir	; restore caller's global directory
-	else  set $zgbldir=""
 	use @pio,IO(1)						; restore $P state and original $IO
 	quit
 	;
@@ -42,9 +43,9 @@ parse(subtopic)							; organize space-delimited input memes into a topic hierar
 	new (subtopic,NEW,COUNT,TOPIC)
 	set NEW=0
 	for i=1:1:$length(subtopic," ") set x=$piece(subtopic," ",i) if x'="" do
- .		set COUNT=COUNT+1,NEW=NEW+1
- .		set TOPIC(COUNT)=$zconvert(x,"U")
- .		quit
+	. set COUNT=COUNT+1,NEW=NEW+1
+	. set TOPIC(COUNT)=$zconvert(x,"U")
+	. quit
 	quit
 	;
 display								; do the real work
@@ -52,38 +53,38 @@ display								; do the real work
 	if $get(TOPIC(COUNT))="?" set COUNT=COUNT-1		; refresh choices on the same topic (leve)
 	write #
 	if $$MATCH do						; look up the topic
- .		if NOTFOUND do
- ..			write !!,"Sorry, no Documentation on "
- ..			for i=COUNT+1:1:NEW+COUNT write TOPIC(i)," "
- ..			set NOTFOUND=0
- ..			quit
- .		for  set IO=$order(IO(IO),-1) quit:""=IO  do	; if juggling devices, send content to both; do $P 2nd
- ..			use IO(IO)
- ..			for i=1:1:MATCH do print(MATCH(i),i)	; drive out lines of text using print
- ..			quit
- .		if $data(@MATCH(MATCH)@("s"))>1&(MATCH=1) do	; if descendent topics show the choices only on $P
- ..			write $$FORMAT(4)
- ..			write !!,"Additional information available: ",!!
- ..			set x=""
- ..			set subref=$name(@MATCH(MATCH)@("s"))
- ..			for   set x=$order(@subref@(x)) quit:x=""  do		; use a "tabbed" list display
- ...				write $$FORMAT(0)
- ...				write @subref@(x)
- ...				write $$COLUMNS(subref,x)
- ...				do qualifiers($name(@subref@(x)))
- ...				quit
- ..			quit
- .		else   set COUNT=COUNT-NEW			; otherwise, reposition to the start of the current level
- .		if $zeof write # set COUNT=COUNT-1 quit	; No more input, peel back out write # could cause an error
- .		write $$PROMPT
- .		read subtopic,!
- .		if subtopic="" set COUNT=COUNT-1 quit:0>COUNT	; no answer means peal back a level
- .		else  do parse(subtopic)			; check out the response
- .		quit
+	. if NOTFOUND do
+	. . write !!,"Sorry, no Documentation on "
+	. . for i=COUNT+1:1:NEW+COUNT write TOPIC(i)," "
+	. . set NOTFOUND=0
+	. . quit
+	. for  set IO=$order(IO(IO),-1) quit:""=IO  do		; if juggling devices, send content to both; do $P 2nd
+	. . use IO(IO)
+	. . for i=1:1:MATCH do print(MATCH(i),i)		; drive out lines of text using print
+	. . quit
+	. if $data(@MATCH(MATCH)@("s"))>1&(MATCH=1) do		; if descendent topics show the choices only on $P
+	. . write $$FORMAT(4)
+	. . write !!,"Additional information available: ",!!
+	. . set x=""
+	. . set subref=$name(@MATCH(MATCH)@("s"))
+	. . for   set x=$order(@subref@(x)) quit:x=""  do		; use a "tabbed" list display
+	. . . write $$FORMAT(0)
+	. . . write @subref@(x)
+	. . . write $$COLUMNS(subref,x)
+	. . . do qualifiers($name(@subref@(x)))
+	. . . quit
+	. . quit
+	. else   set COUNT=COUNT-NEW			; otherwise, reposition to the start of the current level
+	. if $zeof write # set COUNT=COUNT-1 quit 	; No more input, peel back out write # could cause an error
+	. write $$PROMPT
+	. read subtopic,!
+	. if subtopic="" set COUNT=COUNT-1 quit:0>COUNT	; no answer means peal back a level
+	. else  do parse(subtopic)			; check out the response
+	. quit
 	else  do						; look up failed
- .		set NOTFOUND=1					; flag the next call
- .		set COUNT=COUNT-NEW				; reset to the last working level
- .		quit
+	. set NOTFOUND=1					; flag the next call
+	. set COUNT=COUNT-NEW				; reset to the last working level
+	. quit
 	quit
 	;
 print(ref,i);							; text output function
@@ -91,75 +92,72 @@ print(ref,i);							; text output function
 	write !, at ref
 	set y=""
 	for  set y=$order(@ref@(y)) quit:(y="s")!(y="")  do
- .		write $$FORMAT(1)
- .		write !, at ref@(y)
- .		quit
+	. write $$FORMAT(1)
+	. write !, at ref@(y)
+	. quit
 	if $data(@ref)>1 do
- .		set subref=$name(@ref@("s")),x=""
- .		for  set x=$order(@subref@(x)) quit:x=""  do:($extract(^(x))="-")	; do lines at this level
- ..			set MATCH(i)=$name(MATCH(i),COUNT-1*2)
- ..			write $$FORMAT(1)
- ..			write !, at subref@(x)
- ..			set z=""
- ..			for  set z=$order(@subref@(x,z)) quit:z=""  do			; and its descendents
- ...				write !, at subref@(x,z)
- ...				quit
- ..			quit
- .		quit
+	. set subref=$name(@ref@("s")),x=""
+	. for  set x=$order(@subref@(x)) quit:x=""  do:($extract(^(x))="-") 	; do lines at this level
+	. . set MATCH(i)=$name(MATCH(i),COUNT-1*2)
+	. . write $$FORMAT(1)
+	. . write !, at subref@(x)
+	. . set z=""
+	. . for  set z=$order(@subref@(x,z)) quit:z=""  do			; and its descendents
+	. . . write !, at subref@(x,z)
+	. . . quit
+	. . quit
+	. quit
 	quit
 	;
 recursiv(ref,level)						;
 	new (COUNT,TOPIC,ref,MATCH,level,PROMPT,FLAG)
 	set level=level+1
 	if ($extract(TOPIC(level))="-")&($get(FLAG)'=1) do
- .		set FLAG=1
- .		for i=COUNT:-1:level set TOPIC(i+1)=TOPIC(i)
- .		set COUNT=COUNT+1
- .		set TOPIC(level)="*"
- .		quit
+	. set FLAG=1
+	. for i=COUNT:-1:level set TOPIC(i+1)=TOPIC(i)
+	. set COUNT=COUNT+1
+	. set TOPIC(level)="*"
+	. quit
 	set ref=$name(@ref@("s",TOPIC(level)))
 	if TOPIC(level)'="" do:$data(@ref)
- .		if level=COUNT do
- ..			set PROMPT(level)=TOPIC(level)
- ..			set MATCH=MATCH+1
- ..			set MATCH(MATCH)=ref
- ..			quit
- .		if level'=COUNT do recursiv(ref,level)
- .		quit
+	. if level=COUNT do
+	. . set PROMPT(level)=TOPIC(level)
+	. . set MATCH=MATCH+1
+	. . set MATCH(MATCH)=ref
+	. . quit
+	. if level'=COUNT do recursiv(ref,level)
+	. quit
 	if TOPIC(level)="*" set TOPIC(level)=""
 	set x=""
 	for  set x=$order(@ref) quit:(x="")!("\"_x'[("\"_TOPIC(level)))  do
- .		set ref=$name(@ref,(level*2)-1)
- .		set ref=$name(@ref@(x))
- .		set (TOPIC(level),PROMPT(level))=@$name(@ref,level*2)
- .		if level=COUNT do
- ..			set MATCH=MATCH+1
- ..			set MATCH(MATCH)=ref
- ..			quit
- .		if level'=COUNT do recursiv(ref,level)
- .		quit
+	. set ref=$name(@ref,(level*2)-1)
+	. set ref=$name(@ref@(x))
+	. set (TOPIC(level),PROMPT(level))=@$name(@ref,level*2)
+	. if level=COUNT do
+	. . set MATCH=MATCH+1
+	. . set MATCH(MATCH)=ref
+	. . quit
+	. if level'=COUNT do recursiv(ref,level)
+	. quit
 	quit
 qualifiers(ref)							; qualifier lister
 	new (ref)
 	if $data(@ref)>1 do
- .		set ref=$name(@ref@("s")),x="-"
- .		for  set x=$order(@ref@(x)) quit:x=""!($extract(x)'="-")   do:($extract(^(x))="-")
- ..			set count=$get(count)+1
- ..			if count=1 write !
- ..			write ^(x)
- ..			write $$COLUMNS(ref,x)
- ..			quit
- .		quit
+	. set ref=$name(@ref@("s")),x="-"
+	. for  set x=$order(@ref@(x)) quit:x=""!($extract(x)'="-")   do:($extract(^(x))="-")
+	. . set count=$get(count)+1
+	. . if count=1 write !
+	. . write ^(x)
+	. . write $$COLUMNS(ref,x)
+	. . quit
+	. quit
 	if $get(count)>0 write !!
 	quit
 	;
 error								; Error handler called by $etrap
-	set $etrap=""
-	if $zstatus'["IOEOF" do					; EOF is not a "real" error
- .		write !,"Error in GT.M help utility - look at ",$zjobexam("gtmhelpdmp")," for additional information",!
- .		quit
-	if ""'=$get(%gbldir),($zsearch(%gbldir)'="") set $zgbldir=%gbldir	; restore caller's global directory
-	else  set $zgbldir=""
+	if ($zstatus'["IOEOF") do				; EOF is not a "real" error
+	. write !,"Error in GT.M help utility - look at ",$zjobexam("gtmhelpdmp")," for additional information",!
+	. quit
 	use @pio,IO(1)						; restore $P state and original $IO
 	set $ecode=""						; caller loses error trace, but generally called by direct mode
 	quit
@@ -169,11 +167,11 @@ MATCH()								; return array MATCH containing all global references that match
 	set QUALIFIERS=0
 	if COUNT=0 set MATCH=1 set MATCH(1)="^HELP"
 	if COUNT'=0 do
- .		set level=0
- .		set MATCH=0
- .		set ref="^HELP"
- .		do recursiv(ref,level)
- .		quit
+	. set level=0
+	. set MATCH=0
+	. set ref="^HELP"
+	. do recursiv(ref,level)
+	. quit
 	if $get(FLAG)=1 set COUNT=COUNT-1
 	quit MATCH
 	;
@@ -181,9 +179,9 @@ WIDTH()	quit 80	; Width of the current device
 PAGE()	quit 24	; Page length of the current device
 FORMAT(newlines)
 	if $y>($$PAGE-newlines-3) do
- .		if '$zeof read !!,"Press RETURN to continue ...",dummy
- .		write #
- .		quit
+	. if '$zeof read !!,"Press RETURN to continue ...",dummy
+	. write #
+	. quit
 	quit ""
 COLUMNS(subref,x)
 	if $x+12'>$$WIDTH write ?$x\12+1*12
@@ -195,10 +193,10 @@ PROMPT()
 	write !!
 	set ref="^HELP"
 	for i=1:1:COUNT do
- .		set TOPIC(i)=$zconvert($select($data(PROMPT(i)):PROMPT(i),1:TOPIC(i)),"U")
- .		set ref=$name(@ref@("s",TOPIC(i)))
- .		write @ref," "
- .		quit
+	. set TOPIC(i)=$zconvert($select($data(PROMPT(i)):PROMPT(i),1:TOPIC(i)),"U")
+	. set ref=$name(@ref@("s",TOPIC(i)))
+	. write @ref," "
+	. quit
 	if COUNT=0 kill PROMPT write "Topic? "
 	if COUNT>0 write "Subtopic? "
 	quit ""
diff --git a/sr_unix/gtminstall.sh b/sr_unix/gtminstall.sh
index b79aee7..e8eaa21 100755
--- a/sr_unix/gtminstall.sh
+++ b/sr_unix/gtminstall.sh
@@ -1,7 +1,7 @@
 #!/bin/sh -
 #################################################################
 #                                                               #
-# 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     #
@@ -138,6 +138,17 @@ mktmpdir()
     echo $tmpdirname
 }
 
+read_yes_no()
+{
+	read resp
+	response=`echo $resp | tr '[a-z]' '[A-Z]'`
+	if [ "Y" = $response -o "YES" = $response ] ; then
+		echo "yes"
+	else
+		echo "no"
+	fi
+}
+
 # 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
@@ -409,6 +420,49 @@ if [ -z "$gtm_installdir" ] ; then gtm_installdir=/usr/lib/fis-gtm/${gtm_version
 if [ -d "$gtm_installdir" -a "Y" != "$gtm_overwrite_existing" ] ; then
     echo $gtm_installdir exists and --overwrite-existing not specified ; err_exit
 fi
+
+issystemd=`which systemctl`
+if [ "" != "$issystemd" ] ; then
+	# It is a systemd installation
+	logindconf="/etc/systemd/logind.conf"
+	removeipcopt=`awk -F = '/^RemoveIPC/ {opt=$2} END{print opt}' $logindconf`
+	if [ "no" != "$removeipcopt" ] ; then
+		# RemoveIPC=no is NOT the final settings in the file
+		ipcissue1="If RemoveIPC=yes is configured for systemd, ipcs (database shm & sem)"
+		ipcissue1="$ipcissue1 are removed for a non-system user's processes when that user logs out."
+		ipcissue2="That can cause database operations to fail with mysterious errors."
+
+		ipcline1="# GT.M : Override systemd default of RemoveIPC=yes to prevent automatic ipc removal of"
+		ipcline1="$ipcline1 Shared Memory Segments and Semaphore Arrays of orphaned databases"
+		ipcline2="RemoveIPC=no"
+		ipccmd="systemctl restart systemd-logind"
+
+		echo "$ipcissue1"
+		echo "$ipcissue2"
+		echo "The installation would like to add the below two lines to $logindconf"
+		echo "   $ipcline1"
+		echo "   $ipcline2"
+		echo "And issue the below command to restart systemd-logind"
+		echo "   $ipccmd"
+		echo -n "Do you wish to proceed (Y/N)? "
+		answer=`read_yes_no`
+		if [ "yes" != "$answer" ] ; then
+			echo "Will abort installation"
+			echo $ipcissue1
+			echo $ipcissue2
+			echo "Please add the below two lines to $logindconf"
+			echo "   $ipcline1"
+			echo "   $ipcline2"
+			echo "and restart systemd-logind using the below command, for example or by rebooting the system"
+			echo "   $ipccmd"
+			echo "and retry GT.M installation"
+			exit 1
+		fi
+		echo $ipcline1 >> $logindconf
+		echo $ipcline2 >> $logindconf
+		$ipccmd
+	fi
+fi
 if [ "Y" = "$gtm_verbose" ] ; then echo Finished checking options and assigning defaults ; dump_info ; fi
 
 # Prepare input to GT.M configure script
diff --git a/sr_unix/gtmio.h b/sr_unix/gtmio.h
index 7c54447..5743622 100644
--- a/sr_unix/gtmio.h
+++ b/sr_unix/gtmio.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	*
@@ -523,7 +523,7 @@ MBSTART {													\
 						   loaded systems but timeout on incomplete reads.  		\
 						   Any characters						\
 						   read to this point will be returned. */ 			\
-						*MSEC_TIMEOUT = timeout2msec(1);				\
+						*MSEC_TIMEOUT = 1 * MILLISECS_IN_SEC;				\
 						start_timer(TIMER_ID, *MSEC_TIMEOUT, wake_alarm, 0, NULL);	\
 					}									\
 					gtmioBuffLen -= gtmioStatus;						\
diff --git a/sr_unix/gtmlink.c b/sr_unix/gtmlink.c
index b426d02..ae49b29 100644
--- a/sr_unix/gtmlink.c
+++ b/sr_unix/gtmlink.c
@@ -1,6 +1,7 @@
 /****************************************************************
  *								*
- *	Copyright 2013, 2014 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	*
@@ -32,7 +33,7 @@ void init_relink_allowed(mstr *keyword)
 
 	SETUP_THREADGBL_ACCESS;
 	DEBUG_ONLY(check_max_keyword_len());
-	if (keyword->len >= MAX_KEYWORD_LEN)
+	if ((keyword->len >= MAX_KEYWORD_LEN) || (0 == keyword->len))
 	{	/* unrecognized keyword - use default */
 		TREF(relink_allowed) = LINK_NORECURSIVE;
 		return;
diff --git a/sr_unix/versions.csh b/sr_unix/gtmpcat_sh.txt
old mode 100755
new mode 100644
similarity index 56%
copy from sr_unix/versions.csh
copy to sr_unix/gtmpcat_sh.txt
index 7700375..d6a9750
--- a/sr_unix/versions.csh
+++ b/sr_unix/gtmpcat_sh.txt
@@ -1,6 +1,7 @@
+#!/bin/sh
 #################################################################
 #								#
-# Copyright (c) 2001-2016 Fidelity National Information		#
+# Copyright (c) 2017 Fidelity National Information		#
 # Services, Inc. and/or its subsidiaries. All rights reserved.	#
 #								#
 #	This source code contains the intellectual property	#
@@ -9,17 +10,5 @@
 #	the license, please stop and do not read further.	#
 #								#
 #################################################################
-
-#
-############################################
-#
-#
-#	versions - set default GT.M versions
-#
-#
-############################################
-
-#	gtm_curpro is the current production version
-setenv	gtm_curpro	"V63000A"
-#	gtm_verno is the current production version
-setenv	gtm_verno	$gtm_curpro
+gtm_chset=M gtm_boolean=0 gtm_side_effects=0 gtm_max_indrcache_count=2048 gtm_max_indrcache_memory=8192 \
+	gtmroutines="$gtm_dist/tools/gtmpcat $gtmroutines" $gtm_dist/mumps -r gtmpcat "$@"
diff --git a/sr_unix/gtmprofile.gtc b/sr_unix/gtmprofile.gtc
index bb39b10..daf1231 100755
--- a/sr_unix/gtmprofile.gtc
+++ b/sr_unix/gtmprofile.gtc
@@ -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     #
@@ -78,6 +78,12 @@ if [ $gtm_dist != "$old_gtm_dist" ] ; then
     if [ -z "$gtm_icu_version" -a -n "`which icu-config`" ] ; then
 	gtm_icu_version=`icu-config --version | gtm_chset=M $gtm_dist/mumps -run %XCMD 'Read x Write $FNumber(x*$Select(+x>5:.1,1:1),"",1)'`
         export gtm_icu_version
+	# Add library path to LD_LIBRARY_PATH
+	extendlibpath=`icu-config --libdir`
+	if [ "" = "$LD_LIBRARY_PATH" ]; then LD_LIBRARY_PATH="$extendlibpath"; else LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$extendlibpath";fi; export LD_LIBRARY_PATH
+	if [ "ibm" = "$arch" ]; then
+		if [ "" = "$LIBPATH" ]; then LIBPATH="$extendlibpath"; else LIBPATH="$LIBPATH:$extendlibpath";fi; export LIBPATH;
+	fi
     fi
 
     # If UTF-8 is selected, and UTF-8 mode works, set $gtm_dist to utf8 subdirectory
diff --git a/sr_unix/gtmrecv.c b/sr_unix/gtmrecv.c
index df4622e..21d1bc7 100644
--- a/sr_unix/gtmrecv.c
+++ b/sr_unix/gtmrecv.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	*
@@ -56,7 +56,6 @@
 #include "sgtm_putmsg.h"
 #include "gt_timer.h"
 #include "ftok_sem_incrcnt.h"
-#include "init_secshr_addrs.h"
 #include "mutex.h"
 #include "fork_init.h"
 #include "gtmio.h"
@@ -398,8 +397,6 @@ int gtmrecv(void)
 	is_rcvr_server = TRUE;
 	process_id = getpid();
 	OPERATOR_LOG_MSG;
-	/* Reinvoke secshr related initialization with the child's pid */
-	INVOKE_INIT_SECSHR_ADDRS;
 	/* Initialize mutex socket, memory semaphore etc. before any "grab_lock" is done by this process on the journal pool.
 	 * Note that the initialization would already have been done by the parent receiver startup command but we need to
 	 * redo the initialization with the child process id.
diff --git a/sr_unix/gtmrecv_end.c b/sr_unix/gtmrecv_end.c
old mode 100755
new mode 100644
index cf7433d..3fe2796
--- a/sr_unix/gtmrecv_end.c
+++ b/sr_unix/gtmrecv_end.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	*
@@ -65,7 +65,6 @@ GBLREF	repl_msg_ptr_t		gtmrecv_msgp;
 GBLREF	uchar_ptr_t		repl_filter_buff;
 GBLREF	jnlpool_addrs		jnlpool;
 GBLREF	jnlpool_ctl_ptr_t	jnlpool_ctl;
-GBLREF	boolean_t		pool_init;
 
 error_def(ERR_SYSCALL);
 
@@ -163,15 +162,9 @@ int gtmrecv_end1(boolean_t auto_shutdown)
 		 */
 		if (!auto_shutdown && !INST_FREEZE_ON_ERROR_POLICY)
 		{
-			JNLPOOL_SHMDT(status, save_errno);
+			JNLPOOL_SHMDT(jnlpool, status, save_errno);
 			if (0 > status)
 				repl_log(stderr, TRUE, TRUE, "Error detaching from Journal Pool : %s\n", STRERROR(save_errno));
-			jnlpool.jnlpool_ctl = jnlpool_ctl = NULL;
-			jnlpool.repl_inst_filehdr = NULL;
-			jnlpool.gtmsrc_lcl_array = NULL;
-			jnlpool.gtmsource_local_array = NULL;
-			jnlpool.jnldata_base = NULL;
-			pool_init = FALSE;
 		}
 	} else
 		jnlpool_seqno = 0;
diff --git a/sr_unix/gtmrecv_process.c b/sr_unix/gtmrecv_process.c
old mode 100755
new mode 100644
index 0dcd595..371c912
--- a/sr_unix/gtmrecv_process.c
+++ b/sr_unix/gtmrecv_process.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	*
@@ -488,11 +488,11 @@ STATICFNDEF int repl_tr_endian_convert(unsigned char remote_jnl_ver, uchar_ptr_t
 				rec->jrec_null.strm_seqno = GTM_BYTESWAP_64(rec->jrec_null.strm_seqno);
 			}
 			if (IS_SET_KILL_ZKILL_ZTWORM_LGTRIG_ZTRIG(rectype))
-			{	/* This code will need changes in case the jnl-ver changes from V26 to V27 so add an assert to
+			{	/* This code will need changes in case the jnl-ver changes from V27 to V28 so add an assert to
 				 * alert to that possibility. Once the code is fixed for the new jnl format, change the assert
 				 * to reflect the new latest jnl-ver.
 				 */
-				assert(JNL_VER_THIS == V26_JNL_VER);
+				assert(JNL_VER_THIS == V27_JNL_VER);
 				/* To better understand the logic below (particularly the use of hardcoded offsets), see comment
 				 * in repl_filter.c (search for "struct_jrec_upd layout" for the various jnl versions we support).
 				 */
@@ -846,7 +846,7 @@ STATICFNDEF int gtmrecv_est_conn(void)
 #	endif
 	/* Note that even though we are reopening a fresh connection, we should NOT reset the cached information
 	 * last_rcvd_histinfo, last_valid_histinfo etc. in this case as we might just resume processing from where
-	 * the previous connection left off in which case all the cached information is still valid. If we dont
+	 * the previous connection left off in which case all the cached information is still valid. If we don't
 	 * resume from where we left off, the receiver will anyways error out asking for a rollback to be done so
 	 * the cached information never gets used if it is invalid.
 	 */
@@ -935,7 +935,7 @@ void	gtmrecv_repl_send(repl_msg_ptr_t msgp, int4 type, int4 len, char *msgtypest
 			optional_seqno, optional_seqno);
 	} else
 		repl_log(log_fp, TRUE, TRUE, "Sending %s message\n", msgtypestr);
-	/* Assert that if we dont know the endianness of the remote side, we assume it is the same endianness */
+	/* Assert that if we don't know the endianness of the remote side, we assume it is the same endianness */
 	assert(remote_side->endianness_known || !remote_side->cross_endian);
 	if (!remote_side->cross_endian)
 	{
@@ -982,11 +982,11 @@ void	gtmrecv_check_and_send_instinfo(repl_needinst_msg_ptr_t need_instinfo_msg,
 	assert(remote_side->endianness_known); /* ensure remote_side->cross_endian is reliable */
 	/* If the remote source server is <= V62000 it would have endian converted "need_instinfo_msg" ONLY IF
 	 * src_jnl_ver < rcv_jnl_ver. If remote source server is > V62000 it would have endian converted unconditionally.
-	 * So we dont need to do the endian conversion in either of those cases. The need_instinfo_msg->proto_ver will let
+	 * So we don't need to do the endian conversion in either of those cases. The need_instinfo_msg->proto_ver will let
 	 * us distinguish the > V62000 vs <= V62000 case. But if src version is <= V62000, we cannot easily distinguish what
-	 * the other side's jnl_ver is so we dont know if the source server would have endian converted or not. We work around
+	 * the other side's jnl_ver is so we don't know if the source server would have endian converted or not. We work around
 	 * it by assuming that pids are limited to a max of 2**24 and so the most significant byte of the 4-byte pid should be 0.
-	 * This trick might not work always in case an OS supports > 2**24 pid number (I dont know of any now) OR if both the
+	 * This trick might not work always in case an OS supports > 2**24 pid number (I don't know of any now) OR if both the
 	 * most and least significant bytes of the 4-byte pid are 0, but if it does not, the worst we will see is a) an incorrect
 	 * INSNOTJOINED error issued by the receiver server OR b) an incorrect lms_group_info copied over into the instance file
 	 * (which will soon elicit some other related error). We can address (a) by trying out endian converting again below to
@@ -1015,7 +1015,7 @@ void	gtmrecv_check_and_send_instinfo(repl_needinst_msg_ptr_t need_instinfo_msg,
 	{
 		rts_error_csa(CSA_ARG(NULL) VARLSTCNT(6) ERR_UPDSYNCINSTFILE, 0, ERR_TEXT, 2,
 			  LEN_AND_LIT("Source side is >= V5.5-000 implies -UPDATERESYNC needs a value specified"));
-		assert(FALSE);	/* we dont expect the rts_error to return control */
+		assert(FALSE);	/* we don't expect the rts_error to return control */
 	}
 	/* We usually expect the LMS group info to be non-NULL on both primary and secondary. An exception is if
 	 * both of them are being brought up for the first time using a GT.M version that supports supplementary instances.
@@ -1039,7 +1039,7 @@ void	gtmrecv_check_and_send_instinfo(repl_needinst_msg_ptr_t need_instinfo_msg,
 				rts_error_csa(CSA_ARG(NULL) VARLSTCNT(6) ERR_NOSUPPLSUPPL, 4,
 						LEN_AND_STR((char *)inst_hdr->inst_info.this_instname),
 						LEN_AND_STR((char *)need_instinfo_msg->instname));
-				assert(FALSE);	/* we dont expect the rts_error to return control */
+				assert(FALSE);	/* we don't expect the rts_error to return control */
 			}
 		} else
 		{	/* this supplementary instance was started with -UPDNOTOK. Issue error if source is not supplementary */
@@ -1048,7 +1048,7 @@ void	gtmrecv_check_and_send_instinfo(repl_needinst_msg_ptr_t need_instinfo_msg,
 				rts_error_csa(CSA_ARG(NULL) VARLSTCNT(6) ERR_SUPRCVRNEEDSSUPSRC, 4,
 					LEN_AND_STR((char *)inst_hdr->inst_info.this_instname),
 					LEN_AND_STR((char *)need_instinfo_msg->instname));
-				assert(FALSE);	/* we dont expect the rts_error to return control */
+				assert(FALSE);	/* we don't expect the rts_error to return control */
 			}
 		}
 	}
@@ -1092,7 +1092,7 @@ void	gtmrecv_check_and_send_instinfo(repl_needinst_msg_ptr_t need_instinfo_msg,
 				rts_error_csa(CSA_ARG(NULL) VARLSTCNT(6) ERR_INSNOTJOINED, 4,
 						LEN_AND_STR((char *)inst_hdr->inst_info.this_instname),
 						LEN_AND_STR((char *)need_instinfo_msg->instname));
-				assert(FALSE);	/* we dont expect the rts_error to return control */
+				assert(FALSE);	/* we don't expect the rts_error to return control */
 			}
 		} else
 		{	/* Primary and Secondary are part of SAME LMS Group. If this instance is supplementary and remote
@@ -1104,7 +1104,7 @@ void	gtmrecv_check_and_send_instinfo(repl_needinst_msg_ptr_t need_instinfo_msg,
 				rts_error_csa(CSA_ARG(NULL) VARLSTCNT(6) ERR_INSROLECHANGE, 4,
 						LEN_AND_STR((char *)inst_hdr->inst_info.this_instname),
 						LEN_AND_STR((char *)need_instinfo_msg->instname));
-				assert(FALSE);	/* we dont expect the rts_error to return control */
+				assert(FALSE);	/* we don't expect the rts_error to return control */
 			}
 		}
 		if (is_rcvr_srvr && recvpool.gtmrecv_local->updateresync
@@ -1161,7 +1161,7 @@ void	gtmrecv_check_and_send_instinfo(repl_needinst_msg_ptr_t need_instinfo_msg,
 		reuse_slot = 0;
 		if (is_rcvr_srvr && recvpool.gtmrecv_local->updateresync && gtmrecv_options.reuse_specified)
 		{	/* If -REUSE was specified, check if instance name specified matches any existing slot.
-			 * If slot has already been found, dont search any more.
+			 * If slot has already been found, don't search any more.
 			 */
 			for (strm_info = strm_start; strm_info < strm_top; strm_info++)
 			{
@@ -1225,7 +1225,7 @@ void	gtmrecv_check_and_send_instinfo(repl_needinst_msg_ptr_t need_instinfo_msg,
 				rts_error_csa(CSA_ARG(NULL) VARLSTCNT(6) ERR_INSUNKNOWN, 4,
 						LEN_AND_STR((char *)inst_hdr->inst_info.this_instname),
 						LEN_AND_STR((char *)need_instinfo_msg->instname));
-				assert(FALSE);	/* we dont expect the rts_error to return control */
+				assert(FALSE);	/* we don't expect the rts_error to return control */
 			}
 			/* Since we did not find the stream in the existing instance file but did find a slot, fill that slot
 			 * while we have the lock on the instance file. This way another -updateresync startup of a receiver
@@ -2195,7 +2195,7 @@ STATICFNDEF void process_tr_buff(int msg_type)
 						recvpool_ctl->insert_strm_histinfo = FALSE;
 				}
 				/* Now that at least one history record has been written into the receive pool and is guaranteed
-				 * to be written to the instance file (when this gets processed by the update process), dont use
+				 * to be written to the instance file (when this gets processed by the update process), don't use
 				 * -updateresync or -noresync for future handshakes in case the current connection gets reset.
 				 */
 				if (recvpool.gtmrecv_local->updateresync)
@@ -2283,7 +2283,7 @@ STATICFNDEF void	gtmrecv_updresync_histinfo_find_seqno(seq_num input_seqno, int4
 		offset = REPL_INST_HISTINFO_START + ((histinfo_num) * SIZEOF(repl_histinfo));
 		LSEEKREAD(fd, offset, histinfo, SIZEOF(repl_histinfo), status);
 		if (0 != status)
-		{	/* At this point, we dont have the name of the input instance file used in the -updateresync qualifier.
+		{	/* At this point, we don't have the name of the input instance file used in the -updateresync qualifier.
 			 * So we use a value of "" instead. The fact that the REPLINSTREAD message is preceded by a UPDSYNCINSTFILE
 			 * error indicates to the user it is the -updateresync qualifier where the issue is so it is not a big loss.
 			 */
@@ -2331,7 +2331,7 @@ STATICFNDEF void	gtmrecv_updresync_histinfo_get(int4 index, repl_histinfo *histi
 	offset = REPL_INST_HISTINFO_START + ((index) * SIZEOF(repl_histinfo));
 	LSEEKREAD(fd, offset, histinfo, SIZEOF(repl_histinfo), status);
 	if (0 != status)
-	{	/* At this point, we dont have the name of the input instance file used in the -updateresync qualifier.
+	{	/* At this point, we don't have the name of the input instance file used in the -updateresync qualifier.
 		 * So we use a value of "" instead. The fact that the REPLINSTREAD message is preceded by a UPDSYNCINSTFILE
 		 * error indicates to the user it is the -updateresync qualifier where the issue is so it is not a big loss.
 		 */
@@ -3568,7 +3568,7 @@ STATICFNDEF void do_main_loop(boolean_t crash_restart)
 							recvpool.upd_proc_local->read_jnl_seqno = recvd_jnl_seqno;
 							repl_log(gtmrecv_log_fp, TRUE, TRUE, "Wrote upd_proc_local->read_jnl_seqno"
 								" : "INT8_FMT" "INT8_FMTX"\n", recvd_jnl_seqno, recvd_jnl_seqno);
-							/* If -NORESYNC was used in receiver startup, we dont want to use it
+							/* If -NORESYNC was used in receiver startup, we don't want to use it
 							 * anymore as future such connections could cause recvpool_ctl->jnl_seqno
 							 * to be reset further backwards and will confuse the update process.
 							 */
diff --git a/sr_unix/gtmrecv_shutdown.c b/sr_unix/gtmrecv_shutdown.c
index 4d52986..87db67d 100755
--- a/sr_unix/gtmrecv_shutdown.c
+++ b/sr_unix/gtmrecv_shutdown.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	*
@@ -198,7 +198,7 @@ int gtmrecv_shutdown(boolean_t auto_shutdown, int exit_status)
 		 * lock if journal pool is available.
 		*/
 		if ((NULL != jnlpool.jnlpool_ctl) && !was_crit)
-			grab_lock(jnlpool.jnlpool_dummy_reg, TRUE, ASSERT_NO_ONLINE_ROLLBACK);
+			grab_lock(jnlpool.jnlpool_dummy_reg, TRUE, GRAB_LOCK_ONLY);
 		repl_inst_recvpool_reset();
 		if ((NULL != jnlpool.jnlpool_ctl) && !was_crit)
 			rel_lock(jnlpool.jnlpool_dummy_reg);
diff --git a/sr_unix/gtmsecshr.c b/sr_unix/gtmsecshr.c
index c5cb489..8186911 100755
--- a/sr_unix/gtmsecshr.c
+++ b/sr_unix/gtmsecshr.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	*
@@ -214,7 +214,6 @@ int main(int argc, char_ptr_t argv[])
 	int			save_errno;
 	int			recv_complete, send_complete;
 	int			num_chars_recd, num_chars_sent, rundir_len;
-	int4			msec_timeout;			/* timeout in milliseconds */
 	TID			timer_id;
 	GTM_SOCKLEN_TYPE	client_addr_len;
 	char			*recv_ptr, *send_ptr, *rundir;
@@ -225,6 +224,7 @@ int main(int argc, char_ptr_t argv[])
 	DCL_THREADGBL_ACCESS;
 
 	GTM_THREADGBL_INIT;
+	assert(MAXPOSINT4 >= GTMSECSHR_MESG_TIMEOUT);
 	common_startup_init(GTMSECSHR_IMAGE); 	/* Side-effect : Sets skip_dbtriggers = TRUE if platorm lacks trigger support */
 	err_init(gtmsecshr_cond_hndlr);
 	gtmsecshr_init(argv, &rundir, &rundir_len);
@@ -249,9 +249,8 @@ int main(int argc, char_ptr_t argv[])
 		}
 		recv_ptr = (char *)&mesg;
 		client_addr_len = SIZEOF(struct sockaddr_un);
-		msec_timeout = timeout2msec(GTMSECSHR_MESG_TIMEOUT);
-		DBGGSSHR((LOGFLAGS, "gtmsecshr: Select rc = %d  message timeout = %d\n", selstat, msec_timeout));
-		start_timer(timer_id, msec_timeout, gtmsecshr_timer_handler, 0, NULL);
+		DBGGSSHR((LOGFLAGS, "gtmsecshr: Select rc = %d  message timeout = %d\n", selstat, GTMSECSHR_MESG_TIMEOUT));
+		start_timer(timer_id, GTMSECSHR_MESG_TIMEOUT, gtmsecshr_timer_handler, 0, NULL);
 		recv_complete = FALSE;
 		do
 		{	/* Note RECVFROM does not loop on EINTR return codes so must be handled */
@@ -274,8 +273,7 @@ int main(int argc, char_ptr_t argv[])
 		if (INVALID_COMMAND != mesg.code)
 		{	/* Reply if code not overridden to mean no acknowledgement required */
 			send_ptr = (char *)&mesg;
-			msec_timeout = timeout2msec(GTMSECSHR_MESG_TIMEOUT);
-			start_timer(timer_id, msec_timeout, gtmsecshr_timer_handler, 0, NULL);
+			start_timer(timer_id, GTMSECSHR_MESG_TIMEOUT, gtmsecshr_timer_handler, 0, NULL);
 			send_complete = FALSE;
 			do
 			{
diff --git a/sr_unix/gtmsecshr.h b/sr_unix/gtmsecshr.h
index 2e62f06..f032b8d 100755
--- a/sr_unix/gtmsecshr.h
+++ b/sr_unix/gtmsecshr.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	*
@@ -22,7 +22,7 @@
 # define DBGGSSHR(x)
 #endif
 #define ABSOLUTE_PATH(X)	('/' == X[0])
-#define GTMSECSHR_MESG_TIMEOUT  30
+#define GTMSECSHR_MESG_TIMEOUT  30 * MILLISECS_IN_SEC
 #define GTMSECSHR_PERMS		0666
 
 /* Exit codes from gtmsecshr - note matching text entries are in message table in secshr_client.c */
diff --git a/sr_unix/gtmsecshr_wrapper.c b/sr_unix/gtmsecshr_wrapper.c
index 06f086c..cdafd00 100644
--- a/sr_unix/gtmsecshr_wrapper.c
+++ b/sr_unix/gtmsecshr_wrapper.c
@@ -1,6 +1,6 @@
 /****************************************************************
  *								*
- * Copyright (c) 2008-2016 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	*
@@ -341,7 +341,7 @@ int main()
 	}
 	if (!ret)
 	{	/* clear all */
-#		ifdef SUNOS
+#		if defined(SUNOS) || defined(__CYGWIN__)
 		environ = NULL;
           	status = 0;
 #		else
diff --git a/sr_unix/gtmshr_symbols.exp b/sr_unix/gtmshr_symbols.exp
index 752c301..819c2b8 100755
--- a/sr_unix/gtmshr_symbols.exp
+++ b/sr_unix/gtmshr_symbols.exp
@@ -19,3 +19,7 @@ gtm_is_main_thread
 accumulate
 to_ulong
 is_big_endian
+op_read
+dm_read
+io_curr_device
+io_std_device
diff --git a/sr_unix/gtmsource.c b/sr_unix/gtmsource.c
index 7914806..8525aa3 100644
--- a/sr_unix/gtmsource.c
+++ b/sr_unix/gtmsource.c
@@ -58,7 +58,6 @@
 #include "ftok_sem_incrcnt.h"
 #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"
@@ -180,7 +179,7 @@ int gtmsource()
 	{	/* MUPIP REPLIC -SOURCE -ACTIVATE -UPDOK has been specified. We need to open the gld and db regions now
 		 * in case this is a secondary -> primary transition. This is so we can later switch journal files in all
 		 * journaled regions when the transition actually happens inside "gtmsource_rootprimary_init". But since
-		 * we have not yet done a "jnlpool_init", we dont know if updates are disabled in it or not. Although we
+		 * we have not yet done a "jnlpool_init", we don't know if updates are disabled in it or not. Although we
 		 * need to do the gld/db open only if updates are currently disabled in the jnlpool, we do this always
 		 * because once we do a jnlpool_init, we will come back with the ftok on the jnlpool held and that has
 		 * issues with later db open since we will try to hold the db ftok as part of db open and the ftok logic
@@ -305,8 +304,6 @@ int gtmsource()
 	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 */
-	INVOKE_INIT_SECSHR_ADDRS;
 	/* Initialize mutex socket, memory semaphore etc. before any "grab_lock" is done by this process on the journal pool.
 	 * Note that the initialization would already have been done by the parent receiver startup command but we need to
 	 * redo the initialization with the child process id.
@@ -485,8 +482,7 @@ int gtmsource()
 					jnlpool.jnlpool_ctl->jnl_seqno);
 			continue;
 		}
-		QWASSIGN(gtmsource_local->read_addr, jnlpool.jnlpool_ctl->write_addr);
-		gtmsource_local->read = jnlpool.jnlpool_ctl->write;
+		GTMSOURCE_SET_READ_ADDR(gtmsource_local, jnlpool);
 		gtmsource_local->read_state = gtmsource_local->jnlfileonly ? READ_FILE : READ_POOL;
 		read_jnl_seqno = gtmsource_local->read_jnl_seqno;
 		assert(read_jnl_seqno <= jnlpool.jnlpool_ctl->jnl_seqno);
diff --git a/sr_unix/gtmsource.h b/sr_unix/gtmsource.h
index 80be4af..43e5475 100644
--- a/sr_unix/gtmsource.h
+++ b/sr_unix/gtmsource.h
@@ -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	*
@@ -19,6 +19,7 @@
 #include "mdef.h"
 #include "gt_timer.h"
 #include "gtm_ipv6.h" /* for union gtm_sockaddr_in46 */
+#include "sleep.h"
 
 /* Needs mdef.h, gdsfhead.h and its dependencies */
 #define JNLPOOL_DUMMY_REG_NAME		"JNLPOOL_REG"
@@ -115,6 +116,41 @@ typedef enum
 
 #define GTMSOURCE_FH_FLUSH_INTERVAL	60 /* seconds, if required, flush file header(s) every these many seconds */
 
+#define	JPL_PHASE2_COMMIT_ARRAY_SIZE	16384	/* Max # of jnlpool commits that can still be in phase2.
+						 * Note that even if a phase2 commit is complete, the slot it occupies
+						 * cannot be reused by anyone else until all phase2 commit slots that
+						 * started before this slot are also done.
+						 */
+/* Individual structure describing an active phase2 jnlpool commit in jnlpool shared memory */
+typedef struct
+{
+	seq_num		jnl_seqno;
+	seq_num		strm_seqno;
+	qw_off_t	start_write_addr;	/* jpl->rsrv_write_addr at start of this commit */
+	uint4		process_id;
+	uint4		tot_jrec_len;		/* total length of jnl records corresponding to this seqno */
+	uint4		prev_jrec_len;		/* total length of jnl records corresponding to the previous seqno */
+	boolean_t	write_complete;		/* TRUE if this pid is done writing jnl records to jnlbuff */
+} jpl_phase2_in_prog_t;
+
+/* Structure recording a particular type of event in this jnlpool */
+typedef struct
+{
+	gtm_uint64_t	cntr;	/* # of times this event was encountered in the life of this jnlpool */
+	seq_num		seqno;	/* seqno when this event was last encountered */
+} jpl_trc_rec_t;
+
+
+#define	JPL_TRACE_PRO(JPL, TRC)		{ JPL->TRC.cntr++; JPL->TRC.seqno = JPL->jnl_seqno; }
+
+#define TAB_JPL_TRC_REC(A,B)	B,
+enum jpl_trc_rec_type
+{
+#include "tab_jpl_trc_rec.h"
+n_jpl_trc_rec_types
+};
+#undef TAB_JPL_TRC_REC
+
 typedef struct
 { 	/* IMPORTANT : all fields that are used by the source server reading from pool logic must be defined VOLATILE to avoid
 	 * compiler optimization, forcing fresh load on every access.
@@ -143,14 +179,17 @@ typedef struct
 							 * fetchresync rollback message.  This field is always updated while
 							 * holding the journal pool lock
 							 */
-	volatile qw_off_t	early_write_addr;	/* Virtual address assuming the to-be-written jnl records are already
-							 * written into the journal pool. Is equal to write_addr except in the
-							 * window when the actual write takes place. */
+	seq_num			strm_seqno[MAX_SUPPL_STRMS];		/* the current jnl seqno of each stream */
+	repl_conn_info_t	this_side;		/* Replication connection details of this side/instance */
 	volatile qw_off_t	write_addr;		/* Virtual address of the next journal record to be written in the merged
 							 * journal file.  Note that the merged journal may not exist.
-							 * Updated by GTM process */
-	uint4			write;			/* Relative offset from jnldata_base_off for the next journal record to
-							 * be written. Updated by GTM process. */
+							 * Updated by GTM process.
+							 */
+	volatile qw_off_t	rsrv_write_addr;	/* Similar to "write_addr" but space is reserved in phase1 of commit
+							 * and actual copy to jnlpool happens in phase2 outside of jnlpool crit.
+							 * If no commits are active, "rsrv_write_addr == write_addr". Else
+							 * "rsrv_write_addr > write_addr".
+							 */
 	boolean_t		upd_disabled;		/* Identify whether updates are disabled or not  on the secondary */
 	volatile uint4		lastwrite_len;		/* The length of the last transaction written into the journal pool.
 							 * Copied to jnldata_hdr.prev_jnldata_len before writing into the pool.
@@ -177,20 +216,24 @@ typedef struct
 							 * Anyone who does a "jnlpool_init" before this will issue a error.
 							 */
 	uint4			jnlpool_creator_pid;	/* DEBUG-ONLY field used for fake ENOSPC testing */
-	repl_conn_info_t	this_side;		/* Replication connection details of this side/instance */
-	seq_num			strm_seqno[MAX_SUPPL_STRMS];		/* the current jnl seqno of each stream */
 	volatile uint4		onln_rlbk_pid;		/* process ID of currently running ONLINE ROLLBACK. 0 if none. */
 	volatile uint4		onln_rlbk_cycle;	/* incremented everytime an ONLINE ROLLBACK ends */
 	boolean_t		freeze;			/* Freeze all regions in this instance. */
 	char			freeze_comment[MAX_FREEZE_COMMENT_LEN];	/* Text explaining reason for freeze */
 	boolean_t		instfreeze_environ_inited;
 	unsigned char		merrors_array[MERRORS_ARRAY_SZ];
-	boolean_t		outofsync_core_generated;
 	boolean_t		ftok_counter_halted;
-	/* Note: while adding fields to this structure, keep in mind that it needs to be 16-byte aligned so add filler bytes
-	 * as necessary
-	 */
-	char			filler_16bytealign[8];
+	uint4			phase2_commit_index1;
+	uint4			phase2_commit_index2;
+	char			filler_16bytealign1[8];
+	/************* JPL_TRC_REC RELATED FIELDS -- begin -- ***********/
+#	define TAB_JPL_TRC_REC(A,B)	jpl_trc_rec_t	B;
+#	include "tab_jpl_trc_rec.h"
+#	undef TAB_JPL_TRC_REC
+	/************* JPL_TRC_REC RELATED FIELDS -- end -- ***********/
+	jpl_phase2_in_prog_t	phase2_commit_array[JPL_PHASE2_COMMIT_ARRAY_SIZE];
+	CACHELINE_PAD(SIZEOF(global_latch_t), 0)	/* start next latch at a different cacheline than previous fields */
+	global_latch_t		phase2_commit_latch;	/* Used by "repl_phase2_complete" to update "phase2_commit_index1" */
 } jnlpool_ctl_struct;
 
 #if defined(__osf__) && defined(__alpha)
@@ -323,10 +366,49 @@ MBSTART {										\
 		((GTMSOURCE_CHANGING_MODE == gtmsource_state) 						\
 			|| (GTMSOURCE_WAITING_FOR_CONNECTION == gtmsource_state)			\
 			|| (GTMSOURCE_WAITING_FOR_XON == gtmsource_state))
+
 #define GTMSOURCE_NOW_TRANSITIONAL(STATEVAR)								\
 		((GTMSOURCE_CHANGED_STATE(STATEVAR) && GTMSOURCE_IS_TRANSITIONAL_STATE())		\
 			GTMTLS_ONLY(|| (REPLTLS_WAITING_FOR_RENEG_ACK == repl_tls.renegotiate_state))	\
 		 	|| (GTMSOURCE_HANDLE_ONLN_RLBK == gtmsource_state))
+
+#define	GTMSOURCE_SET_READ_ADDR(GTMSOURCE_LOCAL, JNLPOOL)						\
+MBSTART {												\
+	qw_off_t	rsrv_write_addr;								\
+													\
+	assert((&FILE_INFO(JNLPOOL.jnlpool_dummy_reg)->s_addrs)->now_crit);          			\
+	rsrv_write_addr = JNLPOOL.jnlpool_ctl->rsrv_write_addr;						\
+	GTMSOURCE_LOCAL->read_addr = rsrv_write_addr;							\
+	GTMSOURCE_LOCAL->read = rsrv_write_addr % JNLPOOL.jnlpool_ctl->jnlpool_size;			\
+} MBEND
+
+#define	SET_JPL_WRITE_ADDR(JPL, NEW_WRITE_ADDR)										\
+{															\
+	/* 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				\
+	 * rsrv_write_addr before seeing the change to jnlheader->jnldata_len, leading it to read an			\
+	 * invalid transaction length. To avoid such conditions, we should commit the order of				\
+	 * shared memory updates before we update rsrv_write_addr. This ensures that the source server			\
+	 * sees all shared memory updates related to a transaction before the change in rsrv_write_addr			\
+	 */														\
+	SHM_WRITE_MEMORY_BARRIER;											\
+	JPL->write_addr = NEW_WRITE_ADDR;										\
+}
+
+#define	SET_JNL_SEQNO(JPL, TEMP_JNL_SEQNO, SUPPLEMENTARY, STRM_SEQNO, STRM_INDEX, NEXT_STRM_SEQNO)	\
+{													\
+	GBLREF	jnl_gbls_t	jgbl;									\
+													\
+	assert(!jgbl.forw_phase_recovery);								\
+	TEMP_JNL_SEQNO++;										\
+	JPL->jnl_seqno = TEMP_JNL_SEQNO;								\
+	if (SUPPLEMENTARY)										\
+	{												\
+		NEXT_STRM_SEQNO = STRM_SEQNO + 1;							\
+		JPL->strm_seqno[STRM_INDEX] = NEXT_STRM_SEQNO;						\
+	}												\
+}
+
 /* The following structure contains data items local to one Source Server.
  * It is maintained in the journal pool to provide for persistence across
  * instantiations of the Source Server (due to crashes).
@@ -398,7 +480,7 @@ typedef struct
 	uint4			next_renegotiate_time;	/* Time (in future) at which the next SSL/TLS renegotiation happens. */
 	int4			num_renegotiations;	/* Number of SSL/TLS renegotiations that happened so far. */
 #	endif
-	int4			padding;		/* Keep size % 8 == 0 */
+	int4			filler_8byte_align;	/* Keep size % 8 == 0 */
 } gtmsource_local_struct;
 
 #if defined(__osf__) && defined(__alpha)
@@ -431,8 +513,30 @@ typedef gtmsource_local_struct *gtmsource_local_ptr_t;
 #define JNLPOOL_CTL_SIZE	ROUND_UP(SIZEOF(jnlpool_ctl_struct), CACHELINE_SIZE)	/* align crit semaphore at cache line */
 #define	JNLPOOL_CRIT_SIZE	(JNLPOOL_CRIT_SPACE + SIZEOF(mutex_spin_parms_struct) + SIZEOF(node_local))
 #define JNLDATA_BASE_OFF	(JNLPOOL_CTL_SIZE + JNLPOOL_CRIT_SIZE + REPL_INST_HDR_SIZE + GTMSRC_LCL_SIZE + GTMSOURCE_LOCAL_SIZE)
-
-/* the below structure has various fields that point to different sections of the journal pool */
+#define	REPLCSA2JPL(CSA)	(jnlpool_ctl_ptr_t)((sm_uc_ptr_t)CSA->critical - JNLPOOL_CTL_SIZE) /* see "jnlpool_init" for
+										 * relationship between critical and jpl.
+										 */
+/* The below is a structure capturing the details of space reserved in the journal pool corresponding to a transaction.
+ * Space for the transaction in the jnlpool is reserved in phase1 ("jnl_write_reserve"0 while holding crit and actual
+ * memcpy of journal records into jnlpool happens in phase2 outside of crit ("jnl_write_phase2").
+ */
+typedef struct
+{
+	qw_off_t	start_write_addr;	/* jpl->write_addr at which this transaction started */
+	qw_off_t	cur_write_addr;		/* current value of jpl->write_addr as we progress writing journal records
+						 * into jnlpool in phase2 of commit.
+						 */
+	uint4		tot_jrec_len;		/* Total length (in bytes) of jnl records we expect to be written for this seqno */
+	uint4		write_total;		/* Total length of jnl records actually used up for this seqno */
+	boolean_t	memcpy_skipped;		/* we skipped "memcpy" at least once in "jnl_pool_write" */
+	uint4		phase2_commit_index;	/* index into jpl->phase2_commit_array[] corresponding to this commit */
+	uint4		num_tcoms;		/* If curr tn is a TP tn, then # of tcom records seen till now */
+	char		filler_8byte_align[4];
+} jpl_rsrv_struct_t;
+
+/* The below structure has various fields that point to different sections of the journal pool
+ * and a few fields that point to private memory.
+ */
 typedef struct
 {
 	jnlpool_ctl_ptr_t	jnlpool_ctl;		/* pointer to the journal pool control structure */
@@ -442,8 +546,150 @@ typedef struct
 	repl_inst_hdr_ptr_t	repl_inst_filehdr;	/* pointer to the instance file header section in the journal pool */
 	gtmsrc_lcl_ptr_t	gtmsrc_lcl_array;	/* pointer to the gtmsrc_lcl array section in the journal pool */
 	sm_uc_ptr_t		jnldata_base;		/* pointer to the start of the actual journal record data */
+	jpl_rsrv_struct_t	jrs;
 } jnlpool_addrs;
 
+#define	UPDATE_JPL_RSRV_WRITE_ADDR(JPL, JNLPOOL, TN_JRECLEN)							\
+MBSTART {													\
+	qw_off_t		rsrv_write_addr;								\
+	int			nextIndex, endIndex;								\
+	jpl_phase2_in_prog_t	*phs2cmt;									\
+														\
+	GBLREF	uint4		process_id;									\
+														\
+	assert(JPL == JNLPOOL.jnlpool_ctl);									\
+	assert((&FILE_INFO(JNLPOOL.jnlpool_dummy_reg)->s_addrs)->now_crit);					\
+	/* Allocate a slot. But before that, check if the slot array is full.					\
+	 * endIndex + 1 == first_index implies full.								\
+	 * endIndex     == first_index implies empty.								\
+	 */													\
+	endIndex = JPL->phase2_commit_index2;									\
+	nextIndex = endIndex;											\
+	INCR_PHASE2_COMMIT_INDEX(nextIndex, JPL_PHASE2_COMMIT_ARRAY_SIZE);					\
+	if (nextIndex == JPL->phase2_commit_index1)								\
+	{	/* Slot array is full. Wait for phase2 to finish. */						\
+		do												\
+		{												\
+			repl_phase2_cleanup(&JNLPOOL);								\
+			if (nextIndex != JPL->phase2_commit_index1)						\
+				break;										\
+			JPL_TRACE_PRO(JPL, jnl_pool_write_sleep);						\
+			SLEEP_USEC(1, FALSE);									\
+		} while (nextIndex == JPL->phase2_commit_index1);						\
+	}													\
+	ASSERT_JNL_PHASE2_COMMIT_INDEX_IS_VALID(endIndex, JPL_PHASE2_COMMIT_ARRAY_SIZE);			\
+	phs2cmt = &JPL->phase2_commit_array[endIndex];								\
+	assert(JPL->jnl_seqno == jnl_fence_ctl.token);								\
+	phs2cmt->jnl_seqno = jnl_fence_ctl.token;								\
+	phs2cmt->strm_seqno = jnl_fence_ctl.strm_seqno;								\
+	phs2cmt->process_id = process_id;									\
+	rsrv_write_addr = JPL->rsrv_write_addr;									\
+	phs2cmt->start_write_addr = rsrv_write_addr;								\
+	assert(TN_JRECLEN);											\
+	assert(0 == (TN_JRECLEN % JNL_REC_START_BNDRY));							\
+	assert(NULL_RECLEN <= TN_JRECLEN);	/* see "repl_phase2_salvage" for why this is needed */		\
+	phs2cmt->tot_jrec_len = TN_JRECLEN;									\
+	phs2cmt->prev_jrec_len = JPL->lastwrite_len;								\
+	phs2cmt->write_complete = FALSE;									\
+	JNLPOOL.jrs.start_write_addr = rsrv_write_addr;								\
+	JNLPOOL.jrs.cur_write_addr = rsrv_write_addr + SIZEOF(jnldata_hdr_struct);				\
+	JNLPOOL.jrs.tot_jrec_len = TN_JRECLEN;									\
+	JNLPOOL.jrs.write_total = SIZEOF(jnldata_hdr_struct);	/* will be incremented as we copy		\
+								 * each jnlrec into jnlpool in phase2		\
+								 */						\
+	JNLPOOL.jrs.memcpy_skipped = FALSE;									\
+	JNLPOOL.jrs.phase2_commit_index = endIndex;								\
+	JNLPOOL.jrs.num_tcoms = 0;										\
+	/* Note: "mutex_salvage" and "repl_phase2_cleanup" rely on the below order of sets */			\
+	JPL->lastwrite_len = TN_JRECLEN;									\
+	JPL->rsrv_write_addr = rsrv_write_addr + TN_JRECLEN;							\
+	SHM_WRITE_MEMORY_BARRIER; /* see corresponding SHM_READ_MEMORY_BARRIER in "repl_phase2_cleanup" */	\
+	JPL->phase2_commit_index2 = nextIndex;									\
+} MBEND
+
+error_def(ERR_JNLPOOLRECOVERY);
+
+#define	JPL_PHASE2_WRITE_COMPLETE(JNLPOOL)									\
+MBSTART {													\
+	int			index;										\
+	jpl_phase2_in_prog_t	*phs2cmt;									\
+	jnldata_hdr_ptr_t	jnl_header;									\
+	jrec_prefix		*prefix;									\
+	uint4			tot_jrec_len;									\
+														\
+	GBLREF	uint4		process_id;									\
+	GBLREF	jnl_gbls_t	jgbl;										\
+														\
+	tot_jrec_len = JNLPOOL.jrs.tot_jrec_len;								\
+	assert(tot_jrec_len);											\
+	index = JNLPOOL.jrs.phase2_commit_index;								\
+	ASSERT_JNL_PHASE2_COMMIT_INDEX_IS_VALID(index, JPL_PHASE2_COMMIT_ARRAY_SIZE);				\
+	phs2cmt = &JNLPOOL.jnlpool_ctl->phase2_commit_array[index];						\
+	assert(phs2cmt->process_id == process_id);								\
+	assert(FALSE == phs2cmt->write_complete);								\
+	assert(phs2cmt->tot_jrec_len == tot_jrec_len);								\
+	assert(jgbl.cumul_index == jgbl.cu_jnl_index);								\
+	if (!JNLPOOL.jrs.memcpy_skipped)									\
+	{													\
+		assert(JNLPOOL.jrs.start_write_addr >= JNLPOOL.jnlpool_ctl->write_addr);			\
+		assert(JNLPOOL.jrs.start_write_addr < JNLPOOL.jnlpool_ctl->rsrv_write_addr);			\
+		jnl_header = (jnldata_hdr_ptr_t)(JNLPOOL.jnldata_base						\
+				+ (JNLPOOL.jrs.start_write_addr % JNLPOOL.jnlpool_ctl->jnlpool_size));		\
+		jnl_header->jnldata_len = tot_jrec_len;								\
+		assert(0 == (phs2cmt->prev_jrec_len % JNL_REC_START_BNDRY));					\
+		jnl_header->prev_jnldata_len = phs2cmt->prev_jrec_len;						\
+		DEBUG_ONLY(prefix = (jrec_prefix *)(JNLPOOL.jnldata_base					\
+					+ (JNLPOOL.jrs.start_write_addr + SIZEOF(jnldata_hdr_struct))		\
+							% JNLPOOL.jnlpool_ctl->jnlpool_size));			\
+		assert(JRT_BAD != prefix->jrec_type);								\
+		if ((JNLPOOL.jrs.write_total != tot_jrec_len)							\
+			DEBUG_ONLY(|| ((0 != TREF(gtm_test_jnlpool_sync))					\
+					&& (0 == (phs2cmt->jnl_seqno % TREF(gtm_test_jnlpool_sync))))))		\
+		{	/* This is an out-of-sync situation. "tot_jrec_len" (computed in phase1) is not equal	\
+			 * to "write_total" (computed in phase2). Not sure how this can happen but recover	\
+			 * from this situation by replacing the first record in the reserved space with a	\
+			 * JRT_BAD rectype. That way the source server knows this is a transaction that it	\
+			 * has to read from the jnlfiles and not the jnlpool.					\
+			 */											\
+			assert((0 != TREF(gtm_test_jnlpool_sync))						\
+					&& (0 == (phs2cmt->jnl_seqno % TREF(gtm_test_jnlpool_sync))));		\
+			assert(tot_jrec_len >= (SIZEOF(jnldata_hdr_struct) + SIZEOF(jrec_prefix)));		\
+			/* Note that it is possible jnl_header is 8 bytes shy of the jnlpool end in which case	\
+			 * "prefix" below would end up going outside the jnlpool range hence a simple		\
+			 * (jnl_header + 1) would not work to set prefix (and instead the % needed below).	\
+			 */											\
+			prefix = (jrec_prefix *)(JNLPOOL.jnldata_base						\
+					+ (JNLPOOL.jrs.start_write_addr + SIZEOF(jnldata_hdr_struct))		\
+							% JNLPOOL.jnlpool_ctl->jnlpool_size);			\
+			prefix->jrec_type = JRT_BAD;								\
+			send_msg_csa(CSA_ARG(NULL) VARLSTCNT(6) ERR_JNLPOOLRECOVERY, 4,				\
+				tot_jrec_len, JNLPOOL.jrs.write_total,						\
+				&phs2cmt->jnl_seqno, JNLPOOL.jnlpool_ctl->jnlpool_id.instfilename);		\
+			/* Now that JRT_BAD is set, fix cur_write_addr so it is set back in sync		\
+			 * (so later assert can succeed).							\
+			 */											\
+			DEBUG_ONLY(JNLPOOL.jrs.cur_write_addr = (JNLPOOL.jrs.start_write_addr + tot_jrec_len));	\
+		}												\
+		/* Need to make sure the writes of jnl_header->jnldata_len & jnl_header->prev_jnldata_len	\
+		 * happen BEFORE the write of phs2cmt->write_complete in that order. Hence need the write	\
+		 * memory barrier. Not doing this could cause another process in "repl_phase2_cleanup" to	\
+		 * see phs2cmt->write_complete as TRUE and update jnlpool_ctl->write_addr to reflect this	\
+		 * particular seqno even though the jnl_header write has not still happened. This could cause	\
+		 * a concurrently running source server to decide to read this seqno in "gtmsource_readpool"	\
+		 * and read garbage lengths in the jnl_header section.						\
+		 */												\
+		SHM_WRITE_MEMORY_BARRIER;									\
+	}													\
+	assert((JNLPOOL.jrs.start_write_addr + tot_jrec_len) == JNLPOOL.jrs.cur_write_addr);			\
+	phs2cmt->write_complete = TRUE;										\
+	JNLPOOL.jrs.tot_jrec_len = 0;	/* reset needed to prevent duplicate calls (e.g. "secshr_db_clnup") */	\
+	/* Invoke "repl_phase2_cleanup" sparingly as it calls "grab_latch". So we do it twice.			\
+	 * Once at half-way mark and once when a wrap occurs.							\
+	 */													\
+	if (!index || ((JPL_PHASE2_COMMIT_ARRAY_SIZE / 2) == index))						\
+		repl_phase2_cleanup(&JNLPOOL);									\
+} MBEND
+
 #if defined(__osf__) && defined(__alpha)
 # pragma pointer_size(save)
 # pragma pointer_size(long)
@@ -574,4 +820,8 @@ seq_num 	gtmsource_checkforbacklog(void);
 boolean_t	gtmsource_exchange_tls_info(void);
 #endif
 
+/********** Miscellaneous prototypes **********/
+void		repl_phase2_cleanup(jnlpool_addrs *jpa);
+void		repl_phase2_salvage(jnlpool_addrs *jpa, jnlpool_ctl_ptr_t jpl, jpl_phase2_in_prog_t *deadCmt);
+
 #endif /* GTMSOURCE_H */
diff --git a/sr_unix/gtmsource_end.c b/sr_unix/gtmsource_end.c
old mode 100755
new mode 100644
index cde14e6..c9f6ae8
--- a/sr_unix/gtmsource_end.c
+++ b/sr_unix/gtmsource_end.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	*
@@ -64,7 +64,6 @@ GBLREF	qw_num			repl_source_msg_sent;
 GBLREF	seq_num			seq_num_zero;
 GBLREF	repl_msg_ptr_t		gtmsource_msgp;
 GBLREF	uchar_ptr_t		repl_filter_buff;
-GBLREF	boolean_t		pool_init;
 
 int gtmsource_end1(boolean_t auto_shutdown)
 {
@@ -95,14 +94,9 @@ int gtmsource_end1(boolean_t auto_shutdown)
 	 */
 	if (!auto_shutdown && !INST_FREEZE_ON_ERROR_POLICY)
 	{
-		JNLPOOL_SHMDT(status, save_errno);
+		JNLPOOL_SHMDT(jnlpool, status, save_errno);
 		if (0 > status)
 			repl_log(gtmsource_log_fp, FALSE, TRUE, "Error detaching from journal pool : %s\n", STRERROR(save_errno));
-		jnlpool.repl_inst_filehdr = NULL;
-		jnlpool.gtmsrc_lcl_array = NULL;
-		jnlpool.gtmsource_local_array = NULL;
-		jnlpool.jnldata_base = NULL;
-		pool_init = FALSE;
 	}
 	gtmsource_free_msgbuff();
 	gtmsource_free_tcombuff();
diff --git a/sr_unix/gtmsource_onln_rlbk_clnup.c b/sr_unix/gtmsource_onln_rlbk_clnup.c
index 35c32ac..ad4d7e2 100644
--- a/sr_unix/gtmsource_onln_rlbk_clnup.c
+++ b/sr_unix/gtmsource_onln_rlbk_clnup.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	*
@@ -62,13 +63,13 @@ void	gtmsource_onln_rlbk_clnup()
 		 * entirety. To illustrate this -- consider that the journal pool contains the data from 1-100 and the source server
 		 * is currently sending sequence number 30 and is reading from the pool. Assume an online rollback happens that
 		 * takes the instance from sequence number 100 to sequence number 80 and leaves the journal pool write_addr and
-		 * early_write_addr untouched. Now, lets say GT.M process comes in after this and does a few more updates. All of
+		 * rsrv_write_addr untouched. Now, lets say GT.M process comes in after this and does a few more updates. All of
 		 * these updates will be written in the journal pool right after the "old-rolled-back" sequence number 100. If the
 		 * source server continues to read from the pool, it will send the valid data until sequence number 80. After that,
 		 * it will start sending the "old-rolled-back" sequence numbers 81-100 which is not right. To avoid this, rollback
-		 * should set the write_addr and early_write_addr by searching in the journal pool for sequence number 81. This is
+		 * should set the write_addr and rsrv_write_addr by searching in the journal pool for sequence number 81. This is
 		 * currently not done, but is something that we can think about when it comes to optimization. Until then, force
-		 * rollback to reset jnlpool's write_addr, write and early_write_addr to 0 and let source server be forced into
+		 * rollback to read only from the file until the current seqno (using gtmsource_save_read_jnl_seqno).
 		 * READ_FILE mode.
 		 */
 		gtmsource_local->read_state = READ_FILE;
@@ -83,8 +84,7 @@ void	gtmsource_onln_rlbk_clnup()
 		 * variable
 		 */
 		gtmsource_save_read_jnl_seqno = jnlpool.jnlpool_ctl->jnl_seqno;
-		gtmsource_local->read = jnlpool.jnlpool_ctl->write;
-		gtmsource_local->read_addr = jnlpool.jnlpool_ctl->write_addr;
+		GTMSOURCE_SET_READ_ADDR(gtmsource_local, jnlpool);
 		if (!was_crit)
 			rel_lock(jnlpool.jnlpool_dummy_reg);
 	}
diff --git a/sr_unix/gtmsource_process.c b/sr_unix/gtmsource_process.c
index 58b4a04..a80e331 100644
--- a/sr_unix/gtmsource_process.c
+++ b/sr_unix/gtmsource_process.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	*
@@ -168,9 +168,9 @@
 	} else															\
 		gtmsource_local->num_renegotiations++;										\
 }
-#else
 #endif
 
+#define	PHASE2_COMMIT_WAIT_CNT	8	/* 8 iterations of each 1 msec sleep before we decide to invoke "repl_phase2_cleanup" */
 
 GBLDEF	repl_msg_ptr_t		gtmsource_msgp = NULL;
 GBLDEF	int			gtmsource_msgbufsiz = 0;
@@ -683,6 +683,8 @@ int gtmsource_process(void)
 	char				histdetail[256];
 	sm_global_latch_ptr_t		gtmsource_srv_latch;
 	gtmsource_state_t		gtmsource_state_sav;
+	uint4				phase2_commit_index1;
+	int				phase2_commit_wait_cnt;
 	DEBUG_ONLY(uchar_ptr_t		save_inbuff;)
 	DEBUG_ONLY(uchar_ptr_t		save_outbuff;)
 	DCL_THREADGBL_ACCESS;
@@ -966,7 +968,7 @@ int gtmsource_process(void)
 		 *		file name as the value which would be used towards history record verification.
 		 *	3) If receiver server was started with -UPDATERESYNC and receiver is >= V55000 and at a seqno
 		 *		which is EQUAL to the earliest seqno for which we have a history record on the primary.
-		 *		We have	no way of verifying histories since we definitely dont have the history record
+		 *		We have	no way of verifying histories since we definitely don't have the history record
 		 *		for the receiver side seqno. Since -updateresync was used, assume they are in sync and
 		 *		start replicating from the earliest seqno for which we have a history record on the primary.
 		 *	4) If recvd_seqno is 1. In this case, the receiver instance has been created afresh so its instance
@@ -1298,7 +1300,7 @@ int gtmsource_process(void)
 		 	continue;
 		}
 		/* Now that REPL_WILL_RESTART_WITH_INFO message has been sent, if compression of the replication stream is
-		 * requested, check if the receiver server supports ability to decompress. Dont do this if this receiver has
+		 * requested, check if the receiver server supports ability to decompress. Don't do this if this receiver has
 		 * previously sent a REPL_CMP2UNCMP message.
 		 */
 		gtmsource_local->repl_zlib_cmp_level = repl_zlib_cmp_level = ZLIB_CMPLVL_NONE;	/* no compression by default */
@@ -1420,6 +1422,8 @@ int gtmsource_process(void)
 		gtmsource_local->next_histinfo_seqno = MAX_SEQNO; /* Initial value. Reset by "gtmsource_send_new_histrec" below */
 		assert(-1 == gtmsource_local->next_histinfo_num);
 		prev_now = gtmsource_now;
+		phase2_commit_index1 = 0;
+		phase2_commit_wait_cnt = 0;
 		while (TRUE)
 		{
 			gtmsource_poll_actions(TRUE);
@@ -1498,7 +1502,7 @@ int gtmsource_process(void)
 				continue;
 			}
 			if ((GTMSOURCE_SEARCHING_FOR_RESTART  == gtmsource_state)
-				|| (GTMSOURCE_WAITING_FOR_CONNECTION == gtmsource_state))
+					|| (GTMSOURCE_WAITING_FOR_CONNECTION == gtmsource_state))
 				break;
 			assert(gtmsource_state == GTMSOURCE_SENDING_JNLRECS);
 			pre_read_seqno = gtmsource_local->read_jnl_seqno;
@@ -1809,6 +1813,37 @@ int gtmsource_process(void)
 					gtmsource_flush_fh(post_read_seqno);
 					if (GTMSOURCE_HANDLE_ONLN_RLBK == gtmsource_state)
 						break; /* the outerloop will continue */
+					if ((READ_POOL == gtmsource_local->read_state)
+						&& (jctl->write_addr != jctl->rsrv_write_addr))
+					{	/* We found nothing to send in the journal pool but there is some phase2 commit
+						 * in progress. Check if it is dead and needs to be cleaned up by noting its
+						 * progress across various iterations of this "while" loop.
+						 */
+						if (phase2_commit_index1 == jctl->phase2_commit_index1)
+						{	/* We have been through one iteration of this "while" loop with
+							 * an intervening sleep and no changes happening. Do check.
+							 */
+							phase2_commit_wait_cnt++;
+							if (PHASE2_COMMIT_WAIT_CNT <= phase2_commit_wait_cnt)
+							{	/* Need to get "grab_lock" in order for "repl_phase2_cleanup"
+								 * to invoke "repl_phase2_salvage" logic. So try getting it
+								 * in immediate mode (second parameter FALSE below). If not
+								 * available, then try again next iteration.
+								 */
+								if (grab_lock(jnlpool.jnlpool_dummy_reg, FALSE, GRAB_LOCK_ONLY))
+								{
+									repl_phase2_cleanup(&jnlpool);
+									rel_lock(jnlpool.jnlpool_dummy_reg);
+									phase2_commit_wait_cnt = 0;
+								} else
+									phase2_commit_wait_cnt--; /* Try again next iteration */
+							}
+						} else
+						{
+							phase2_commit_wait_cnt = 0; /* there is progress since we last took note */
+							phase2_commit_index1 = jctl->phase2_commit_index1;
+						}
+					}
 					/* Sleep for a while (as part of the next REPL_RECV_LOOP) to avoid spinning when there is no
 					 * data to be sent
 					 */
diff --git a/sr_unix/gtmsource_process_ops.c b/sr_unix/gtmsource_process_ops.c
old mode 100755
new mode 100644
index 82c182e..913605c
--- a/sr_unix/gtmsource_process_ops.c
+++ b/sr_unix/gtmsource_process_ops.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	*
@@ -68,6 +68,7 @@
 #include "replgbl.h"
 #include "repl_inst_dump.h"		/* for "repl_dump_histinfo" prototype */
 #include "gtmdbgflags.h"
+#include "lockconst.h"
 #ifdef GTM_TLS
 #include "gtm_repl.h"
 #endif
@@ -513,7 +514,7 @@ int gtmsource_recv_restart(seq_num *recvd_jnl_seqno, int *msg_type, int *start_f
 		}
 		assert(msg.type == REPL_START_JNL_SEQNO || msg.type == REPL_FETCH_RESYNC || msg.type == REPL_XOFF_ACK_ME);
 		assert(MIN_REPL_MSGLEN == msg.len);
-		/* If we dont yet know the endianness of the other side and the input message is not a REPL_XOFF_ACK_ME
+		/* If we don't yet know the endianness of the other side and the input message is not a REPL_XOFF_ACK_ME
 		 * we can decide the endianness of the receiver side by the endianness of the input message.
 		 * REPL_XOFF_ACK_ME is an exception due to its handling by pre-V5500 versions (described in comments above).
 		 */
@@ -528,7 +529,7 @@ int gtmsource_recv_restart(seq_num *recvd_jnl_seqno, int *msg_type, int *start_f
 				repl_log(gtmsource_log_fp, TRUE, TRUE, "Source and Receiver sides have same endianness\n");
 		}
 		/* We only expect REPL_START_JNL_SEQNO, REPL_LOGFILE_INFO and REPL_XOFF_ACK_ME messages to be sent once the
-		 * endianness of the remote side has been determined. We dont expect the REPL_FETCH_RESYNC message to be
+		 * endianness of the remote side has been determined. We don't expect the REPL_FETCH_RESYNC message to be
 		 * ever sent in the middle of a handshake (i.e. after the remote side endianness has been determined).
 		 * Assert that. The logic that sets "msg_is_cross_endian" relies on this. If this assert fails, the logic
 		 * has to change.
@@ -607,7 +608,7 @@ int gtmsource_recv_restart(seq_num *recvd_jnl_seqno, int *msg_type, int *start_f
 			 * not timeout before receiving a response. */
 			remote_side->proto_ver = (RECAST(repl_resync_msg_ptr_t)&msg)->proto_ver;
 			remote_side->is_supplementary = (RECAST(repl_resync_msg_ptr_t)&msg)->is_supplementary;
-			/* The following fields dont need to be initialized since they are needed (for internal filter
+			/* The following fields don't need to be initialized since they are needed (for internal filter
 			 * transformations) only if we send journal records across. REPL_FETCH_RESYNC causes only
 			 * protocol messages to be exchanged (no journal records).
 			 *	remote_side->jnl_ver = ...
@@ -683,7 +684,7 @@ int gtmsource_srch_restart(seq_num recvd_jnl_seqno, int recvd_start_flags)
 		 * gtmsource_local->read_jnl_seqno as 30, but recvd_jnl_seqno as 60. This means that we are going to bump
 		 * "gtmsource_local->read_jnl_seqno" up to the received seqno (in the later call to "gtmsource_flush_fh") without
 		 * knowing how many bytes of transaction data that meant (to correspondingly bump up "gtmsource_local->read_addr").
-		 * The only case where we dont care to maintain "read_addr" is if we are in READ_FILE mode AND the current
+		 * The only case where we don't care to maintain "read_addr" is if we are in READ_FILE mode AND the current
 		 * read_jnl_seqno and the received seqno is both lesser than or equal to "gtmsource_save_read_jnl_seqno". Except
 		 * for that case, we need to reset "gtmsource_save_read_jnl_seqno" to correspond to the current jnl seqno.
 		 */
@@ -692,8 +693,7 @@ int gtmsource_srch_restart(seq_num recvd_jnl_seqno, int recvd_start_flags)
 			grab_lock(jnlpool.jnlpool_dummy_reg, TRUE, ASSERT_NO_ONLINE_ROLLBACK);
 			gtmsource_local->read_state = READ_FILE;
 			gtmsource_save_read_jnl_seqno = jctl->jnl_seqno;
-			gtmsource_local->read_addr = jnlpool.jnlpool_ctl->write_addr;
-			gtmsource_local->read = jnlpool.jnlpool_ctl->write;
+			GTMSOURCE_SET_READ_ADDR(gtmsource_local, jnlpool);
 			rel_lock(jnlpool.jnlpool_dummy_reg);
 		}
 	} else if (READ_POOL == gtmsource_local->read_state)
@@ -710,17 +710,17 @@ int gtmsource_srch_restart(seq_num recvd_jnl_seqno, int recvd_start_flags)
 			 QWGT(cur_read_jnl_seqno, recvd_jnl_seqno) &&
 			 QWGT(cur_read_jnl_seqno, jctl->start_jnl_seqno))
 		{
-			if (QWGE(jctl->early_write_addr, cur_read_addr))
+			if (QWGE(jctl->rsrv_write_addr, cur_read_addr))
 			{	/* If there is no more input to be read, the previous transaction size should not be read from the
 				 * journal pool since the read pointers point to the next read. In such a case, we can find the
 				 * size of the transcation cur_read_jnl_seqno from jctl->lastwrite_len. We should access
 				 * lastwrite_len after a memory barrier to avoid reading a stale value. We rely on the memory
 				 * barrier done in jnlpool_hasnt_overflowed */
 				save_lastwrite_len = jctl->lastwrite_len;
-				if (QWEQ(jctl->early_write_addr, cur_read_addr))
+				if (QWEQ(jctl->rsrv_write_addr, cur_read_addr))
 				{	/* GT.M is not writing any transaction, safe to rely on jctl->lastwrite_len. Note,
 					 * GT.M could not have been writing transaction cur_read_jnl_seqno if we are here. Also,
-					 * lastwrite_len cannot be in the future w.r.t early_write_addr because of the memory
+					 * lastwrite_len cannot be in the future w.r.t rsrv_write_addr because of the memory
 					 * barriers we do in t{p}_{t}end.c. It can be behind by atmost one transaction
 					 * (cur_read_jnl_seqno). Well, we want the length of transaction cur_read_jnl_seqno,
 					 * not cur_read_jnl_seqno + 1.
@@ -743,17 +743,31 @@ int gtmsource_srch_restart(seq_num recvd_jnl_seqno, int recvd_start_flags)
 				}
 			}
 			if (QWEQ(cur_read_addr, jctl->write_addr))
-			{ /* we caught a GTM process writing cur_read_jnl_seqno + 1, we cannot rely on lastwrite_len as it
-				* may or may not have changed. Wait until the GTM process finishes writing this transaction */
-				repl_log(gtmsource_log_fp, TRUE, FALSE, "SEARCHING RESYNC POINT IN POOL : Waiting for GTM process "
-										 "to finish writing journal records to the pool\n");
-				while (QWEQ(cur_read_addr, jctl->write_addr))
-				{
-					SHORT_SLEEP(GTMSOURCE_WAIT_FOR_JNL_RECS);
-					gtmsource_poll_actions(FALSE);
+			{	/* Check if there are any pending phase2 commits that can be cleaned up.
+				 * That will bring jctl->write_addr more uptodate. And then redo the read_addr/write_addr check.
+				 */
+				if (jctl->write_addr != jctl->rsrv_write_addr)
+					repl_phase2_cleanup(&jnlpool);
+				if (QWEQ(cur_read_addr, jctl->write_addr))
+				{	/* We caught a GTM process writing cur_read_jnl_seqno + 1,
+					 * we cannot rely on lastwrite_len as it may or may not have changed.
+					 * Wait until the GTM process finishes writing this transaction.
+					 */
+					repl_log(gtmsource_log_fp, TRUE, FALSE, "SEARCHING RESYNC POINT IN POOL : "
+						"Waiting for GTM process to finish writing journal records to the pool\n");
+					while (QWEQ(cur_read_addr, jctl->write_addr))
+					{
+						SHORT_SLEEP(GTMSOURCE_WAIT_FOR_JNL_RECS);
+						gtmsource_poll_actions(FALSE);
+						/* Check if there are any pending phase2 commits that can be cleaned up.
+						 * That will bring jctl->write_addr more uptodate.
+						 */
+						if (jctl->write_addr != jctl->rsrv_write_addr)
+							repl_phase2_cleanup(&jnlpool);
+					}
+					repl_log(gtmsource_log_fp, TRUE, FALSE, "SEARCHING RESYNC POINT IN POOL : "
+						"GTM process finished writing journal records to the pool\n");
 				}
-				repl_log(gtmsource_log_fp, TRUE, FALSE, "SEARCHING RESYNC POINT IN POOL : GTM process finished "
-										 "writing journal records to the pool\n");
 			}
 		}
 		while (jnlpool_hasnt_overflowed(jctl, jnlpool_size, cur_read_addr) &&
@@ -853,19 +867,33 @@ int gtmsource_get_jnlrecs(uchar_ptr_t buff, int *data_len, int maxbufflen, boole
 	seq_num			jnl_seqno, read_jnl_seqno;
 	qw_num			write_addr, read_addr;
 	gtmsource_state_t	gtmsource_state_sav;
+	int			index1;
+#	ifdef DEBUG
+	DCL_THREADGBL_ACCESS;
 
+	SETUP_THREADGBL_ACCESS;
+#	endif
 	jctl = jnlpool.jnlpool_ctl;
 	gtmsource_local = jnlpool.gtmsource_local;
-	write_addr = jctl->write_addr;
 	jnl_seqno = jctl->jnl_seqno;
 	read_jnl_seqno = gtmsource_local->read_jnl_seqno;
 	read_addr = gtmsource_local->read_addr;
-	assert(read_addr <= write_addr);
-	assert((0 != write_addr) || (read_jnl_seqno <= jctl->start_jnl_seqno));
 	GTMDBGFLAGS_NOFREQ_ONLY(GTMSOURCE_FORCE_READ_FILE_MODE, gtmsource_local->read_state = READ_FILE);
 	switch(gtmsource_local->read_state)
 	{
 		case READ_POOL:
+			/* Check if there are any pending phase2 commits that can be cleaned up.
+			 * That will bring jctl->write_addr more uptodate.
+			 */
+			index1 = jctl->phase2_commit_index1;
+			assert((0 <= index1) && (JPL_PHASE2_COMMIT_ARRAY_SIZE > index1));
+			if ((index1 != jctl->phase2_commit_index2) && jctl->phase2_commit_array[index1].write_complete
+					&& (LOCK_AVAILABLE == jctl->phase2_commit_latch.u.parts.latch_pid))
+				repl_phase2_cleanup(&jnlpool);
+			/* Now that write_addr is uptodate, go ahead and read jnl records */
+			write_addr = jctl->write_addr;
+			assert((0 != write_addr) || (read_jnl_seqno <= jctl->start_jnl_seqno));
+			assert(read_addr <= write_addr);
 			if (read_addr == write_addr)
 			{	/* Nothing to read. While reading pool, the comparison of read_addr against write_addr is
 				 * the only reliable indicator if there are any transactions to be read. This is due to
@@ -883,7 +911,16 @@ int gtmsource_get_jnlrecs(uchar_ptr_t buff, int *data_len, int maxbufflen, boole
 			if (GTMSOURCE_WAITING_FOR_CONNECTION == gtmsource_state)
 				return (0);	/* Connection got reset in call to "gtmsource_readpool" */
 			if (0 < total_tr_len)
-				return (total_tr_len);
+			{	/* Found the entire seqno in the jnlpool. Check if the first journal record of this seqno
+				 * is of type JRT_BAD. This indicates a ERR_JNLPOOLRECOVERY situation (see
+				 * JPL_PHASE2_WRITE_COMPLETE macro for details). If so, switch to reading from files.
+				 */
+				assert(total_tr_len >= (SIZEOF(jnldata_hdr_struct) + SIZEOF(jrec_prefix)));
+				if (JRT_BAD != ((jrec_prefix *)buff)->jrec_type)
+					return (total_tr_len);
+				assert((0 != TREF(gtm_test_jnlpool_sync)) && (0 == (read_jnl_seqno % TREF(gtm_test_jnlpool_sync))));
+				*data_len = -1;	/* so we do fall through to READ_FILE code below */
+			}
 			if (0 < *data_len)
 				return (-1);
 			/* Overflow, switch to READ_FILE */
@@ -896,6 +933,14 @@ int gtmsource_get_jnlrecs(uchar_ptr_t buff, int *data_len, int maxbufflen, boole
 			/* CAUTION : FALL THROUGH */
 
 		case READ_FILE:
+			/* Note that while reading from journal files, it is possible the source server sees the journal records
+			 * for a transaction in the journal files BEFORE the transaction is marked as complete in the journal
+			 * pool (because FINISH_JNL_PHASE2_IN_JNLPOOL_IF_NEEDED is called AFTER FINISH_JNL_PHASE2_IN_JNLBUFF
+			 * in NONTP_FINISH_JNL_PHASE2_IN_JNLBUFF_AND_JNLPOOL and TP_FINISH_JNL_PHASE2_IN_JNLBUFF_AND_JNLPOOL).
+			 * Therefore it is possible read_addr (which is derived from the journal file records) could be greater
+			 * than write_addr (which is derived from the journal pool). And so "assert(read_addr <= write_addr)"
+			 * cannot be done here like is done for the READ_POOL case.
+			 */
 			if (read_jnl_seqno >= jnl_seqno)
 			{	/* Nothing to read. While reading from files, source server does not use write_addr to decide
 				 * how much to read. Also, it is possible that read_addr and write_addr are the same if the
@@ -1045,7 +1090,7 @@ static	boolean_t	gtmsource_repl_recv(repl_msg_ptr_t msg, int4 msglen, int4 msgty
 				return FALSE;
 			/* Check if we received an XOFF_ACK_ME message completely. If yes, we can safely break out of the
 			 * loop without receiving the originally intended message (as the receiver is going to drain away all
-			 * the stuff in the replication pipe anyways and reinitiate a fresh handshake). This way we dont hang
+			 * the stuff in the replication pipe anyways and reinitiate a fresh handshake). This way we don't hang
 			 * eternally waiting for a never-arriving originally intended message.
 			 */
 			if ((MIN_REPL_MSGLEN <= recvd_len) && (REPL_XOFF_ACK_ME == msg->type))
@@ -1881,7 +1926,7 @@ void	gtmsource_send_new_histrec()
 			if ((GTMSOURCE_CHANGING_MODE == gtmsource_state) || (GTMSOURCE_WAITING_FOR_CONNECTION == gtmsource_state))
 				return; /* send did not succeed */
 			/* If we have a non-zero stream history record, then check if its "start_seqno" is lesser than
-			 * gtmsource_local->read_jnl_seqno. If so, we dont even need to send this history record. If it is
+			 * gtmsource_local->read_jnl_seqno. If so, we don't even need to send this history record. If it is
 			 * equal though, we do need to send this across.
 			 */
 			assert(gtmsource_local->read_jnl_seqno >= histinfo.start_seqno);
diff --git a/sr_unix/gtmsource_readfiles.c b/sr_unix/gtmsource_readfiles.c
index a506b83..1a34e8c 100644
--- a/sr_unix/gtmsource_readfiles.c
+++ b/sr_unix/gtmsource_readfiles.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	*
@@ -91,18 +91,19 @@ MBSTART {													\
 #define	GTMSRC_DO_JNL_FLUSH_IF_POSSIBLE(CTL, CSA)									\
 MBSTART {														\
 	boolean_t		flush_done;										\
-	uint4			dskaddr, freeaddr, saved_jpc_cycle;							\
+	uint4			dskaddr, freeaddr, rsrv_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);						\
+	DO_JNL_FLUSH_IF_POSSIBLE(CTL->reg, CSA, flush_done, dskaddr, freeaddr, rsrv_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);		\
+			"state %s : seqno %llu [0x%llx]. [dskaddr 0x%x freeaddr 0x%x rsrv_freeaddr 0x%x]\n",		\
+			CTL->jnl_fn, jnl_file_state_lit[CTL->file_state], CTL->seqno, CTL->seqno,			\
+			dskaddr, freeaddr, rsrv_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)	\
@@ -416,7 +417,7 @@ static	int open_newer_gener_jnlfiles(gd_region *reg, repl_ctl_element *reg_ctl_e
 	/* Note that at this point, journaling might have been turned OFF (e.g. REPL_WAS_ON state) in which case
 	 * JNL_GDID_PTR(csa) would have been nullified by jnl_file_lost. Therefore comparing with that is not a good idea
 	 * to use the "id" to check if the journal file remains same (this was done previously). Instead use the ID of
-	 * the current reg_ctl_end and the NAME of the newly opened journal file. Because we dont have crit, we cannot
+	 * the current reg_ctl_end and the NAME of the newly opened journal file. Because we don't have crit, we cannot
 	 * safely read the journal file name from the file header therefore we invoke repl_ctl_create unconditionally
 	 * (that has safety protections for crit) and use the new_ctl that it returns to access the journal file name
 	 * returned and use that for the ID to NAME comparison.
@@ -737,11 +738,12 @@ static	int update_max_seqno_info(repl_ctl_element *ctl)
 					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 "
+					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%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);
+						"seqno %llu [0x%llx]. [dskaddr 0x%x freeaddr 0x%x rsrv_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, csa->jnl->jnl_buff->rsrv_freeaddr);
 				}
 			} else
 			{
@@ -1049,9 +1051,10 @@ static	int read_transaction(repl_ctl_element *ctl, unsigned char **buff, int *bu
 			{
 				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%x freeaddr 0x%x]. Check for problems with journaling\n",
+					"[dskaddr 0x%x freeaddr 0x%x rsrv_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);
+					csa->jnl->jnl_buff->dskaddr, csa->jnl->jnl_buff->freeaddr,
+					csa->jnl->jnl_buff->rsrv_freeaddr);
 			}
 		} else
 		{
@@ -1370,12 +1373,21 @@ static	tr_search_state_t position_read(repl_ctl_element *ctl, seq_num read_seqno
 			/* Since we know that read_seqno is LESSER than ctl->max_seqno, we know for sure we should not return
 			 * this function with found = TR_NOT_FOUND. If ever the binary/linear search invocation at the end of
 			 * this function returns with TR_NOT_FOUND, we have to change that to TR_WILL_NOT_BE_FOUND and also
-			 * adjust ctl->seqno to point to ctl->max_seqno that way we dont repeat binary search (wastefully) for
+			 * adjust ctl->seqno to point to ctl->max_seqno that way we don't repeat binary search (wastefully) for
 			 * all seqnos between read_seqno and the least seqno larger than read_seqno in this file.
 			 */
 			willnotbefound_addr = hi_addr;
 			assert(ctl->max_seqno_dskaddr < rb->fc->eof_addr);
 			willnotbefound_stop_at = rb->fc->eof_addr;
+			if (lo_addr == hi_addr)
+			{	/* Since hi_addr corresponds to ctl->max_seqno which is in turn > read_seqno, the above
+				 * "if" check succeeding implies we can never find read_seqno here. So skip calling
+				 * "do_binary_search" in that case as that and "do_linear_search" have asserts that expect
+				 * callers to never invoke them with the same value of lo_addr and hi_addr.
+				 */
+				found = TR_NOT_FOUND;
+				srch_func = NULL;
+			}
 		} else if (read_seqno == ctl->max_seqno)
 		{	/* For read_seqno == ctl->max_seqno, do not use linear search. Remember, max_seqno_dskaddr may be the
 			 * the address of the TCOM record of a transaction, and this TCOM record may be in a different block
@@ -1429,7 +1441,8 @@ static	tr_search_state_t position_read(repl_ctl_element *ctl, seq_num read_seqno
 #	endif
 	REPL_DPRINT6("position_read: Using %s search to locate %llu in %s between %u and %u\n",
 			(srch_func == do_linear_search) ? "linear" : "binary", read_seqno, ctl->jnl_fn, lo_addr, hi_addr);
-	found = srch_func(ctl, lo_addr, hi_addr, read_seqno, &srch_status);
+	if (NULL != srch_func)
+		found = srch_func(ctl, lo_addr, hi_addr, read_seqno, &srch_status);
 	if ((TR_NOT_FOUND == found) && (0 != willnotbefound_addr))
 	{	/* There is a block that contains a seqno larger than read_seqno; leave ctl positioned at this higher seqno.
 		 * If we don't do this, we could end up in an infinite loop if the caller of this function is "read_regions".
@@ -1516,10 +1529,11 @@ static	int read_and_merge(unsigned char *buff, int maxbufflen, seq_num read_jnl_
 						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 = %llu [0x%llx]. [dskaddr = 0x%x,freeaddr = 0x%x,rsrv_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);
+						csa->jnl->jnl_buff->freeaddr, csa->jnl->jnl_buff->rsrv_freeaddr,
+						ctl->repl_rctl->read_complete);
 				}
 			}
 		}
@@ -1673,7 +1687,7 @@ static	int read_regions(unsigned char **buff, int *buff_avail,
 					if (QWLT(read_jnl_seqno, jctl->jnl_seqno))
 					{
 						csa = &FILE_INFO(ctl->reg)->s_addrs;
-						freeaddr = csa->jnl->jnl_buff->freeaddr;
+						freeaddr = csa->jnl->jnl_buff->rsrv_freeaddr;
 						if ((ctl->repl_buff->fc->eof_addr == freeaddr) || (!JNL_ENABLED(csa->hdr)))
 						{	/* No more pending updates in the journal file. Next update to the
 							 * journal file will take the seqno jctl->jnl_seqno which will be
@@ -1927,7 +1941,7 @@ int gtmsource_readfiles(unsigned char *buff, int *data_len, int maxbufflen, bool
 	 * concurrent GT.M process updates this 8-byte field in a sequence of two 4-byte operations instead of one
 	 * atomic operation (possible in architectures where 8-byte operations are not native) AND if the pre-update and
 	 * post-update value differ in their most significant 4-bytes. Since that is considered a virtually impossible
-	 * rare occurrence and since we want to avoid the overhead of doing a "grab_lock", we dont do that here.
+	 * rare occurrence and since we want to avoid the overhead of doing a "grab_lock", we don't do that here.
 	 */
 	assert(REPL_MSG_HDRLEN == SIZEOF(jnldata_hdr_struct));
 	DEBUG_ONLY(loopcnt = 0;)
@@ -1965,9 +1979,9 @@ int gtmsource_readfiles(unsigned char *buff, int *data_len, int maxbufflen, bool
 			if (gtmsource_save_read_jnl_seqno < read_jnl_seqno)
 			{
 				read_addr += read_size;
-				if (jnlpool_size >= (jctl->early_write_addr - read_addr))
+				if (jnlpool_size >= (jctl->rsrv_write_addr - read_addr))
 				{	/* No more overflow, switch to READ_POOL.  To avoid the expense of memory barrier
-					 * in jnlpool_hasnt_overflowed(), we use a possibly stale value of early_write_addr
+					 * in jnlpool_hasnt_overflowed(), we use a possibly stale value of rsrv_write_addr
 					 * to check if we can switch back to pool. The consequence is that we may switch
 					 * back and forth between file and pool read if we are in a situation wherein a GTM
 					 * process races with source server, writing transactions into the pool right when
@@ -2050,6 +2064,12 @@ int gtmsource_readfiles(unsigned char *buff, int *data_len, int maxbufflen, bool
 	} while (TRUE);
 	if (file2pool && !gtmsource_local->jnlfileonly)
 	{
+		/* Ahead of the transition to pool, force repl_phase2_cleanup() when write_addr is behind read_addr. This
+		 * condition happens frequently with replicating instances and instances with infrequent updates.
+		 */
+		if (jctl->write_addr < read_addr)
+			repl_phase2_cleanup(&jnlpool);
+		assert(jctl->write_addr >= read_addr);
 		gtmsource_local->read = (uint4)(read_addr % jnlpool_size) ;
 		gtmsource_local->read_state = read_state = READ_POOL;
 	} else
diff --git a/sr_unix/gtmsource_readpool.c b/sr_unix/gtmsource_readpool.c
old mode 100755
new mode 100644
index 59ce1f5..6c1f50e
--- a/sr_unix/gtmsource_readpool.c
+++ b/sr_unix/gtmsource_readpool.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	*
@@ -54,7 +54,7 @@ GBLREF	gtmsource_state_t	gtmsource_state;
 int gtmsource_readpool(uchar_ptr_t buff, int *data_len, int maxbufflen, boolean_t read_multiple, qw_num stop_read_at)
 {
 	uint4 			jnldata_len, read_size, jnlpool_size, avail_data;
-	uint4			first_tr_len, num_tr_read, tr_len;
+	uint4			first_tr_len, num_tr_read, orig_first_tr_len, orig_tr_len, tr_len;
 	int64_t			read, wrap_size; /* This can be negative. Must handle a signed 4G value */
 	uchar_ptr_t		buf_top, tr_p;
 	jnlpool_ctl_ptr_t	jctl;
@@ -63,6 +63,9 @@ int gtmsource_readpool(uchar_ptr_t buff, int *data_len, int maxbufflen, boolean_
 	jnldata_hdr_ptr_t	jnl_header;
 	qw_num			read_addr, avail_data_qw;
 	seq_num			read_jnl_seqno, jnl_seqno, next_read_seqno, next_histinfo_seqno;
+	jnl_record		*jnlrec;
+	boolean_t		trim_this_seqno;
+	uchar_ptr_t		trim_buff;
 
 	jctl = jnlpool.jnlpool_ctl;
 	jnlpool_size = jctl->jnlpool_size;
@@ -86,167 +89,208 @@ int gtmsource_readpool(uchar_ptr_t buff, int *data_len, int maxbufflen, boolean_
 		}
 		next_histinfo_seqno = gtmsource_local->next_histinfo_seqno;
 		next_read_seqno = read_jnl_seqno;
-		if (jnlpool_hasnt_overflowed(jctl, jnlpool_size, read_addr))
-		{	/* No overflow yet. Before we read the content (including the jnldata_len read below), we have to ensure
-			 * we read up-to-date content. We rely on the memory barrier done in jnlpool_hasnt_overflowed for this.
-			 */
-			assert(read + SIZEOF(jnldata_hdr_struct) <= jnlpool_size);
-			jnl_header = (jnldata_hdr_ptr_t)(jnldata_base + read);
-			first_tr_len = jnldata_len = jnl_header->jnldata_len;
+		if (!jnlpool_hasnt_overflowed(jctl, jnlpool_size, read_addr))
+			break; /* overflow happened, or about to happen */
+		/* No overflow yet. Before we read the content (including the jnldata_len read below), we have to ensure
+		 * we read up-to-date content. We rely on the memory barrier done in jnlpool_hasnt_overflowed for this.
+		 */
+		assert(read + SIZEOF(jnldata_hdr_struct) <= jnlpool_size);
+		jnl_header = (jnldata_hdr_ptr_t)(jnldata_base + read);
+		first_tr_len = jnldata_len = jnl_header->jnldata_len;
+		if (read_multiple)
+		{
+			assert(stop_read_at >= read_addr);
+			avail_data_qw = stop_read_at - read_addr;
+			assert(maxbufflen <= MAXPOSINT4); /* to catch the case of change in type of maxbufflen */
+			avail_data = (uint4)MIN(avail_data_qw, (qw_num)maxbufflen);
+			assert(next_read_seqno < next_histinfo_seqno);
+			read_multiple = (first_tr_len < avail_data) && ((next_read_seqno + 1) < next_histinfo_seqno);
 			if (read_multiple)
+				jnldata_len = avail_data;
+		}
+		if (SIZEOF(jnldata_hdr_struct) < jnldata_len && jnldata_len <= jnlpool_size)
+		{
+			read_size = jnldata_len - SIZEOF(jnldata_hdr_struct);
+			if (0 < read_size && read_size <= maxbufflen)
 			{
-				assert(stop_read_at >= read_addr);
-				avail_data_qw = stop_read_at - read_addr;
-				assert(maxbufflen <= MAXPOSINT4); /* to catch the case of change in type of maxbufflen */
-				avail_data = (uint4)MIN(avail_data_qw, (qw_num)maxbufflen);
-				assert(next_read_seqno < next_histinfo_seqno);
-				read_multiple = (first_tr_len < avail_data) && ((next_read_seqno + 1) < next_histinfo_seqno);
-				if (read_multiple)
-					jnldata_len = avail_data;
-			}
-			if (SIZEOF(jnldata_hdr_struct) < jnldata_len && jnldata_len <= jnlpool_size)
-			{
-				read_size = jnldata_len - SIZEOF(jnldata_hdr_struct);
-				if (0 < read_size && read_size <= maxbufflen)
-				{
-					if (0 < (wrap_size = ((int64_t)read - (jnlpool_size - jnldata_len))))
-						read_size -= wrap_size;
-					memcpy(buff, (sm_uc_ptr_t)jnl_header + SIZEOF(jnldata_hdr_struct), read_size);
-					if (0 < wrap_size)
-						memcpy(buff + read_size, jnldata_base, wrap_size);
-					/* Now that we have read the content, we have to ensure that we haven't read content
-					 * that may been overwritten. We rely on the memory barrier done in
-					 * jnlpool_hasnt_overflowed for this
+				if (0 < (wrap_size = ((int64_t)read - (jnlpool_size - jnldata_len))))
+					read_size -= wrap_size;
+				memcpy(buff, (sm_uc_ptr_t)jnl_header + SIZEOF(jnldata_hdr_struct), read_size);
+				if (0 < wrap_size)
+					memcpy(buff + read_size, jnldata_base, wrap_size);
+				jnlrec = (jnl_record *)buff;
+				/* Now that we have read the content, we have to ensure that we haven't read content
+				 * that may have been overwritten. We rely on the memory barrier done in
+				 * "jnlpool_hasnt_overflowed" for this. In addition, check for JRT_BAD (this is indication
+				 * of a ERR_JNLPOOLRECOVERY situation) and if so switch to READ_FILE.
+				 */
+				if ((jnlpool_hasnt_overflowed(jctl, jnlpool_size, read_addr))
+							&& (JRT_BAD != jnlrec->prefix.jrec_type))
+				{	/* No overflow. Only now are we guaranteed a good value of "first_tr_len". */
+					/* Check if this seqno was processed by "repl_phase2_salvage". In that case, it
+					 * would contain just one NULL record so copy just that and ignore the rest of
+					 * the reserved space (if any). Note that if the rest of the reserved space is
+					 * 0 bytes long, then we don't need any special processing.
 					 */
-					if (jnlpool_hasnt_overflowed(jctl, jnlpool_size, read_addr))
-					{	/* No overflow. Only now are we guaranteed a good value of "first_tr_len". */
-						assert(first_tr_len % JNL_WRT_END_MODULUS == 0);
-						REPL_DEBUG_ONLY(
-							assert(repl_tr_good(buff, first_tr_len - SIZEOF(jnldata_hdr_struct),
-									read_jnl_seqno));
-							num_tr_read = 1;
-						)
-						next_read_seqno++;
-						assert(next_read_seqno <= next_histinfo_seqno);
-						if (read_multiple)
-						{	/* Although stop_read_at - read_addr contains no partial transaction, it
-							 * is possible that stop_read_at - read_addr is more than maxbufflen, and
-							 * hence we read fewer bytes than stop_read_at - read_addr; scan what we
-							 * read to figure out if the tail is an incomplete transaction.
-							 */
-							assert(first_tr_len < jnldata_len); /* must hold if multiple transactions
-												were read */
-							tr_p = buff + first_tr_len - SIZEOF(jnldata_hdr_struct);
-							buf_top = buff + jnldata_len - SIZEOF(jnldata_hdr_struct);
-							while (SIZEOF(jnldata_hdr_struct) < (buf_top - tr_p))
-							{	/* more than hdr available */
-								tr_len = ((jnldata_hdr_ptr_t)tr_p)->jnldata_len;
-								assert(tr_len % JNL_WRT_END_MODULUS == 0);
-								assert(0 < tr_len);
-								assert(tr_len <= jnlpool_size);
-								if (tr_len <= (buf_top - tr_p)) /* transaction completely read */
-								{	/* The message type and len assignments are a violation of
-									 * layering; ideally, this should be done in
-									 * gtmsource_process(), but we choose to do it here for
-									 * performance reasons. If we have to do it in
-									 * gtmsource_process(), we have to scan the buffer again.
+					first_tr_len -= SIZEOF(jnldata_hdr_struct);
+					assert(0 == (first_tr_len % JNL_WRT_END_MODULUS));
+					assert(first_tr_len >= NULL_RECLEN);
+					orig_first_tr_len = first_tr_len;
+					trim_buff = NULL;
+					if ((JRT_NULL == jnlrec->prefix.jrec_type) && (NULL_RECLEN != first_tr_len))
+					{
+						first_tr_len = NULL_RECLEN;
+						trim_buff = buff + NULL_RECLEN;
+					}
+#					ifdef REPL_DEBUG
+					assert(repl_tr_good(buff, first_tr_len, read_jnl_seqno));
+					num_tr_read = 1;
+#					endif
+					next_read_seqno++;
+					assert(next_read_seqno <= next_histinfo_seqno);
+					if (read_multiple)
+					{	/* Although stop_read_at - read_addr contains no partial transaction, it
+						 * is possible that stop_read_at - read_addr is more than maxbufflen, and
+						 * hence we read fewer bytes than stop_read_at - read_addr; scan what we
+						 * read to figure out if the tail is an incomplete transaction.
+						 */
+						assert((orig_first_tr_len + SIZEOF(jnldata_hdr_struct)) < jnldata_len);
+							/* above must hold if multiple transactions were read */
+						tr_p = buff + orig_first_tr_len;
+						buf_top = buff + jnldata_len - SIZEOF(jnldata_hdr_struct);
+						while (SIZEOF(jnldata_hdr_struct) < (buf_top - tr_p))
+						{	/* more than hdr available */
+							orig_tr_len = tr_len = ((jnldata_hdr_ptr_t)tr_p)->jnldata_len;
+							assert(0 == (tr_len % JNL_WRT_END_MODULUS));
+							assert(0 < tr_len);
+							assert(tr_len <= jnlpool_size);
+							if (tr_len <= (buf_top - tr_p)) /* transaction completely read */
+							{
+								jnlrec = (jnl_record *)(tr_p + SIZEOF(jnldata_hdr_struct));
+								if (JRT_BAD == jnlrec->prefix.jrec_type)
+								{	/* This is indication of a ERR_JNLPOOLRECOVERY situation
+									 * and so we need to switch to READ_FILE for this seqno.
+									 * Do that by stopping the READ_POOL until the seqno before
+									 * this one. So break out of loop that reads more seqnos.
 									 */
-									((repl_msg_ptr_t)tr_p)->type = REPL_TR_JNL_RECS;
-									((repl_msg_ptr_t)tr_p)->len = tr_len;
-									REPL_DEBUG_ONLY(
-										assert(repl_tr_good(tr_p + REPL_MSG_HDRLEN,
-											tr_len - REPL_MSG_HDRLEN,
-											read_jnl_seqno + num_tr_read));
-										num_tr_read++;
-									)
-									next_read_seqno++;
-									tr_p += tr_len;
-									if (next_read_seqno >= next_histinfo_seqno)
-									{	/* Dont read more than boundary of next histinfo */
-										assert(next_read_seqno == next_histinfo_seqno);
-										break;
-									}
+									break;
+								}
+								if ((JRT_NULL == jnlrec->prefix.jrec_type)
+									&& ((NULL_RECLEN + SIZEOF(jnldata_hdr_struct)) != tr_len))
+								{
+									trim_this_seqno = TRUE;
+									tr_len = NULL_RECLEN + REPL_MSG_HDRLEN;
 								} else
+									trim_this_seqno = FALSE;
+								/* The message type and len assignments are a violation of
+								 * layering; ideally, this should be done in
+								 * gtmsource_process(), but we choose to do it here for
+								 * performance reasons. If we have to do it in
+								 * gtmsource_process(), we have to scan the buffer again.
+								 */
+								((repl_msg_ptr_t)tr_p)->type = REPL_TR_JNL_RECS;
+								((repl_msg_ptr_t)tr_p)->len = tr_len;
+#								ifdef REPL_DEBUG
+								assert(repl_tr_good(tr_p + REPL_MSG_HDRLEN,
+									tr_len - REPL_MSG_HDRLEN,
+									read_jnl_seqno + num_tr_read));
+								num_tr_read++;
+#								endif
+								if (NULL != trim_buff)
 								{
-									REPL_DPRINT5("Partial transaction read since jnldata_len"
-										" %llu larger than maxbufflen %d, tr_len %d, "
-										"remaining buffer %d\n", avail_data_qw, maxbufflen,
-										tr_len, buf_top - tr_p);
+									memmove(trim_buff, tr_p, tr_len);
+									trim_buff += tr_len;
+								} else if (trim_this_seqno)
+									trim_buff = tr_p + tr_len;
+								next_read_seqno++;
+								tr_p += orig_tr_len;
+								if (next_read_seqno >= next_histinfo_seqno)
+								{	/* Don't read more than boundary of next histinfo */
+									assert(next_read_seqno == next_histinfo_seqno);
 									break;
 								}
+							} else
+							{
+								REPL_DPRINT5("Partial transaction read since jnldata_len"
+									" %llu larger than maxbufflen %d, tr_len %d, "
+									"remaining buffer %d\n", avail_data_qw, maxbufflen,
+									tr_len, buf_top - tr_p);
+								break;
 							}
-							REPL_DEBUG_ONLY(
-								if (0 != (buf_top - tr_p))
-								{
-									REPL_DPRINT4("Partial tr header read since jnldata_len "
-										"%llu larger than maxbufflen %d, incomplete header"
-										" length %d\n", avail_data_qw, maxbufflen,
-										buf_top - tr_p);
-								}
-							)
-							jnldata_len = (uint4)((tr_p - buff) + SIZEOF(jnldata_hdr_struct));
-							wrap_size = ((int64_t)read - (jnlpool_size - jnldata_len));
 						}
-						REPL_DPRINT4("Pool read seqno : "INT8_FMT" Num Tr read : %d Total Tr len : %d\n",
-						       INT8_PRINT(read_jnl_seqno), num_tr_read, jnldata_len);
-						REPL_DPRINT4("Read %u : Next read : %ld : %s\n", read,
-							(0 > wrap_size) ? read + jnldata_len : wrap_size,
-							(0 > wrap_size) ? "" : " READ WRAPPED");
-						assert(next_read_seqno <= next_histinfo_seqno);
-						/* Before sending the seqnos, check if a new histinfo got concurrently written */
-						assert(gtmsource_local->next_histinfo_num <= gtmsource_local->num_histinfo);
-						if ((gtmsource_local->next_histinfo_num == gtmsource_local->num_histinfo)
-							&& (gtmsource_local->num_histinfo
-									!= jnlpool.repl_inst_filehdr->num_histinfo))
-						{	/* We are sending seqnos of the last histinfo (that is open-ended) and
-							 * there has been at least one histinfo concurrently added to this instance
-							 * file compared to what is in our private memory. Set the next histinfo's
-							 * start_seqno and redo the read with the new "next_histinfo_seqno".
-							 */
-							assert(MAX_SEQNO == gtmsource_local->next_histinfo_seqno);
-							gtmsource_set_next_histinfo_seqno(TRUE);
-								/* Set the next histinfo's start_seqno and redo the read */
-							if (GTMSOURCE_WAITING_FOR_CONNECTION == gtmsource_state)
-							{	/* Connection reset in "gtmsource_set_next_histinfo_seqno" */
-								return 0;
-							}
-							continue;
+#						ifdef REPL_DEBUG
+						if (0 != (buf_top - tr_p))
+						{
+							REPL_DPRINT4("Partial tr header read since jnldata_len "
+								"%llu larger than maxbufflen %d, incomplete header"
+								" length %d\n", avail_data_qw, maxbufflen,
+								buf_top - tr_p);
 						}
-						read = ((0 > wrap_size) ? read + jnldata_len : wrap_size);
-						read_addr += jnldata_len;
-						read_jnl_seqno = next_read_seqno;
-						assert(read_jnl_seqno <= gtmsource_local->next_histinfo_seqno);
-						assert(stop_read_at >= read_addr);
-						assert(jnl_seqno >= read_jnl_seqno - 1);
-						/* In the rare case when we read the transaction read_jnl_seqno just as
-						 * it becomes available and before the GTM process that wrote it updates
-						 * jctl->jnl_seqno in t_end/tp_tend, we may return from this function
-						 * with read_jnl_seqno one more than jctl->jnl_seqno. This is such a rare
-						 * case that we don't want to add a wait loop for jctl->jnl_seqno to become
-						 * equal to read_jnl_seqno. We expect that by the time we send the just read
-						 * transaction(s) using socket I/O, jctl->jnl_seqno would have been updated.
-						 * In any case, we prevent ourselves from misinterpreting this condition when
-						 * read_jnl_seqno is compared against jctl->jnl_seqno in gtmsource_process(),
-						 * gtmsource_get_jnlrecs() and gtmsource_showbacklog().
+#						endif
+						jnldata_len = (uint4)((tr_p - buff) + SIZEOF(jnldata_hdr_struct));
+						assert(0 == (jnldata_len % JNL_WRT_END_MODULUS));
+						wrap_size = ((int64_t)read - (jnlpool_size - jnldata_len));
+					}
+					REPL_DPRINT4("Pool read seqno : "INT8_FMT" Num Tr read : %d Total Tr len : %d\n",
+					       INT8_PRINT(read_jnl_seqno), num_tr_read, jnldata_len);
+					REPL_DPRINT4("Read %u : Next read : %ld : %s\n", read,
+						(0 > wrap_size) ? read + jnldata_len : wrap_size,
+						(0 > wrap_size) ? "" : " READ WRAPPED");
+					assert(next_read_seqno <= next_histinfo_seqno);
+					/* Before sending the seqnos, check if a new histinfo got concurrently written */
+					assert(gtmsource_local->next_histinfo_num <= gtmsource_local->num_histinfo);
+					if ((gtmsource_local->next_histinfo_num == gtmsource_local->num_histinfo)
+						&& (gtmsource_local->num_histinfo != jnlpool.repl_inst_filehdr->num_histinfo))
+					{	/* We are sending seqnos of the last histinfo (that is open-ended) and
+						 * there has been at least one histinfo concurrently added to this instance
+						 * file compared to what is in our private memory. Set the next histinfo's
+						 * start_seqno and redo the read with the new "next_histinfo_seqno".
 						 */
-						assert(read == read_addr % jnlpool_size);
-						gtmsource_local->read = read;
-						gtmsource_local->read_addr = read_addr;
-						gtmsource_local->read_jnl_seqno = read_jnl_seqno;
-						*data_len = first_tr_len - SIZEOF(jnldata_hdr_struct);
-						return (jnldata_len);
-					} /* else overflow happened, or about to happen */
-				} else if (0 < read_size && jnlpool_hasnt_overflowed(jctl, jnlpool_size, read_addr))
-				{ /* Buffer cannot accommodate data */
-					*data_len = read_size;
-					return (-1);
-				} /* else
-				   * We read a corrupt (overwritten) large value, or read_size == 0, both of which imply overflow.
-				   * read_size == 0 => overflow because every transaction generates non-zero bytes of jnl data */
+						assert(MAX_SEQNO == gtmsource_local->next_histinfo_seqno);
+						gtmsource_set_next_histinfo_seqno(TRUE);
+							/* Set the next histinfo's start_seqno and redo the read */
+						if (GTMSOURCE_WAITING_FOR_CONNECTION == gtmsource_state)
+						{	/* Connection reset in "gtmsource_set_next_histinfo_seqno" */
+							return 0;
+						}
+						continue;
+					}
+					read = ((0 > wrap_size) ? read + jnldata_len : wrap_size);
+					read_addr += jnldata_len;
+					read_jnl_seqno = next_read_seqno;
+					assert(read_jnl_seqno <= gtmsource_local->next_histinfo_seqno);
+					assert(stop_read_at >= read_addr);
+					assert(jnl_seqno >= read_jnl_seqno - 1);
+					/* In the rare case when we read the transaction read_jnl_seqno just as
+					 * it becomes available and before the GTM process that wrote it updates
+					 * jctl->jnl_seqno in t_end/tp_tend, we may return from this function
+					 * with read_jnl_seqno one more than jctl->jnl_seqno. This is such a rare
+					 * case that we don't want to add a wait loop for jctl->jnl_seqno to become
+					 * equal to read_jnl_seqno. We expect that by the time we send the just read
+					 * transaction(s) using socket I/O, jctl->jnl_seqno would have been updated.
+					 * In any case, we prevent ourselves from misinterpreting this condition when
+					 * read_jnl_seqno is compared against jctl->jnl_seqno in gtmsource_process(),
+					 * gtmsource_get_jnlrecs() and gtmsource_showbacklog().
+					 */
+					assert(read == read_addr % jnlpool_size);
+					gtmsource_local->read = read;
+					gtmsource_local->read_addr = read_addr;
+					gtmsource_local->read_jnl_seqno = read_jnl_seqno;
+					*data_len = first_tr_len;
+					if (NULL != trim_buff)
+						jnldata_len = (uint4)((trim_buff - buff) + SIZEOF(jnldata_hdr_struct));
+					return (jnldata_len);
+				}
+			} else if (0 < read_size && jnlpool_hasnt_overflowed(jctl, jnlpool_size, read_addr))
+			{ /* Buffer cannot accommodate data */
+				*data_len = read_size;
+				return (-1);
 			} /* else
-			   * We read a corrupt (overwritten) large value, or read 0, both of which imply overflow.
-			   * jnldata_len == 0 => overflow because every transaction generates non-zero bytes of jnl data */
-		} /* else overflow happened, or about to happen */
+			   * We read a corrupt (overwritten) large value, or read_size == 0, both of which imply overflow.
+			   * read_size == 0 => overflow because every transaction generates non-zero bytes of jnl data */
+		} /* else
+		   * We read a corrupt (overwritten) large value, or read 0, both of which imply overflow.
+		   * jnldata_len == 0 => overflow because every transaction generates non-zero bytes of jnl data */
 		break;
 	} while (TRUE);
 	*data_len = -1;
diff --git a/sr_unix/gvcst_init_sysops.c b/sr_unix/gvcst_init_sysops.c
index f522130..7db9846 100644
--- a/sr_unix/gvcst_init_sysops.c
+++ b/sr_unix/gvcst_init_sysops.c
@@ -211,18 +211,8 @@ MBSTART {														\
 		fn_len = REG->dyn.addr->fname_len;									\
 		if (0 == INIT_STATUS)											\
 			INIT_DB_OR_JNL_ENCRYPTION(CSA, TSD, fn_len, fn, INIT_STATUS);					\
-		if (0 != INIT_STATUS)											\
-		{													\
-			if (IS_GTM_IMAGE || mu_reorg_encrypt_in_prog)							\
-			{												\
-				GTMCRYPT_REPORT_ERROR(INIT_STATUS, rts_error, fn_len, fn);				\
-			} else												\
-			{												\
-				GTMCRYPT_REPORT_ERROR(MAKE_MSG_WARNING(INIT_STATUS), gtm_putmsg, fn_len, fn);		\
-				CRYPT_WARNING = TRUE;									\
-			}												\
-		}													\
 	}														\
+	DO_ERR_PROC_ENCRYPTION_IF_NEEDED(REG, DO_CRYPT_INIT, INIT_STATUS, CRYPT_WARNING);				\
 } MBEND
 #define INIT_PROC_ENCRYPTION_IF_NEEDED(CSA, DO_CRYPT_INIT, INIT_STATUS)							\
 MBSTART {														\
@@ -230,6 +220,26 @@ MBSTART {														\
 		INIT_PROC_ENCRYPTION(CSA, INIT_STATUS);									\
 } MBEND
 
+#define DO_ERR_PROC_ENCRYPTION_IF_NEEDED(REG, DO_CRYPT_INIT, INIT_STATUS, CRYPT_WARNING)				\
+MBSTART {														\
+	int	fn_len;													\
+	char	*fn;													\
+															\
+	if (DO_CRYPT_INIT && (0 != INIT_STATUS) && !(CRYPT_WARNING))							\
+	{														\
+		fn = (char *)(REG->dyn.addr->fname);									\
+		fn_len = REG->dyn.addr->fname_len;									\
+		if (IS_GTM_IMAGE || mu_reorg_encrypt_in_prog)								\
+		{													\
+			GTMCRYPT_REPORT_ERROR(INIT_STATUS, rts_error, fn_len, fn);					\
+		} else													\
+		{													\
+			GTMCRYPT_REPORT_ERROR(MAKE_MSG_WARNING(INIT_STATUS), gtm_putmsg, fn_len, fn);			\
+			CRYPT_WARNING = TRUE;										\
+		}													\
+	}														\
+} MBEND
+
 #define READ_DB_FILE_HEADER(REG, TSD, ERR_RET)								\
 MBSTART {												\
 	file_control    	*fc;									\
@@ -346,7 +356,7 @@ MBSTART {											\
 	gv_cur_region = SAVE_REG;			\
 }
 
-GBLREF	boolean_t		gtm_fullblockwrites;	/* Do full (not partial) database block writes T/F */
+GBLREF	int4			gtm_fullblockwrites;	/* Do full (not partial) database block writes */
 GBLREF	boolean_t		is_src_server;
 GBLREF  boolean_t               mupip_jnl_recover;
 GBLREF	gd_region		*gv_cur_region, *db_init_region;
@@ -690,6 +700,8 @@ int db_init(gd_region *reg, boolean_t ok_to_bypass)
 	gd_region		*baseDBreg;
 	sgmnt_addrs		*baseDBcsa;
 	node_local_ptr_t	baseDBnl;
+	DEBUG_ONLY(int		i);
+	DEBUG_ONLY(char 	*ptr);
 	DCL_THREADGBL_ACCESS;
 
 	SETUP_THREADGBL_ACCESS;
@@ -814,8 +826,10 @@ int db_init(gd_region *reg, boolean_t ok_to_bypass)
 			   * before is discarded
 			   */
 		}
-		if (!bypassed_ftok)
+		if (mu_reorg_encrypt_in_prog)
 			INIT_DB_ENCRYPTION_IF_NEEDED(db_do_crypt_init, init_status, reg, csa, tsd, crypt_warning);
+		else
+			DO_ERR_PROC_ENCRYPTION_IF_NEEDED(reg, db_do_crypt_init, init_status, crypt_warning);
 		if (WBTEST_ENABLED(WBTEST_HOLD_ONTO_FTOKSEM_IN_DBINIT))
 		{
 			DBGFPF((stderr, "Holding the ftok semaphore.. Sleeping for 30 seconds\n"));
@@ -845,6 +859,8 @@ int db_init(gd_region *reg, boolean_t ok_to_bypass)
 				 * 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 (!bypassed_ftok)
+					INIT_DB_ENCRYPTION_IF_NEEDED(db_do_crypt_init, init_status, reg, csa, tsd, crypt_warning);
 				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);
@@ -912,8 +928,15 @@ int db_init(gd_region *reg, boolean_t ok_to_bypass)
 					{
 						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);
+						if (((MAX_ACCESS_SEM_RETRIES - 1) == loopcnt) || !(SHM_REMOVED(errno)))
+							PRINT_CRASH_MESSAGE(1, tsd, ERR_TEXT, 2,
+									    LEN_AND_LIT("Error with database control shmctl"),
+									    errno);
+						/* else */
+						READ_DB_FILE_HEADER(reg, tsd, err_ret);
+						RETURN_IF_ERROR(err_ret, err_ret, indefinite_wait,
+								sem_stacktrace_time, sem_timedout);
+						continue;
 					} else if (shmstat.shm_ctime != tsd->gt_shm_ctime.ctime)
 					{
 						RETURN_IF_BYPASSED(bypassed_ftok, indefinite_wait, sem_stacktrace_time,	\
@@ -999,7 +1022,7 @@ int db_init(gd_region *reg, boolean_t ok_to_bypass)
 					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);
+										&bypassed_access, &access_counter_halted, TRUE);
 					assert(ok_to_bypass || !bypassed_access);
 					if (!semop_success)
 					{
@@ -1203,7 +1226,12 @@ int db_init(gd_region *reg, boolean_t ok_to_bypass)
 	cnl = csa->nl;
 	if (new_shm_ipc)
 	{
-		memset(cnl, 0, SIZEOF(*cnl));			/* We allocated shared storage -- we have to init it */
+#		ifdef DEBUG
+		/* We allocated shared storage -- "shmget" ensures it is null initialized. Assert that. */
+		ptr = (char *)cnl;
+		for (i = 0; i < SIZEOF(*cnl); i++)
+			assert('\0' == ptr[i]);
+#		endif
 		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
@@ -1618,7 +1646,7 @@ int db_init(gd_region *reg, boolean_t ok_to_bypass)
 		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 */
+			csa->do_fullblockwrites = gtm_fullblockwrites;		/* This region is fullblockwrite enabled */
 		/* Report this length in DSE even if not enabled */
 		csa->fullblockwrite_len = fbwsize;		/* Length for rounding fullblockwrite */
 	}
diff --git a/sr_unix/incr_link.c b/sr_unix/incr_link.c
index f5b0104..24b49f9 100644
--- a/sr_unix/incr_link.c
+++ b/sr_unix/incr_link.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	*
@@ -510,6 +510,9 @@ boolean_t incr_link(int *file_desc, zro_ent *zro_entry, uint4 fname_len, char *f
 			DBGARLNK((stderr, "incr_link: Bypassing (re)zlink for routine %.*s (old rhead 0x"lvaddr") - same objhash\n",
 				  old_rhead->routine_name.len, old_rhead->routine_name.addr, old_rhead));
 #			ifdef ZLINK_BYPASS /* #ifdef'd out for now due to issues with ERRWETRAP */
+			/* If this code is enabled please remove the ZLINKBYPASS message from merrors.msg's undocumented
+			 * section and document the message.
+			 */
 			SAVE_UTIL_OUT_BUFFER(save_util_outptr, save_last_va_list_ptr, util_copy_saved);
 			save_error_condition = error_condition;
 			error_condition = 0;
diff --git a/sr_unix/init_gtm.c b/sr_unix/init_gtm.c
index fb65657..6e219f2 100644
--- a/sr_unix/init_gtm.c
+++ b/sr_unix/init_gtm.c
@@ -56,7 +56,7 @@ 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 int		(*op_open_ptr)(mval *v, mval *p, mval *t, mval *mspace);
 GBLREF void		(*ctrlc_handler_ptr)();
 GBLREF void		(*tp_timeout_action_ptr)(void);
 GBLREF void		(*tp_timeout_clear_ptr)(void);
diff --git a/sr_unix/install_gtmpcat_sh.txt b/sr_unix/install_gtmpcat_sh.txt
new file mode 100644
index 0000000..616d45b
--- /dev/null
+++ b/sr_unix/install_gtmpcat_sh.txt
@@ -0,0 +1,88 @@
+#!/bin/sh
+#################################################################
+#								#
+# 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.	#
+#								#
+#################################################################
+
+# Check installing as root
+
+uid=`id -u`
+
+if [ "$uid" -ne 0 ]; then
+	echo "$0 must be run as root"
+	exit 1
+fi
+
+# Check valid package
+
+package_dir=`dirname $0`
+if [ "$package_dir" = "" ]; then
+	package_dir="."
+fi
+
+if [ ! -f "${package_dir}/gtmpcat.m" ]; then
+	echo "gtmpcat.m missing from package directory (${package_dir})"
+	exit 1
+fi
+
+# Check valid $gtm_dist
+
+if [ ! -d "$gtm_dist" ]; then
+	echo "gtm_dist ($gtm_dist) is not a valid directory"
+	exit 1
+fi
+if [ ! -x "$gtm_dist/mumps" ]; then
+	echo "gtm_dist ($gtm_dist) is not a GT.M installation"
+	exit 1
+fi
+
+gtmroutines=". $gtm_dist"
+export gtmroutines
+
+# Note owner and group of mumps executable for later use as the owner and group of the installed files
+
+eval $(/bin/ls -l $gtm_dist/mumps | awk 'NR == 1 { print "owner=" $3, "group=" $4 }')
+
+# Check matching version
+
+req_zver="#ZVERSION#"
+cur_zver="$($gtm_dist/mumps -r %XCMD 'write $zversion')"
+
+if [ "$req_zver" != "$cur_zver" -a "$req_zver" != "ANY" ]; then
+	echo "Version to install ($req_zver) does not match \$gtm_dist/mumps version ($cur_zver)"
+	exit 1
+fi
+
+# Confirm installation
+
+echo ""
+echo "Installing gtmpcat files to $gtm_dist/tools/gtmpcat"
+echo ""
+printf "Proceed? > "
+read resp
+response=$(echo "$resp" | tr '[a-z]' '[A-Z]')
+if [ "Y" != "$response" -a "YES" != "$response" ] ; then
+	exit 1
+fi
+
+# Do the copy
+
+if [ ! -d "$gtm_dist/tools" ]; then
+	mkdir $gtm_dist/tools
+	chown ${owner}:${group} $gtm_dist/tools
+fi
+mkdir -p $gtm_dist/tools/gtmpcat
+cp ${package_dir}/gtmpcat.m ${package_dir}/#FLDBLD# $gtm_dist/tools/gtmpcat
+cp ${package_dir}/gtmpcat.sh $gtm_dist/gtmpcat
+(cd $gtm_dist/tools/gtmpcat && gtmroutines="." $gtm_dist/mumps *.m)
+chown -R ${owner}:${group} $gtm_dist/gtmpcat $gtm_dist/tools/gtmpcat
+ls -ald $gtm_dist/gtmpcat $gtm_dist/tools $gtm_dist/tools/gtmpcat $gtm_dist/tools/gtmpcat/*
+echo ""
+echo "Done. Please check the permissions on the listed files and directories and change them as appropriate."
diff --git a/sr_unix/interlock.h b/sr_unix/interlock.h
index b05dba6..cd37dba 100644
--- a/sr_unix/interlock.h
+++ b/sr_unix/interlock.h
@@ -106,12 +106,12 @@
  * the compiler happy) thus the construct (assertpro, 0) which returns a zero (see usage with assert() on UNIX).
  */
 #define RELEASE_SWAPLOCK(X)		(COMPSWAP_UNLOCK((X), process_id, 0, LOCK_AVAILABLE, 0) ? 1 : (assertpro(FALSE), 0))
+#define	GRAB_LATCH_INDEFINITE_WAIT	-1	/* special value indicating infinite timeout input to "grab_latch" */
 
 /* Function prototypes */
 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 {											\
@@ -122,9 +122,10 @@ MBSTART {											\
 		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();								\
+	{	/* Return value of "grab_latch" does not need to be checked because we pass	\
+		 * in GRAB_LATCH_INDEFINITE_WAIT as the timeout.				\
+		 */										\
+		grab_latch(&CSA->nl->lock_crit, GRAB_LATCH_INDEFINITE_WAIT);			\
 	}											\
 } MBEND
 #define REL_LOCK_CRIT(CSA, REGION, WAS_CRIT)							\
diff --git a/sr_unix/io_open_try.c b/sr_unix/io_open_try.c
index 9e0f955..8b049b0 100755
--- a/sr_unix/io_open_try.c
+++ b/sr_unix/io_open_try.c
@@ -51,7 +51,6 @@
 #define	RSHELL_PORT		514
 #define	KSHELL_PORT		544
 
-LITREF	unsigned char		io_params_size[];
 GBLREF	dev_dispatch_struct	io_dev_dispatch[];
 GBLREF	io_desc			*active_device;
 GBLREF	mstr			sys_input;
@@ -59,27 +58,28 @@ GBLREF	mstr			sys_output;
 GBLREF	bool			out_of_time;
 GBLREF	int4			outofband;
 GBLREF	int4			write_filter;
+
 LITREF	mstr			chset_names[];
+LITREF	unsigned char		io_params_size[];
 
 error_def(ERR_GETNAMEINFO);
 error_def(ERR_GTMEISDIR);
 error_def(ERR_TEXT);
 
-bool io_open_try(io_log_name *naml, io_log_name *tl, mval *pp, int4 timeout, mval *mspace)	/* timeout in seconds */
+boolean_t io_open_try(io_log_name *naml, io_log_name *tl, mval *pp, int4 msec_timeout, mval *mspace)	/* timeout in msec */
 {
 	uint4		status;
-	int4		msec_timeout;	/* timeout in milliseconds */
 	mstr		tn;		/* translated name */
 	int		oflag;
 	params		*param;
 	unsigned char	ch;
 	bool		timed = FALSE;
 	int		file_des;
-#ifdef __MVS__
+#	ifdef __MVS__
 	int		file_des_w = -2;	/*	fifo write	*/
 	uint4		status_w;
 	d_rm_struct	*d_rm_out, *d_rm_in;
-#endif
+#	endif
 	boolean_t	filecreated = FALSE;
 	TID		timer_id;
 	struct stat	outbuf;
@@ -124,17 +124,10 @@ bool io_open_try(io_log_name *naml, io_log_name *tl, mval *pp, int4 timeout, mva
 	namebuf[tn.len] = '\0';
 	buf = namebuf;
 	timer_id = (TID)io_open_try;
-	if (NO_M_TIMEOUT == timeout)
-	{
+	if (NO_M_TIMEOUT == msec_timeout)
 		timed = FALSE;
-		msec_timeout = NO_M_TIMEOUT;
-	} else
-	{
-		timed = TRUE;
-		msec_timeout = timeout2msec(timeout);
-		if (!msec_timeout)
-			timed = FALSE;
-	}
+	else
+		timed = (0 != msec_timeout);
 	if (0 == naml->iod)
 	{
 		if (0 == tl->iod)
@@ -160,12 +153,12 @@ bool io_open_try(io_log_name *naml, io_log_name *tl, mval *pp, int4 timeout, mva
 			{
 				/* fifo with RW permissions for owner, group, other */
 				if ((-1 != MKNOD(buf, FIFO_PERMISSION, 0))
-#ifdef __MVS__
-				    || (EEXIST == errno)
-#endif
-				    )
+#					ifdef __MVS__
+					|| (EEXIST == errno)
+#					endif
+					)
 				{
-#ifdef __MVS__
+#					ifdef __MVS__
 					if (EEXIST != errno)
 						filecreated = TRUE;
 					/*	create another one for fifo write	*/
@@ -174,9 +167,9 @@ bool io_open_try(io_log_name *naml, io_log_name *tl, mval *pp, int4 timeout, mva
 					(temp_iod->pair.out)->pair.out = (temp_iod->pair.out);
 					(temp_iod->pair.out)->trans_name = tl;
 					(temp_iod->pair.out)->type = ff;
-#else
+#					else
 					filecreated = TRUE;
-#endif
+#					endif
 				} else  if (EEXIST != errno)
 				{
 					mknod_err = TRUE;
@@ -190,7 +183,6 @@ bool io_open_try(io_log_name *naml, io_log_name *tl, mval *pp, int4 timeout, mva
 		if ((n_io_dev_types == tl->iod->type) && mspace && mspace->str.len)
 		{
 			lower_to_upper(dev_type, (uchar_ptr_t)mspace->str.addr, mspace->str.len);
-
 			if (((SIZEOF("SOCKET") - 1) == mspace->str.len)
 				 && (0 == MEMCMP_LIT(dev_type, "SOCKET")))
 				tl->iod->type = gtmsocket;
@@ -234,7 +226,6 @@ bool io_open_try(io_log_name *naml, io_log_name *tl, mval *pp, int4 timeout, mva
 				}
 			}
 		}
-
 		if (n_io_dev_types == tl->iod->type)
 		{
 			if (!stat_err)
@@ -306,9 +297,6 @@ bool io_open_try(io_log_name *naml, io_log_name *tl, mval *pp, int4 timeout, mva
 #									if defined(_AIX)
 									|| (ENOTCONN == save_gsn_err)
 #									endif
-#									if defined(__sun) || defined(__hpux)
-									|| (EINVAL == save_gsn_err)
-#									endif
 									)
 							{
 								tl->iod->type = gtmsocket;
@@ -334,7 +322,6 @@ bool io_open_try(io_log_name *naml, io_log_name *tl, mval *pp, int4 timeout, mva
 	}
 	assert((0 <= naml->iod->state) && (n_io_dev_states > naml->iod->state));
 	active_device = naml->iod;
-
 	if ((-2 == file_des) && (dev_open != naml->iod->state) && (us != naml->iod->type)
 	    && (gtmsocket != naml->iod->type) && (pi != naml->iod->type))
 	{
@@ -377,7 +364,7 @@ bool io_open_try(io_log_name *naml, io_log_name *tl, mval *pp, int4 timeout, mva
 					}
 					break;
 				case iop_ipchset:
-#ifdef KEEP_zOS_EBCDIC
+#					ifdef KEEP_zOS_EBCDIC
 					if ( (iconv_t)0 != naml->iod->input_conv_cd )
 					{
 						ICONV_CLOSE_CD(naml->iod->input_conv_cd);
@@ -386,10 +373,10 @@ bool io_open_try(io_log_name *naml, io_log_name *tl, mval *pp, int4 timeout, mva
 					if (DEFAULT_CODE_SET != naml->iod->in_code_set)
 						ICONV_OPEN_CD(naml->iod->input_conv_cd,
 							      (char *)(pp->str.addr + p_offset + 1), INSIDE_CH_SET);
-#endif
+#					endif
 					break;
 				case iop_opchset:
-#ifdef KEEP_zOS_EBCDIC
+#					ifdef KEEP_zOS_EBCDIC
 					if ( (iconv_t)0 != naml->iod->output_conv_cd)
 					{
 						ICONV_CLOSE_CD(naml->iod->output_conv_cd);
@@ -398,7 +385,7 @@ bool io_open_try(io_log_name *naml, io_log_name *tl, mval *pp, int4 timeout, mva
 					if (DEFAULT_CODE_SET != naml->iod->out_code_set)
 						ICONV_OPEN_CD(naml->iod->output_conv_cd, INSIDE_CH_SET,
 							      (char *)(pp->str.addr + p_offset + 1));
-#endif
+#					endif
 					break;
 				case iop_m:
 				case iop_utf8:
@@ -412,7 +399,6 @@ bool io_open_try(io_log_name *naml, io_log_name *tl, mval *pp, int4 timeout, mva
 			p_offset += ((IOP_VAR_SIZE == io_params_size[ch]) ?
 				     (unsigned char)*(pp->str.addr + p_offset) + 1 : io_params_size[ch]);
 		}
-
 		/* Check the saved error from mknod() for fifo, also saved error from fstat() or stat()
 		   so error handler (if set)  can handle it */
 		if (ff == tl->iod->type  && mknod_err)
@@ -423,16 +409,12 @@ bool io_open_try(io_log_name *naml, io_log_name *tl, mval *pp, int4 timeout, mva
 		/* Error from trying to open a dir */
 		if (dir_err)
 			rts_error_csa(CSA_ARG(NULL) VARLSTCNT(4) ERR_GTMEISDIR, 2, LEN_AND_STR(buf));
-
-
 		if (timed)
 			start_timer(timer_id, msec_timeout, wake_alarm, 0, NULL);
-
 		/* RW permissions for owner and others as determined by umask. */
 		umask_orig = umask(000);	/* determine umask (destructive) */
 		(void)umask(umask_orig);	/* reset umask */
 		umask_creat = 0666 & ~umask_orig;
-
 		/*
 		 * no OPEN EINTR macros in the following while loop  due to complex error checks and processing between
 		 * top of while and calls to OPEN3
@@ -451,7 +433,7 @@ bool io_open_try(io_log_name *naml, io_log_name *tl, mval *pp, int4 timeout, mva
 				continue;
 			else
 			{
-#ifdef __MVS__
+#				ifdef __MVS__
 				if (EINVAL == errno && ff == tl->iod->type && (oflag & O_RDONLY) && (oflag & O_WRONLY))
 				{
 					int	oflag_clone;
@@ -476,7 +458,6 @@ bool io_open_try(io_log_name *naml, io_log_name *tl, mval *pp, int4 timeout, mva
 					}
 					FCNTL2(file_des, F_GETFL, oflag_clone);
 					FCNTL3(file_des, F_SETFL, (oflag_clone & ~O_NONBLOCK), fcntl_res);
-
 					/* oflag was just made O_RDONLY, now set it to be O_WRONLY */
 					oflag |= O_WRONLY;
 					oflag &= ~O_RDONLY;
@@ -496,11 +477,13 @@ bool io_open_try(io_log_name *naml, io_log_name *tl, mval *pp, int4 timeout, mva
 							break;
 					}
 				}
-#endif
+#				endif
 				break;
 			}
 		}
 		SETFDCLOEXEC(file_des);
+		if (timed && !out_of_time)
+			cancel_timer(timer_id);
 		if (out_of_time && (-1 == file_des))
 		{
 			if ((ff == tl->iod->type) && filecreated)
@@ -512,10 +495,7 @@ bool io_open_try(io_log_name *naml, io_log_name *tl, mval *pp, int4 timeout, mva
 			return FALSE;
 		}
 	}
-	if (timed && !out_of_time)
-		cancel_timer(timer_id);
-
-#ifdef KEEP_zOS_EBCDIC
+#	ifdef KEEP_zOS_EBCDIC
 	if (gtmsocket != naml->iod->type)
 	{
 		SET_CODE_SET(naml->iod->in_code_set, OUTSIDE_CH_SET);
@@ -533,10 +513,9 @@ bool io_open_try(io_log_name *naml, io_log_name *tl, mval *pp, int4 timeout, mva
 		if (DEFAULT_CODE_SET != naml->iod->in_code_set)
 			ICONV_OPEN_CD(naml->iod->input_conv_cd, INSIDE_CH_SET, OUTSIDE_CH_SET);
 	}
-#endif
+#	endif
 	if (-1 == file_des)
 		rts_error_csa(CSA_ARG(NULL) VARLSTCNT(1) errno);
-
 	if (n_io_dev_types == naml->iod->type)
 	{
 		/* On AIX, /dev/{,*}random are of 'terminal type'.Hence define its type before
@@ -558,7 +537,6 @@ bool io_open_try(io_log_name *naml, io_log_name *tl, mval *pp, int4 timeout, mva
 	}
 	assert(naml->iod->type < n_io_dev_types);
 	naml->iod->disp_ptr = &io_dev_dispatch[naml->iod->type];
-
 	/* Do this deviceparameter check only if type is rm, it is closed, and no_destroy is defined. If a deviceparameter other
 	 * than SEEK or APPEND is defined, then clear no_destroy as state will not be restored.
 	 */
@@ -576,7 +554,6 @@ bool io_open_try(io_log_name *naml, io_log_name *tl, mval *pp, int4 timeout, mva
 			}
 		}
 	}
-
 	if (dev_never_opened == naml->iod->state)
 	{
 		naml->iod->wrap = DEFAULT_IOD_WRAP;
@@ -598,7 +575,7 @@ bool io_open_try(io_log_name *naml, io_log_name *tl, mval *pp, int4 timeout, mva
 		naml->iod->dollar.key[0] = 0;
 		naml->iod->dollar.device[0] = 0;
 	}
-#ifdef __MVS__
+#	ifdef __MVS__
 	/*	copy over the content of tl->iod(naml->iod) to (tl->iod->pair.out)	*/
 	if (ff == tl->iod->type)
 	{
@@ -610,14 +587,13 @@ bool io_open_try(io_log_name *naml, io_log_name *tl, mval *pp, int4 timeout, mva
 		{
 			io_desc		*io_ptr;
 			io_log_name	dev_name;	/*	dummy	*/
-
 			io_ptr = (tl->iod->pair.out);
 			assert(io_ptr != tl->iod->pair.in);
 			assert(NULL != io_ptr);
 			assert(io_ptr->state >= 0 && io_ptr->state < n_io_dev_states);
 			assert(ff == io_ptr->type);
 			dev_name.iod = tl->iod->pair.out;
-			if (TRUE == ioff_open(&dev_name, pp, file_des_w, mspace, timeout))
+			if (TRUE == ioff_open(&dev_name, pp, file_des_w, mspace, msec_timeout))
 				(tl->iod->pair.out)->state = dev_open;
 			else if (dev_open == (tl->iod->pair.out)->state)
 				(tl->iod->pair.out)->state = dev_closed;
@@ -627,9 +603,9 @@ bool io_open_try(io_log_name *naml, io_log_name *tl, mval *pp, int4 timeout, mva
 		if (0 == file_des_w)
 			(tl->iod->pair.out)->dollar.zeof = TRUE;
 	}
-#endif
+#	endif
 	naml->iod->newly_created = filecreated;
-	status = (naml->iod->disp_ptr->open)(naml, pp, file_des, mspace, timeout);
+	status = (naml->iod->disp_ptr->open)(naml, pp, file_des, mspace, msec_timeout);
 	if (TRUE == status)
 		naml->iod->state = dev_open;
 	else
@@ -644,7 +620,7 @@ bool io_open_try(io_log_name *naml, io_log_name *tl, mval *pp, int4 timeout, mva
 			return status;
 		}
 	}
-#ifdef __MVS__
+#	ifdef __MVS__
 	d_rm_out = tl->iod->pair.out->dev_sp;
 	d_rm_in = tl->iod->pair.in->dev_sp;
 	if ((ff == tl->iod->pair.in->type) || (ff == tl->iod->pair.out->type))
@@ -670,14 +646,12 @@ bool io_open_try(io_log_name *naml, io_log_name *tl, mval *pp, int4 timeout, mva
 		free(d_rm_in);
 		tl->iod->pair.in->dev_sp = d_rm_out;
 	}
-
-#endif
+#	endif
 	if (1 == file_des)
 		naml->iod->dollar.zeof = TRUE;
 	active_device = 0;
 	naml->iod->newly_created = FALSE;
-
-	if ((NO_M_TIMEOUT != timeout) && IS_MCODE_RUNNING)
+	if ((NO_M_TIMEOUT != msec_timeout) && IS_MCODE_RUNNING)
 		return (status);
 	else
 		return TRUE;
diff --git a/sr_unix/ioff_open.c b/sr_unix/ioff_open.c
index 8fb3053..c063c9f 100755
--- a/sr_unix/ioff_open.c
+++ b/sr_unix/ioff_open.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,7 +24,7 @@
 
 GBLREF io_pair io_curr_device;
 
-short ioff_open(io_log_name *dev_name, mval *pp, int fd, mval *mspace, int4 timeout)
+short ioff_open(io_log_name *dev_name, mval *pp, int fd, mval *mspace, int4 msec_timeout)
 {
 	io_desc		*iod;
  	d_rm_struct	*d_rm;
@@ -52,5 +53,5 @@ short ioff_open(io_log_name *dev_name, mval *pp, int fd, mval *mspace, int4 time
 	}
 	d_rm->fifo = TRUE;
 	iod->type = rm;
-	return iorm_open(dev_name, pp, fd, mspace, timeout);
+	return iorm_open(dev_name, pp, fd, mspace, msec_timeout);
 }
diff --git a/sr_unix/iopi_iocontrol.c b/sr_unix/iopi_iocontrol.c
index 078aef3..12b7388 100644
--- a/sr_unix/iopi_iocontrol.c
+++ b/sr_unix/iopi_iocontrol.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	*
@@ -44,7 +44,7 @@ void	iopi_iocontrol(mstr *mn, int4 argcnt, va_list args)
 
 	d_rm = (d_rm_struct *) io_curr_device.out->dev_sp;
 	/* WRITE /EOF only applies to PIPE devices.  Sequential file and FIFO devices should be closed with CLOSE.*/
-	if (!d_rm->pipe)
+	if (!d_rm->is_pipe)
 		return;
 	/* we should not get here unless there is some string length after write / */
 	assertpro((int)mn->len);
@@ -120,7 +120,7 @@ void	iopi_dlr_zkey(mstr *d)
 
 	iod = io_curr_device.in;
 	d_rm = (d_rm_struct *)(iod->dev_sp);
-	if (d_rm->fifo || d_rm->pipe || (2 >= d_rm->fildes))
+	if (d_rm->fifo || d_rm->is_pipe || (2 >= d_rm->fildes))
 		d->len = 0;
 	else
 	{
diff --git a/sr_unix/iopi_open.c b/sr_unix/iopi_open.c
index 140cd75..f384465 100644
--- a/sr_unix/iopi_open.c
+++ b/sr_unix/iopi_open.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	*
@@ -35,6 +35,7 @@
 #include "jobsp.h"
 #include "have_crit.h"
 #include "fork_init.h"
+#include "restrict.h"
 #ifdef __MVS__
 #include "gtm_zos_io.h"
 #include "gtm_zos_chset.h"
@@ -50,6 +51,7 @@ GBLREF	boolean_t		gtm_dist_ok_to_use;
 GBLREF  volatile boolean_t      timer_in_handler;
 
 error_def(ERR_DEVOPENFAIL);
+error_def(ERR_RESTRICTEDOP);
 error_def(ERR_SYSCALL);
 error_def(ERR_TEXT);
 ZOS_ONLY(error_def(ERR_BADTAG);)
@@ -405,6 +407,10 @@ short iopi_open(io_log_name *dev_name, mval *pp, int fd, mval *mspace, int4 time
 		}
 	}
 
+	/* The above code is just syntax checking. Any actual operation should be below here. */
+	if (RESTRICTED(pipe_open))
+		rts_error_csa(CSA_ARG(NULL) VARLSTCNT(3) ERR_RESTRICTEDOP, 1, "OPEN PIPE");
+
 	/* check the shell device parameter before the fork/exec
 	   It is not required, but must not be null if entered */
 	if (sparams[PSHELL] && (0 == slen[PSHELL]))
@@ -703,7 +709,7 @@ short iopi_open(io_log_name *dev_name, mval *pp, int fd, mval *mspace, int4 time
 				free(pstderr);
 		}
 	}
-	d_rm->pipe = TRUE;
+	d_rm->is_pipe = TRUE;
 	iod->type = rm;
 
 	if (return_stderr)
@@ -752,7 +758,7 @@ short iopi_open(io_log_name *dev_name, mval *pp, int fd, mval *mspace, int4 time
 				in_d_rm->stderr_parent = iod;
 				in_d_rm->read_fildes = FD_INVALID; /* checked in iorm_get_bom to get correct file descriptor */
 			}
-			in_d_rm->pipe = TRUE;
+			in_d_rm->is_pipe = TRUE;
 			io_ptr->type = rm;
 			status_read = iorm_open(stderr_naml, pp, file_des_read_stderr, mspace, timeout);
 			if (TRUE == status_read)
diff --git a/sr_unix/iorm_close.c b/sr_unix/iorm_close.c
index 95f73c2..c498d80 100755
--- a/sr_unix/iorm_close.c
+++ b/sr_unix/iorm_close.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	*
@@ -181,7 +181,7 @@ void iorm_close(io_desc *iod, mval *pp)
 
 	iod->state = dev_closed;
 	/* save no_destroy for disk device */
-	if ((FALSE == rm_destroy) && !rm_ptr->fifo && !rm_ptr->pipe && (2 < rm_ptr->fildes))
+	if ((FALSE == rm_destroy) && !rm_ptr->fifo && !rm_ptr->is_pipe && (2 < rm_ptr->fildes))
 	{
 		rm_ptr->no_destroy = TRUE;
 		/* We can write anywhere in the file so need to save current file pointer for re-open
@@ -327,7 +327,7 @@ void iorm_close(io_desc *iod, mval *pp)
 			iorm_close(rm_ptr->stderr_child,pp);
 		}
 	}
-	if ((rm_destroy || rm_ptr->pipe || rm_ptr->fifo) && !rm_rundown)
+	if ((rm_destroy || rm_ptr->is_pipe || rm_ptr->fifo) && !rm_rundown)
 	        remove_rms (iod);
 	REVERT_GTMIO_CH(&iod->pair, ch_set);
 	return;
diff --git a/sr_unix/iorm_get.c b/sr_unix/iorm_get.c
index 6df2633..61f12c1 100755
--- a/sr_unix/iorm_get.c
+++ b/sr_unix/iorm_get.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	*
@@ -528,12 +528,12 @@ int	iorm_get_bom(io_desc *io_ptr, int *blocked_in, boolean_t ispipe, int flags,
 
 	ESTABLISH_RET_GTMIO_CH(&io_ptr->pair, -1, ch_set);
 	rm_ptr = (d_rm_struct *)(io_ptr->dev_sp);
-	if (rm_ptr->pipe || rm_ptr->fifo)
+	if (rm_ptr->is_pipe || rm_ptr->fifo)
 		pipe_or_fifo = TRUE;
 	/* If it is a pipe and it's the stdout returned then we need to get the read file descriptor from rm_ptr->read_fildes.
 	 * Additionally, z/OS saves its FIFO read file descriptors in read_fildes, so retrieve it.
 	 */
-	if ((rm_ptr->pipe ZOS_ONLY(|| rm_ptr->fifo)) && (FD_INVALID != rm_ptr->read_fildes))
+	if ((rm_ptr->is_pipe ZOS_ONLY(|| rm_ptr->fifo)) && (FD_INVALID != rm_ptr->read_fildes))
 		fildes = rm_ptr->read_fildes;
 	else
 		fildes = rm_ptr->fildes;
@@ -658,12 +658,12 @@ int	iorm_get(io_desc *io_ptr, int *blocked_in, boolean_t ispipe, int flags, int4
 	ESTABLISH_RET_GTMIO_CH(&io_ptr->pair, -1, ch_set);
 	assert (io_ptr->state == dev_open);
 	rm_ptr = (d_rm_struct *)(io_ptr->dev_sp);
-	if (rm_ptr->pipe || rm_ptr->fifo)
+	if (rm_ptr->is_pipe || rm_ptr->fifo)
 		pipe_or_fifo = TRUE;
 	/* If it is a pipe and it's the stdout returned then we need to get the read file descriptor from rm_ptr->read_fildes.
 	 * Additionally, z/OS saves its FIFO read file descriptors in read_fildes, so retrieve it.
 	 */
-	if ((rm_ptr->pipe ZOS_ONLY(|| rm_ptr->fifo)) && (FD_INVALID != rm_ptr->read_fildes))
+	if ((rm_ptr->is_pipe ZOS_ONLY(|| rm_ptr->fifo)) && (FD_INVALID != rm_ptr->read_fildes))
 		fildes = rm_ptr->read_fildes;
 	else
 		fildes = rm_ptr->fildes;
diff --git a/sr_unix/iorm_open.c b/sr_unix/iorm_open.c
index 314045c..3921778 100755
--- a/sr_unix/iorm_open.c
+++ b/sr_unix/iorm_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	*
@@ -98,7 +98,7 @@ short	iorm_open(io_log_name *dev_name, mval *pp, int fd, mval *mspace, int4 time
 		d_rm->fixed = FALSE;
 		d_rm->read_only = FALSE;
 		d_rm->fifo = FALSE;
-		d_rm->pipe = FALSE;
+		d_rm->is_pipe = FALSE;
 		d_rm->padchar = DEF_RM_PADCHAR;
 		d_rm->inbuf = NULL;
 		d_rm->outbuf = NULL;
@@ -127,7 +127,7 @@ short	iorm_open(io_log_name *dev_name, mval *pp, int fd, mval *mspace, int4 time
 		d_rm = (d_rm_struct *)iod->dev_sp;
 		/* remember if device closed by nodestroy in case the no_destroy flag was cleared in io_open_try()
 		   due to a deviceparameter other than SEEK on reopen */
-		if ((dev_closed == iod->state) && !d_rm->no_destroy && !d_rm->fifo && !d_rm->pipe && (2 < fd))
+		if ((dev_closed == iod->state) && !d_rm->no_destroy && !d_rm->fifo && !d_rm->is_pipe && (2 < fd))
 			closed_nodestroy = TRUE;
 	}
 	if (dev_closed == iod->state)
@@ -151,7 +151,7 @@ short	iorm_open(io_log_name *dev_name, mval *pp, int fd, mval *mspace, int4 time
 		{
 			if (iop_append == (ch = *(pp->str.addr + p_offset++)))
 			{
-				if (!d_rm->fifo && !d_rm->pipe && (off_t)-1 == (size = lseek(fd, 0, SEEK_END)))
+				if (!d_rm->fifo && !d_rm->is_pipe && (off_t)-1 == (size = lseek(fd, 0, SEEK_END)))
 					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 setting file pointer to end of file"), errno);
@@ -169,7 +169,7 @@ short	iorm_open(io_log_name *dev_name, mval *pp, int fd, mval *mspace, int4 time
 			p_offset += ((IOP_VAR_SIZE == io_params_size[ch]) ? (unsigned char)*(pp->str.addr + p_offset) + 1 :
 					io_params_size[ch]);
 		}
-		if (!d_rm->fifo && !d_rm->pipe && (2 < fd))
+		if (!d_rm->fifo && !d_rm->is_pipe && (2 < fd))
 		{
 			if (d_rm->no_destroy)
 			{
@@ -256,7 +256,7 @@ short	iorm_open(io_log_name *dev_name, mval *pp, int fd, mval *mspace, int4 time
 				      2, LEN_AND_LIT("Error in check_tag fstat"), errno);
 		SET_CHSET_FROM_TAG(file_tag, iod->file_chset);
 		iod->text_flag = text_tag;
-		if (!d_rm->pipe && 2 < fd)
+		if (!d_rm->is_pipe && 2 < fd)
 		{	/* not for stdin, stdout, stderr or pipes */
 			if (iod->newly_created || newversion)
 			{	/* tag the file.  The macros also modify text_tag and file_tag. */
@@ -318,7 +318,7 @@ short	iorm_open(io_log_name *dev_name, mval *pp, int fd, mval *mspace, int4 time
 			rts_error_csa(CSA_ARG(NULL) VARLSTCNT(4) ERR_CRYPTNOAPPEND, 2, dev_name->len, dev_name->dollar_io);
 	}
 
-	if (!d_rm->bom_checked && !d_rm->fifo && !d_rm->pipe && (2 < fd) && IS_UTF_CHSET(iod->ochset))
+	if (!d_rm->bom_checked && !d_rm->fifo && !d_rm->is_pipe && (2 < fd) && IS_UTF_CHSET(iod->ochset))
 	{
 		/* if file opened with WRITEONLY */
 		if (d_rm->write_only)
diff --git a/sr_unix/iorm_rdone.c b/sr_unix/iorm_rdone.c
index a477f48..a92b91d 100755
--- a/sr_unix/iorm_rdone.c
+++ b/sr_unix/iorm_rdone.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	*
@@ -22,7 +23,7 @@
 
 GBLREF io_pair	io_curr_device;
 
-int	iorm_rdone(mint *v, int4 timeout)
+int	iorm_rdone(mint *v, int4 msec_timeout)
 {
 	mval		tmp;
 	int		ret;
@@ -30,7 +31,7 @@ int	iorm_rdone(mint *v, int4 timeout)
 	gtm_chset_t	ichset;
 
 	*v = -1;
-	ret = iorm_readfl(&tmp, -1, timeout);
+	ret = iorm_readfl(&tmp, -1, msec_timeout);
 	if (ret)
 	{
 		if (0 != tmp.str.len)
@@ -51,13 +52,13 @@ int	iorm_rdone(mint *v, int4 timeout)
 					UTF16LE_MBTOWC(tmp.str.addr, tmp.str.addr + tmp.str.len, codepoint);
 					break;
 				case CHSET_UTF16:
-					GTMASSERT;
+					assertpro(ichset && FALSE);
 				default:
 #ifdef __MVS
 					codepoint = (unsigned char)tmp.str.addr[0];
 					break;
 #else
-					GTMASSERT;
+					assertpro(ichset && FALSE);
 #endif
 			}
 			UNICODE_ONLY(assert(WEOF != codepoint);)
diff --git a/sr_unix/iorm_read.c b/sr_unix/iorm_read.c
index 483c4bf..5ab1e37 100755
--- a/sr_unix/iorm_read.c
+++ b/sr_unix/iorm_read.c
@@ -1,6 +1,7 @@
 /****************************************************************
  *								*
- *	Copyright 2001, 2006 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	*
@@ -14,7 +15,7 @@
 #include "mdef.h"
 #include "io.h"
 
-int	iorm_read(mval *v, int4 timeout)
+int	iorm_read(mval *v, int4 msec_timeout)
 {
-	return iorm_readfl(v, 0, timeout); /* 0 means not fixed length */
+	return iorm_readfl(v, 0, msec_timeout); /* 0 means not fixed length */
 }
diff --git a/sr_unix/iorm_readfl.c b/sr_unix/iorm_readfl.c
index 9a3b0c5..7d06185 100755
--- a/sr_unix/iorm_readfl.c
+++ b/sr_unix/iorm_readfl.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,7 +110,7 @@ void iorm_readfl_badchar(mval *vmvalptr, int datalen, int delimlen, unsigned cha
 }
 #endif
 
-int	iorm_readfl (mval *v, int4 width, int4 timeout) /* timeout in seconds */
+int	iorm_readfl (mval *v, int4 width, int4 msec_timeout) /* timeout in milliseconds */
 {
 	boolean_t	ret, timed, utf_active, line_term_seen = FALSE, rdone = FALSE, zint_restart;
 	char		inchar, *temp, *temp_start;
@@ -119,7 +119,6 @@ int	iorm_readfl (mval *v, int4 width, int4 timeout) /* timeout in seconds */
 	int		len;
 	int		errlen, real_errno;
 	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, chunk_bytes_read, utf_tot_bytes_read;
 	int4		status, max_width, ltind, exp_width, from_bom, fol_bytes_read, feof_status;
@@ -158,10 +157,9 @@ int	iorm_readfl (mval *v, int4 width, int4 timeout) /* timeout in seconds */
 	DCL_THREADGBL_ACCESS;
 
 	SETUP_THREADGBL_ACCESS;
-
-#ifdef DEBUG_PIPE
+#	ifdef DEBUG_PIPE
 	pid=getpid();
-#endif
+#	endif
 	assert(stringpool.free >= stringpool.base);
 	assert(stringpool.free <= stringpool.top);
 
@@ -170,14 +168,14 @@ int	iorm_readfl (mval *v, int4 width, int4 timeout) /* timeout in seconds */
 	/* don't allow a read from a writeonly fifo */
 	if (((d_rm_struct *)io_ptr->dev_sp)->write_only)
 		rts_error_csa(CSA_ARG(NULL) VARLSTCNT(1) ERR_DEVICEWRITEONLY);
-#ifdef __MVS__
+#	ifdef __MVS__
 	/* on zos if it is a fifo device then point to the pair.out for $X and $Y */
 	if (((d_rm_struct *)io_ptr->dev_sp)->fifo)
 	{
 		dollarx_ptr = &(io_ptr->pair.out->dollar.x);
 		dollary_ptr = &(io_ptr->pair.out->dollar.y);
 	} else
-#endif
+#	endif
 	{
 		dollarx_ptr = &(io_ptr->dollar.x);
 		dollary_ptr = &(io_ptr->dollar.y);
@@ -186,13 +184,12 @@ int	iorm_readfl (mval *v, int4 width, int4 timeout) /* timeout in seconds */
 	rm_ptr = (d_rm_struct *)(io_ptr->dev_sp);
 	assert(NULL != rm_ptr);
 	pipeintr = &rm_ptr->pipe_save_state;
-	if (rm_ptr->pipe || rm_ptr->fifo)
+	if (rm_ptr->is_pipe || rm_ptr->fifo)
 		pipe_or_fifo = TRUE;
-
 	PIPE_DEBUG(PRINTF(" %d enter iorm_readfl\n", pid); DEBUGPIPEFLUSH);
 	/* if it is a pipe and it's the stdout returned then we need to get the read file descriptor
 	   from rm_ptr->read_fildes and the stream pointer from rm_ptr->read_filstr */
-	if ((rm_ptr->pipe ZOS_ONLY(|| rm_ptr->fifo)) && (0 < rm_ptr->read_fildes))
+	if ((rm_ptr->is_pipe ZOS_ONLY(|| rm_ptr->fifo)) && (0 < rm_ptr->read_fildes))
 	{
 		assert(rm_ptr->read_filstr);
 		fildes = rm_ptr->read_fildes;
@@ -202,18 +199,16 @@ int	iorm_readfl (mval *v, int4 width, int4 timeout) /* timeout in seconds */
 		fildes = rm_ptr->fildes;
 		filstr = rm_ptr->filstr;
 	}
-
 	utf_active = gtm_utf8_mode ? (IS_UTF_CHSET(io_ptr->ichset)) : FALSE;
 	/* If the last operation was a write and $X is non-zero we may have to call iorm_wteol() */
 	if (*dollarx_ptr && rm_ptr->lastop == RM_WRITE)
 	{
 		/* don't need to flush the pipe device for a streaming read */
 		/* Fixed mode read may output pad characters in iorm_wteol() for all device types */
-		if (!io_ptr->dollar.za && (!rm_ptr->pipe || rm_ptr->fixed))
+		if (!io_ptr->dollar.za && (!rm_ptr->is_pipe || rm_ptr->fixed))
 			iorm_wteol(1, io_ptr);
 		*dollarx_ptr = 0;
 	}
-
 	/* if it's a fifo and not system input and the last operation was a write and O_NONBLOCK is set then
 	   turn if off.  A write will turn it on.  The default is RM_NOOP. */
 	if (rm_ptr->fifo && (0 != rm_ptr->fildes) && (RM_WRITE == rm_ptr->lastop))
@@ -229,10 +224,9 @@ int	iorm_readfl (mval *v, int4 width, int4 timeout) /* timeout in seconds */
 				rts_error_csa(CSA_ARG(NULL) VARLSTCNT(8) ERR_SYSCALL, 5, LEN_AND_LIT("fcntl"), CALLFROM, errno);
 		}
 	}
-
 	/* if the last operation was a write to a disk, we need to initialize it so file_pos is pointing
 	   to the current file position */
-	if (!rm_ptr->fifo && !rm_ptr->pipe && (2 < rm_ptr->fildes) && (RM_WRITE == rm_ptr->lastop))
+	if (!rm_ptr->fifo && !rm_ptr->is_pipe && (2 < rm_ptr->fildes) && (RM_WRITE == rm_ptr->lastop))
 	{
 		/* need to do an lseek to get current location in file */
 		cur_position = lseek(rm_ptr->fildes, 0, SEEK_CUR);
@@ -290,18 +284,16 @@ int	iorm_readfl (mval *v, int4 width, int4 timeout) /* timeout in seconds */
 			}
 		}
 	}
-
 	zint_restart = FALSE;
 	/* Check if new or resumed read */
 	if (rm_ptr->mupintr)
 	{	/* We have a pending read restart of some sort */
-		if (pipewhich_invalid == pipeintr->who_saved)
-			assertpro(FALSE);      /* Interrupt should never have an invalid save state */
+		assertpro(pipewhich_invalid != pipeintr->who_saved);      /* Interrupt should never have an invalid save state */
 		/* check we aren't recursing on this device */
 		if (dollar_zininterrupt)
 			rts_error_csa(CSA_ARG(NULL) VARLSTCNT(1) ERR_ZINTRECURSEIO);
-                if (pipewhich_readfl != pipeintr->who_saved)
-                        assertpro(FALSE);      /* ZINTRECURSEIO should have caught */
+		if (pipewhich_readfl != pipeintr->who_saved)
+			assertpro(FALSE);      /* ZINTRECURSEIO should have caught */
 		PIPE_DEBUG(PRINTF("piperfl: *#*#*#*#*#*#*#  Restarted interrupted read\n"); DEBUGPIPEFLUSH);
 		mv_zintdev = io_find_mvstent(io_ptr, FALSE);
 		if (mv_zintdev)
@@ -332,13 +324,12 @@ int	iorm_readfl (mval *v, int4 width, int4 timeout) /* timeout in seconds */
 		} else
 		{
 			pipeintr->end_time_valid = FALSE;
-                        PIPE_DEBUG(PRINTF("Evidence of an interrupt, but no MV_STENT\n"); DEBUGPIPEFLUSH);
+			PIPE_DEBUG(PRINTF("Evidence of an interrupt, but no MV_STENT\n"); DEBUGPIPEFLUSH);
 		}
 		rm_ptr->mupintr = FALSE;
 		pipeintr->who_saved = pipewhich_invalid;
 	} else
 		pipeintr->end_time_valid = FALSE;
-
 	/* save the lastop for zeof test later */
 	saved_lastop = rm_ptr->lastop;
 	rm_ptr->lastop = RM_READ;
@@ -376,10 +367,9 @@ int	iorm_readfl (mval *v, int4 width, int4 timeout) /* timeout in seconds */
 			bytes_count = pipeintr->bytes_count;
 			add_bytes = pipeintr->add_bytes;
 		}
-
 		PIPE_DEBUG(PRINTF("piperfl: .. mv_stent found - bytes_read: %d max_bufflen: %d"
 				  "  interrupts: %d\n", bytes_read, exp_width, TREF(pipefifo_interrupt)); DEBUGPIPEFLUSH);
-		PIPE_DEBUG(PRINTF("piperfl: .. timeout: %d\n", timeout); DEBUGPIPEFLUSH);
+		PIPE_DEBUG(PRINTF("piperfl: .. timeout: %d\n", msec_timeout); DEBUGPIPEFLUSH);
 		PIPE_DEBUG(if (pipeintr->end_time_valid) PRINTF("piperfl: .. endtime: %d/%d\n", end_time.at_sec,
 								end_time.at_usec); DEBUGPIPEFLUSH);
 		PIPE_DEBUG(PRINTF("piperfl: .. buffer address: 0x%08lx  stringpool: 0x%08lx\n",
@@ -410,12 +400,11 @@ int	iorm_readfl (mval *v, int4 width, int4 timeout) /* timeout in seconds */
 				/* if v->str.len is 0 then v->str.add is ignored by garbage collection so reset it to
 					stringpool.free */
 				if (v->str.len == 0)
-			 		v->str.addr =  (char *)stringpool.free;
+					v->str.addr =  (char *)stringpool.free;
 				buffer_start = (unsigned char *)v->str.addr;
 			}
 			assert((buffer_start + bytes_read) <= stringpool.free);	/* BYPASSOK */
 			if (!IS_AT_END_OF_STRINGPOOL(buffer_start, bytes_read))
-
 			{	/* now need to move it to the top */
 				assert(stp_need == exp_width);
 				memcpy(stringpool.free, buffer_start, bytes_read);
@@ -431,10 +420,9 @@ int	iorm_readfl (mval *v, int4 width, int4 timeout) /* timeout in seconds */
 	if (utf_active || !rm_ptr->fixed)
 		bytes_read = 0;
 	out_of_time = FALSE;
-	if (timeout == NO_M_TIMEOUT)
+	if (NO_M_TIMEOUT == msec_timeout)
 	{
 		timed = FALSE;
-		msec_timeout = NO_M_TIMEOUT;
 		assert(!pipeintr->end_time_valid);
 	} else
 	{	/* For timed input, this routine starts only one timer. One case is for a READ x:n; another is potentially for the
@@ -446,7 +434,6 @@ int	iorm_readfl (mval *v, int4 width, int4 timeout) /* timeout in seconds */
 		 * timed is TRUE, we manage the timer outcome at the end of this routine.
 		 */
 		timed = TRUE;
-		msec_timeout = timeout2msec(timeout);
 		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.
@@ -457,12 +444,12 @@ int	iorm_readfl (mval *v, int4 width, int4 timeout) /* timeout in seconds */
 			else
 			{	/* Compute appropriate msec_timeout using end_time from restart data. */
 				end_time = pipeintr->end_time;	/* Restore end_time for timeout */
-                                cur_time = sub_abs_time(&end_time, &cur_time);
-                                if (0 > cur_time.at_sec)
-                                {
+				cur_time = sub_abs_time(&end_time, &cur_time);
+				if (0 > cur_time.at_sec)
+				{
 					msec_timeout = -1;
-                                        out_of_time = TRUE;
-                                } else
+					out_of_time = TRUE;
+				} else
 					msec_timeout = (int4)(cur_time.at_sec * MILLISECS_IN_SEC +
 							      DIVIDE_ROUND_UP(cur_time.at_usec, MICROSECS_IN_MSEC));
 				if (rm_ptr->follow && !out_of_time && !msec_timeout)
@@ -486,20 +473,20 @@ int	iorm_readfl (mval *v, int4 width, int4 timeout) /* timeout in seconds */
 			if (0 > fcntl_res)
 				rts_error_csa(CSA_ARG(NULL) VARLSTCNT(8) ERR_SYSCALL, 5, LEN_AND_LIT("fcntl"), CALLFROM, errno);
 			blocked_in = FALSE;
-			if (rm_ptr->pipe)
+			if (rm_ptr->is_pipe)
 				pipe_zero_timeout = TRUE;
 		}
 	}
 	pipeintr->end_time_valid = FALSE;
 	errno = status = 0;
 	chset = io_ptr->ichset;
-        if (!utf_active)
+	if (!utf_active)
 	{
 		if (rm_ptr->fixed)
-                {       /* This is M mode - one character is one byte.
-                         * Note the check for EINTR below is valid and should not be converted to an EINTR
-                         * wrapper macro, since action is taken on EINTR, not a retry.
-                         */
+		{       /* This is M mode - one character is one byte.
+			 * Note the check for EINTR below is valid and should not be converted to an EINTR
+			 * wrapper macro, since action is taken on EINTR, not a retry.
+			 */
 			if (rm_ptr->follow)
 			{
 				PIPE_DEBUG(PRINTF(" %d fixed\n", pid); DEBUGPIPEFLUSH);
@@ -585,7 +572,7 @@ int	iorm_readfl (mval *v, int4 width, int4 timeout) /* timeout in seconds */
 							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)
+							if ((0 < msec_timeout) && (NO_M_TIMEOUT != msec_timeout))
 							{
 								pipeintr->end_time = end_time;
 								pipeintr->end_time_valid = TRUE;
@@ -616,11 +603,9 @@ int	iorm_readfl (mval *v, int4 width, int4 timeout) /* timeout in seconds */
 			{	/* If the device is a PIPE, and we read at least one character, start a timer using timer_id. We
 				 * cancel that timer later in this routine if it has not expired before the return.
 				 */
-				DOREADRLTO2(fildes, temp, width, out_of_time, &blocked_in, rm_ptr->pipe, flags, status,
+				DOREADRLTO2(fildes, temp, width, out_of_time, &blocked_in, rm_ptr->is_pipe, flags, status,
 					    &tot_bytes_read, timer_id, &msec_timeout, pipe_zero_timeout, FALSE, pipe_or_fifo);
-
 				PIPE_DEBUG(PRINTF(" %d fixed\n", pid); DEBUGPIPEFLUSH);
-
 				if ((0 < status) || ((0 > status) && (0 < tot_bytes_read)))
 				{
 					if (rm_ptr->input_encrypted)
@@ -658,7 +643,7 @@ int	iorm_readfl (mval *v, int4 width, int4 timeout) /* timeout in seconds */
 					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)
+					if ((0 < msec_timeout) && (NO_M_TIMEOUT != msec_timeout))
 					{
 						pipeintr->end_time = end_time;
 						pipeintr->end_time_valid = TRUE;
@@ -682,11 +667,9 @@ int	iorm_readfl (mval *v, int4 width, int4 timeout) /* timeout in seconds */
 					  "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)
 			{
 				PIPE_DEBUG(PRINTF(" %d M streaming with follow\n", pid); DEBUGPIPEFLUSH);
-
 				/* rms-file device in follow mode */
 				if (timed)
 				{
@@ -703,7 +686,6 @@ int	iorm_readfl (mval *v, int4 width, int4 timeout) /* timeout in seconds */
 						} 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;
@@ -711,12 +693,10 @@ int	iorm_readfl (mval *v, int4 width, int4 timeout) /* timeout in seconds */
 					} else
 						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;
 			}
-
 			do
 			{
 				bytes2read = 1;
@@ -774,7 +754,6 @@ int	iorm_readfl (mval *v, int4 width, int4 timeout) /* timeout in seconds */
 											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;
@@ -797,8 +776,7 @@ int	iorm_readfl (mval *v, int4 width, int4 timeout) /* timeout in seconds */
 								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;
@@ -837,7 +815,7 @@ int	iorm_readfl (mval *v, int4 width, int4 timeout) /* timeout in seconds */
 					} else
 					{	/* NO FOLLOW */
 						DOREADRLTO2(fildes, rm_ptr->tmp_buffer, CHUNK_SIZE,
-							    out_of_time, &blocked_in, rm_ptr->pipe, flags,
+							    out_of_time, &blocked_in, rm_ptr->is_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)))
@@ -866,7 +844,7 @@ int	iorm_readfl (mval *v, int4 width, int4 timeout) /* timeout in seconds */
 						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;
@@ -899,12 +877,11 @@ int	iorm_readfl (mval *v, int4 width, int4 timeout) /* timeout in seconds */
 					{
 						rm_ptr->tot_bytes_in_buffer = chunk_bytes_read;
 						tot_bytes_read = chunk_bytes_read;
-						if (!rm_ptr->pipe && !rm_ptr->fifo)
+						if (!rm_ptr->is_pipe && !rm_ptr->fifo)
 							status = chunk_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)
@@ -919,7 +896,6 @@ int	iorm_readfl (mval *v, int4 width, int4 timeout) /* timeout in seconds */
 					 * 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)
@@ -983,7 +959,7 @@ int	iorm_readfl (mval *v, int4 width, int4 timeout) /* timeout in seconds */
 					fol_bytes_read = rm_ptr->fol_bytes_read;
 				} else
 				{
-					buff_len = iorm_get(io_ptr, &blocked_in, rm_ptr->pipe, flags, &tot_bytes_read,
+					buff_len = iorm_get(io_ptr, &blocked_in, rm_ptr->is_pipe, flags, &tot_bytes_read,
 						    timer_id, &msec_timeout, pipe_zero_timeout, zint_restart);
 					/* not using fol_bytes_read for non-follow mode */
 					fol_bytes_read = buff_len;
@@ -1003,7 +979,7 @@ int	iorm_readfl (mval *v, int4 width, int4 timeout) /* timeout in seconds */
 					mv_chain->mv_st_cont.mvs_zintdev.curr_sp_buffer.len = 0;
 					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;
@@ -1025,7 +1001,6 @@ int	iorm_readfl (mval *v, int4 width, int4 timeout) /* timeout in seconds */
 			}
 			status = tot_bytes_read = buff_len;		/* for EOF checking at the end */
 			char_ptr = rm_ptr->inbuf_off;
-
 			PIPE_DEBUG(PRINTF("iorm_readfl: inbuf: 0x%08lx, top: 0x%08lx, off: 0x%08lx\n", rm_ptr->inbuf,
 					  rm_ptr->inbuf_top, rm_ptr->inbuf_off); DEBUGPIPEFLUSH;);
 			PIPE_DEBUG(PRINTF("iorm_readfl: status: %d, width: %d", status, width); DEBUGPIPEFLUSH;);
@@ -1088,7 +1063,6 @@ int	iorm_readfl (mval *v, int4 width, int4 timeout) /* timeout in seconds */
 				}
 				if (rm_ptr->follow && (char_count == width) && (TRUE == follow_timeout))
 					follow_timeout = FALSE;
-
 				v->str.len = INTCAST(char_ptr - rm_ptr->inbuf_off);
 				UNICODE_ONLY(v->str.char_len = char_count;)
 				if (0 < v->str.len)
@@ -1111,7 +1085,7 @@ int	iorm_readfl (mval *v, int4 width, int4 timeout) /* timeout in seconds */
 					rm_ptr->inbuf_off += char_ptr - rm_ptr->inbuf_off;
 				}
 			}
-                } else
+		} else
 		{	/* VARIABLE or STREAM */
 			PIPE_DEBUG(PRINTF("enter utf stream: %d inbuf_pos: %d inbuf_off: %d follow: %d\n", rm_ptr->done_1st_read,
 					  rm_ptr->inbuf_pos, rm_ptr->inbuf_off, rm_ptr->follow); DEBUGPIPEFLUSH);
@@ -1139,11 +1113,9 @@ int	iorm_readfl (mval *v, int4 width, int4 timeout) /* timeout in seconds */
 					  status, bytes2read, rm_ptr->start_pos, rm_ptr->tot_bytes_in_buffer,
 					  char_bytes_read, add_bytes); DEBUGPIPEFLUSH);
 			char_start = rm_ptr->inbuf_off;
-
 			if (rm_ptr->follow)
 			{
 				PIPE_DEBUG(PRINTF(" %d utf streaming with follow\n", pid); DEBUGPIPEFLUSH);
-
 				/* rms-file device in follow mode */
 				if (timed)
 				{
@@ -1160,7 +1132,6 @@ int	iorm_readfl (mval *v, int4 width, int4 timeout) /* timeout in seconds */
 						} 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;
@@ -1168,12 +1139,10 @@ int	iorm_readfl (mval *v, int4 width, int4 timeout) /* timeout in seconds */
 					} else
 						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;
 			}
-
 			do
 			{
 				/* In case the CHSET changes from non-UTF-16 to UTF-16 and a read has already been done,
@@ -1192,12 +1161,10 @@ int	iorm_readfl (mval *v, int4 width, int4 timeout) /* timeout in seconds */
 						status = iorm_get_bom_fol(io_ptr, &tot_bytes_read, &msec_timeout, timed,
 									  &bom_timeout, end_time);
 					} else
-						status = iorm_get_bom(io_ptr, &blocked_in, rm_ptr->pipe, flags, &tot_bytes_read,
+						status = iorm_get_bom(io_ptr, &blocked_in, rm_ptr->is_pipe, flags, &tot_bytes_read,
 							      timer_id, &msec_timeout, pipe_zero_timeout);
-
 					/* if we got an interrupt then the iorm_get_bom did not complete so not as much state
 					   needs to be saved*/
-
 					if (outofband && (pipe_or_fifo || rm_ptr->follow))
 					{
 						PIPE_DEBUG(PRINTF(" %d utf1 stream outofband\n", pid); DEBUGPIPEFLUSH);
@@ -1207,7 +1174,7 @@ int	iorm_readfl (mval *v, int4 width, int4 timeout) /* timeout in seconds */
 						mv_chain->mv_st_cont.mvs_zintdev.curr_sp_buffer.len = 0;
 						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;
@@ -1233,7 +1200,6 @@ int	iorm_readfl (mval *v, int4 width, int4 timeout) /* timeout in seconds */
 						rm_ptr->ichset_utf16_variant = io_ptr->ichset;
 					chset = io_ptr->ichset;	/* UTF16 will have changed to UTF16BE or UTF16LE */
 				}
-
 				if (0 <= status && bytes2read && rm_ptr->bom_buf_cnt > rm_ptr->bom_buf_off)
 				{
 					PIPE_DEBUG(PRINTF("2: status: %d bytes2read: %d bom_buf_cnt: %d bom_buf_off: %d\n",
@@ -1249,8 +1215,6 @@ int	iorm_readfl (mval *v, int4 width, int4 timeout) /* timeout in seconds */
 					rm_ptr->file_pos += from_bom;   /* If there is no BOM increment file position */
 					status = 0;
 				}
-
-
 				if ((0 <= status) && (0 < bytes2read))
 				{
 					PIPE_DEBUG(PRINTF("3: status: %d bytes2read: %d rm_ptr->start_pos: %d "
@@ -1268,7 +1232,6 @@ int	iorm_readfl (mval *v, int4 width, int4 timeout) /* timeout in seconds */
 						 * one-byte reads can be avoided when in UTF mode.
 						 *
 						 */
-
 						if (rm_ptr->follow && (FALSE == bom_timeout))
 						{
 							/* In follow mode a read returns an EOF if no more bytes are available. */
@@ -1308,7 +1271,6 @@ int	iorm_readfl (mval *v, int4 width, int4 timeout) /* timeout in seconds */
 												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;
@@ -1331,8 +1293,7 @@ int	iorm_readfl (mval *v, int4 width, int4 timeout) /* timeout in seconds */
 									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;
@@ -1372,7 +1333,7 @@ int	iorm_readfl (mval *v, int4 width, int4 timeout) /* timeout in seconds */
 						} else
 						{
 							DOREADRLTO2(fildes, rm_ptr->tmp_buffer, CHUNK_SIZE,
-								    out_of_time, &blocked_in, rm_ptr->pipe, flags,
+								    out_of_time, &blocked_in, rm_ptr->is_pipe, flags,
 								    status, &utf_tot_bytes_read, timer_id,
 								    &msec_timeout, pipe_zero_timeout, pipe_or_fifo, pipe_or_fifo);
 							if ((0 < status) || ((0 > status) && (0 < utf_tot_bytes_read)))
@@ -1401,7 +1362,7 @@ int	iorm_readfl (mval *v, int4 width, int4 timeout) /* timeout in seconds */
 							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;
@@ -1434,12 +1395,11 @@ int	iorm_readfl (mval *v, int4 width, int4 timeout) /* timeout in seconds */
 						{
 							rm_ptr->tot_bytes_in_buffer = utf_tot_bytes_read;
 							tot_bytes_read = utf_tot_bytes_read;
-							if (!rm_ptr->pipe && !rm_ptr->fifo)
+							if (!rm_ptr->is_pipe && !rm_ptr->fifo)
 								status = utf_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)
@@ -1557,7 +1517,6 @@ int	iorm_readfl (mval *v, int4 width, int4 timeout) /* timeout in seconds */
 						{
 							PIPE_DEBUG(PRINTF("9: char_bytes_read: %d add_bytes: %d\n",
 									  char_bytes_read, add_bytes); DEBUGPIPEFLUSH);
-
 							assert(char_bytes_read == (add_bytes + 1));
 							nextmb = UTF8_MBTOWC(char_start, rm_ptr->inbuf_pos, utf_code);
 							if (WEOF == utf_code)
@@ -1611,10 +1570,9 @@ int	iorm_readfl (mval *v, int4 width, int4 timeout) /* timeout in seconds */
 							} else if (-1 == add_bytes)
 							{	/*  not valid */
 								SETZACANCELTIMER;
-                                                                iorm_readfl_badchar(v,
-										    (int)((unsigned char *)temp - stringpool.free),
-										    char_bytes_read,
-                                                                                    char_start, rm_ptr->inbuf_pos);
+								iorm_readfl_badchar(v,
+										(int)((unsigned char *)temp - stringpool.free),
+										char_bytes_read, char_start, rm_ptr->inbuf_pos);
 								rm_ptr->inbuf_off = rm_ptr->inbuf_pos;	/* mark as read */
 								UTF8_BADCHAR(char_bytes_read, char_start, rm_ptr->inbuf_pos,
 									     chset_names[chset].len, chset_names[chset].addr);
@@ -1694,7 +1652,7 @@ int	iorm_readfl (mval *v, int4 width, int4 timeout) /* timeout in seconds */
 				}
 			} while (char_count < width && bytes_count < MAX_STRLEN);
 		}
- 	}
+	}
 	PIPE_DEBUG(PRINTF(" %d notoutofband, %d %d\n", pid, status, line_term_seen); DEBUGPIPEFLUSH);
 	real_errno = errno;
 	if (TRUE == do_clearerr)
@@ -1720,19 +1678,18 @@ int	iorm_readfl (mval *v, int4 width, int4 timeout) /* timeout in seconds */
 		}
 		ret = FALSE;
 	}
-
 	if (timed)
 	{	/* No timer if msec_timeout is zero, so handle the timer in the else. */
 		if (msec_timeout == 0)
 		{
-			if (!rm_ptr->pipe || FALSE == blocked_in)
+			if (!rm_ptr->is_pipe || FALSE == blocked_in)
 			{
 				FCNTL3(fildes, F_SETFL, flags, fcntl_res);
 				if (0 > fcntl_res)
 					rts_error_csa(CSA_ARG(NULL) VARLSTCNT(8) ERR_SYSCALL, 5, LEN_AND_LIT("fcntl"),
 						      CALLFROM, errno);
 			}
-			if ((rm_ptr->pipe && (0 == status)) || (rm_ptr->fifo && (0 == status || real_errno == EAGAIN)))
+			if ((rm_ptr->is_pipe && (0 == status)) || (rm_ptr->fifo && (0 == status || real_errno == EAGAIN)))
 				ret = FALSE;
 		} else
 		{
@@ -1742,13 +1699,11 @@ int	iorm_readfl (mval *v, int4 width, int4 timeout) /* timeout in seconds */
 				cancel_timer(timer_id);
 		}
 	}
-
 	if ((0 == status) && (0 == tot_bytes_read))
 	{
 		v->str.len = 0;
 		v->str.addr = (char *)stringpool.free;		/* ensure valid address */
 		UNICODE_ONLY(v->str.char_len = 0;)
-
 		if (rm_ptr->follow)
 		{
 			if (TRUE == io_ptr->dollar.zeof)
@@ -1760,10 +1715,8 @@ int	iorm_readfl (mval *v, int4 width, int4 timeout) /* timeout in seconds */
 		len = SIZEOF(ONE_COMMA_DEV_DET_EOF);
 		memcpy(io_ptr->dollar.device, ONE_COMMA_DEV_DET_EOF, len);
 		io_ptr->dollar.za = 9;
-
 		if ((TRUE == io_ptr->dollar.zeof) && (RM_READ == saved_lastop))
 			rts_error_csa(CSA_ARG(NULL) VARLSTCNT(1) ERR_IOEOF);
-
 		io_ptr->dollar.zeof = TRUE;
 		*dollarx_ptr = 0;
 		(*dollary_ptr)++;
@@ -1776,7 +1729,7 @@ int	iorm_readfl (mval *v, int4 width, int4 timeout) /* timeout in seconds */
 		}
 	} else
 	{
-		if (rm_ptr->pipe)
+		if (rm_ptr->is_pipe)
 		{
 			if ((tot_bytes_read > 0) || (out_of_time && blocked_in))
 				ret = TRUE;
@@ -1820,5 +1773,5 @@ int	iorm_readfl (mval *v, int4 width, int4 timeout) /* timeout in seconds */
 		ret = FALSE;
 	assert (FALSE == rm_ptr->mupintr);
 	REVERT_GTMIO_CH(&io_curr_device, ch_set);
-	return (rm_ptr->pipe && out_of_time) ? FALSE : ret;
+	return (rm_ptr->is_pipe && out_of_time) ? FALSE : ret;
 }
diff --git a/sr_unix/iorm_use.c b/sr_unix/iorm_use.c
index 2f0b4bb..59cb5ba 100755
--- a/sr_unix/iorm_use.c
+++ b/sr_unix/iorm_use.c
@@ -305,7 +305,7 @@ void	iorm_use(io_desc *iod, mval *pp)
 				rm_ptr->recordsize = recordsize;
 				rm_ptr->def_recsize = FALSE;
 				/* for sequential device in fixed M mode, recordsize defines initial width */
-				if (dev_open != iod->state && rm_ptr->fixed && (!rm_ptr->fifo && !rm_ptr->pipe) &&
+				if (dev_open != iod->state && rm_ptr->fixed && (!rm_ptr->fifo && !rm_ptr->is_pipe) &&
 				    (!IS_UTF_CHSET(iod->ichset) && !IS_UTF_CHSET(iod->ochset)))
 					iod->width = recordsize;
 			}
@@ -324,7 +324,7 @@ void	iorm_use(io_desc *iod, mval *pp)
 		case iop_rewind:
 			if ((FALSE == outdevparam) && (io_std_device.out == iod))
 				break;
-			if (iod->state == dev_open && !rm_ptr->fifo && !rm_ptr->pipe)
+			if (iod->state == dev_open && !rm_ptr->fifo && !rm_ptr->is_pipe)
 			{
 				if ((off_t)-1 == lseek(rm_ptr->fildes, 0, SEEK_SET))
 				{
@@ -383,7 +383,7 @@ void	iorm_use(io_desc *iod, mval *pp)
 			/* truncate if not a fifo and not a pipe and (it is a non-split device or this is the
 			 * output side of a split device)
 			 */
-			if (!rm_ptr->fifo && !rm_ptr->pipe && ((iod->pair.in == iod->pair.out) || (io_std_device.out == iod)))
+			if (!rm_ptr->fifo && !rm_ptr->is_pipe && ((iod->pair.in == iod->pair.out) || (io_std_device.out == iod)))
 			{
 				int ftruncate_res;
 				int fc_res;
@@ -668,11 +668,11 @@ void	iorm_use(io_desc *iod, mval *pp)
 			}
 			break;
 		case iop_follow:
-			if (!rm_ptr->fifo && !rm_ptr->pipe)
+			if (!rm_ptr->fifo && !rm_ptr->is_pipe)
 				rm_ptr->follow = TRUE;
 			break;
 		case iop_nofollow:
-			if (!rm_ptr->fifo && !rm_ptr->pipe)
+			if (!rm_ptr->fifo && !rm_ptr->is_pipe)
 				rm_ptr->follow = FALSE;
 			break;
 		case iop_outseek:
@@ -690,7 +690,7 @@ void	iorm_use(io_desc *iod, mval *pp)
 			if ((FALSE == outdevparam) && (io_std_device.out == iod))
 				break;
 			seek_specified = TRUE;
-			if (!rm_ptr->fifo && !rm_ptr->pipe)
+			if (!rm_ptr->fifo && !rm_ptr->is_pipe)
 			{
 				/* need to do FSTAT_FILE to get file size if not already done */
 				FSTAT_CHECK(FALSE);
@@ -719,7 +719,7 @@ void	iorm_use(io_desc *iod, mval *pp)
 					 * file is not empty, and not writeonly, and encryption is not in effect, then go to the
 					 * beginning of the file and read the potential BOM.
 					 */
-					if ((!rm_ptr->bom_checked) && (!rm_ptr->no_destroy) && (!rm_ptr->fifo) && (!rm_ptr->pipe)
+					if ((!rm_ptr->bom_checked) && (!rm_ptr->no_destroy) && (!rm_ptr->fifo) && (!rm_ptr->is_pipe)
 					    && (!rm_ptr->input_encrypted) && (2 < rm_ptr->fildes) && (0 < statbuf.st_size)
 					    && IS_UTF_CHSET(iod->ichset) && !rm_ptr->write_only)
 					{
diff --git a/sr_unix/iorm_write.c b/sr_unix/iorm_write.c
index 04ad9fa..5e5123f 100755
--- a/sr_unix/iorm_write.c
+++ b/sr_unix/iorm_write.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	*
@@ -249,7 +249,7 @@ void iorm_write_utf(mstr *v)
 					out_ptr = pvt_crypt_buf.addr;
 				} else
 					out_ptr = (char *)outstart;
-				if (rm_ptr->fifo || rm_ptr->pipe)
+				if (rm_ptr->fifo || rm_ptr->is_pipe)
 				{
 					WRITEPIPE(rm_ptr->fildes, rm_ptr->pipe_buff_size, out_ptr, outbytes, status);
 				} else
@@ -374,7 +374,7 @@ void iorm_write(mstr *v)
 
 	if (rm_ptr->read_only)
 		rts_error_csa(CSA_ARG(NULL) VARLSTCNT(1) ERR_DEVICEREADONLY);
-	if ((!rm_ptr->fifo) && (!rm_ptr->pipe) && rm_ptr->output_encrypted)
+	if ((!rm_ptr->fifo) && (!rm_ptr->is_pipe) && rm_ptr->output_encrypted)
 	{
 		if (!iod->dollar.zeof)
 		{
@@ -421,7 +421,7 @@ void iorm_write(mstr *v)
 		}
 	}
 
-	if (!rm_ptr->fifo && !rm_ptr->pipe && !rm_ptr->fixed && (2 < rm_ptr->fildes) && (RM_WRITE != rm_ptr->lastop))
+	if (!rm_ptr->fifo && !rm_ptr->is_pipe && !rm_ptr->fixed && (2 < rm_ptr->fildes) && (RM_WRITE != rm_ptr->lastop))
 	{
 		/* need to do an lseek to set current location in file */
 		if ((off_t)-1 == (lseek(rm_ptr->fildes, rm_ptr->file_pos, SEEK_SET)))
@@ -434,7 +434,7 @@ void iorm_write(mstr *v)
 
 	/* if current file position is less than bom_num_bytes and it is a disk in utf mode and last op not a WRITE
 	   skip past the BOM */
-	if (!rm_ptr->fifo && !rm_ptr->pipe && IS_UTF_CHSET(iod->ochset) && (rm_ptr->file_pos < rm_ptr->bom_num_bytes) &&
+	if (!rm_ptr->fifo && !rm_ptr->is_pipe && IS_UTF_CHSET(iod->ochset) && (rm_ptr->file_pos < rm_ptr->bom_num_bytes) &&
 	    (2 < rm_ptr->fildes) && (RM_WRITE != rm_ptr->lastop))
 	{
 		/* need to do lseek to skip the BOM before writing*/
@@ -483,7 +483,7 @@ void iorm_write(mstr *v)
 			out_ptr = pvt_crypt_buf.addr;
 		} else
 			out_ptr = out;
-		if (rm_ptr->fifo || rm_ptr->pipe)
+		if (rm_ptr->fifo || rm_ptr->is_pipe)
 		{
 			WRITEPIPE(rm_ptr->fildes, rm_ptr->pipe_buff_size, out_ptr, len, status);
 		} else
diff --git a/sr_unix/iorm_wteol.c b/sr_unix/iorm_wteol.c
index 1f40931..8862673 100755
--- a/sr_unix/iorm_wteol.c
+++ b/sr_unix/iorm_wteol.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	*
@@ -72,7 +72,7 @@ void iorm_wteol(int4 x,io_desc *iod)
 	}
 	if (rm_ptr->read_only)
 		rts_error_csa(CSA_ARG(NULL) VARLSTCNT(1) ERR_DEVICEREADONLY);
-	if ((!rm_ptr->fifo) && (!rm_ptr->pipe) && rm_ptr->output_encrypted)
+	if ((!rm_ptr->fifo) && (!rm_ptr->is_pipe) && rm_ptr->output_encrypted)
 	{
 		if (!iod->dollar.zeof)
 		{
diff --git a/sr_unix/iormdef.h b/sr_unix/iormdef.h
index 82c818f..f9c63e6 100755
--- a/sr_unix/iormdef.h
+++ b/sr_unix/iormdef.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	*
@@ -223,7 +223,7 @@ typedef struct
 	boolean_t	write_only;	/* WRITEONLY specified */
 	boolean_t	stream;
 	boolean_t	fifo;
-	boolean_t	pipe;		/* True if pipe device */
+	boolean_t	is_pipe;	/* True if pipe device */
 	boolean_t	independent; 	/* True if pipe process to live after pipe is closed */
 	boolean_t	parse;		/* True if pipe command is to be parsed */
 	boolean_t	done_1st_read;	/* If UTF16, we need to know if this is the first read or not to check for BOM */
diff --git a/sr_unix/iosocket_pass_local.c b/sr_unix/iosocket_pass_local.c
index 6076d87..7d3a965 100644
--- a/sr_unix/iosocket_pass_local.c
+++ b/sr_unix/iosocket_pass_local.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	*
@@ -113,7 +113,7 @@ struct msgdata
 #define	MSG_MAGIC		1431655765
 #define	MSG_PROTO_VERSION	1
 
-void iosocket_pass_local(io_desc *iod, pid_t pid, int4 timeout, int argcnt, va_list args)
+void iosocket_pass_local(io_desc *iod, pid_t pid, int4 msec_timeout, int argcnt, va_list args)
 {
 	d_socket_struct 	*dsocketptr;
 	socket_struct		*socketptr, *psocketptr;
@@ -130,7 +130,6 @@ void iosocket_pass_local(io_desc *iod, pid_t pid, int4 timeout, int argcnt, va_l
 	int			*fds;
 	pid_t			peerpid;
 	TID			timer_id;
-	int4			msec_timeout;
 	char			complete_buf[STR_LIT_LEN(ACCEPT_COMPLETE)];
 	char			*errptr;
 	int4			errlen;
@@ -188,10 +187,8 @@ void iosocket_pass_local(io_desc *iod, pid_t pid, int4 timeout, int argcnt, va_l
 		}
 	}
 #	endif
-
 	/* pass fds */
 	fds = (int *)CMSG_DATA((struct cmsghdr *)cmsg_buffer);
-
 	for (argn = 0; argn < argcnt; argn++)
 	{
 		handle = va_arg(args, mval *);
@@ -211,7 +208,6 @@ void iosocket_pass_local(io_desc *iod, pid_t pid, int4 timeout, int argcnt, va_l
 		psocketptr = socket_pool->socket[index];
 		fds[argn] = psocketptr->sd;
 	}
-
 	/* send argcnt with fds */
 	mdata.magic = MSG_MAGIC;
 	mdata.proto_version = MSG_PROTO_VERSION;
@@ -229,26 +225,20 @@ void iosocket_pass_local(io_desc *iod, pid_t pid, int4 timeout, int argcnt, va_l
 	cmsg->cmsg_len = CMSG_LEN(argcnt * SIZEOF(int));
 	cmsg->cmsg_level = SOL_SOCKET;
 	cmsg->cmsg_type = SCM_RIGHTS;
-
 	memcpy(iod->dollar.device, "0", SIZEOF("0"));
-
-	if (NO_M_TIMEOUT != timeout)
+	if (NO_M_TIMEOUT != msec_timeout)
 	{
 		timer_id = (TID)iosocket_pass_local;
-		msec_timeout = timeout2msec(timeout);
 		start_timer(timer_id, msec_timeout, wake_alarm, 0, NULL);
 	}
-
 	do
 	{
 		rval = sendmsg(socketptr->sd, &msg, 0);
 	}
 	while (!outofband && !out_of_time && (-1 == rval) && (EINTR == errno));
-
 	if (-1 == rval)
 		goto ioerr;
 	assert(rval == iov.iov_len);
-
 	for (argn = 0; argn < argcnt; argn++)
 	{
 		if (0 > (index = iosocket_handle(handles[argn].addr, &handles[argn].len, FALSE, socket_pool)))
@@ -257,25 +247,21 @@ void iosocket_pass_local(io_desc *iod, pid_t pid, int4 timeout, int argcnt, va_l
 			return;
 		}
 		psocketptr = socket_pool->socket[index];
-
 		/* send handle length */
 		SENDALL(socketptr->sd, &handles[argn].len, SIZEOF(handles[argn].len), rval);
 		if (-1 == rval)
 			goto ioerr;
 		assert(rval == SIZEOF(handles[argn].len));
-
 		/* send handle */
 		SENDALL(socketptr->sd, handles[argn].addr, handles[argn].len, rval);
 		if (-1 == rval)
 			goto ioerr;
 		assert(rval == handles[argn].len);
-
 		/* send buffer length */
 		SENDALL(socketptr->sd, &psocketptr->buffered_length, SIZEOF(psocketptr->buffered_length), rval);
 		if (-1 == rval)
 			goto ioerr;
 		assert(rval == SIZEOF(psocketptr->buffered_length));
-
 		/* send buffer */
 		SENDALL(socketptr->sd, psocketptr->buffer + psocketptr->buffered_offset, psocketptr->buffered_length, rval);
 		if (-1 == rval)
@@ -292,7 +278,7 @@ void iosocket_pass_local(io_desc *iod, pid_t pid, int4 timeout, int argcnt, va_l
 	assert(rval == STR_LIT_LEN(ACCEPT_COMPLETE));
 	if (0 != STRNCMP_LIT(complete_buf, ACCEPT_COMPLETE))
 	{
-		if ((NO_M_TIMEOUT != timeout) && !out_of_time)
+		if ((NO_M_TIMEOUT != msec_timeout) && !out_of_time)
 			cancel_timer(timer_id);
 		iod->dollar.za = 9;
 		errptr = PROTOCOL_ERROR;
@@ -304,18 +290,15 @@ void iosocket_pass_local(io_desc *iod, pid_t pid, int4 timeout, int argcnt, va_l
 		REVERT_GTMIO_CH(&iod->pair, ch_set);
 		return;
 	}
-
-	if ((NO_M_TIMEOUT != timeout) && !out_of_time)
+	if ((NO_M_TIMEOUT != msec_timeout) && !out_of_time)
 		cancel_timer(timer_id);
-
 	for (argn = 0; argn < argcnt; argn++)
 	{
 		handlestr = handles[argn];
 		if (-1 != (index = iosocket_handle(handlestr.addr, &handlestr.len, FALSE, socket_pool)))
 			iosocket_close_one(socket_pool, index);
 	}
-
-	if (NO_M_TIMEOUT != timeout)
+	if (NO_M_TIMEOUT != msec_timeout)
 		dollar_truth = TRUE;
 	REVERT_GTMIO_CH(&iod->pair, ch_set);
 	return;
@@ -328,7 +311,7 @@ ioerr:
 		REVERT_GTMIO_CH(&iod->pair, ch_set);
 		return;
 	}
-	if ((NO_M_TIMEOUT != timeout) && !out_of_time)
+	if ((NO_M_TIMEOUT != msec_timeout) && !out_of_time)
 		cancel_timer(timer_id);
 	iod->dollar.za = 9;
 	errptr = (char *)STRERROR(save_errno);
@@ -341,7 +324,7 @@ ioerr:
 	return;
 }
 
-void iosocket_accept_local(io_desc *iod, mval *handlesvar, pid_t pid, int4 timeout, int argcnt, va_list args)
+void iosocket_accept_local(io_desc *iod, mval *handlesvar, pid_t pid, int4 msec_timeout, int argcnt, va_list args)
 {
 	d_socket_struct 	*dsocketptr;
 	socket_struct		*socketptr, *psocketptr;
@@ -361,7 +344,6 @@ void iosocket_accept_local(io_desc *iod, mval *handlesvar, pid_t pid, int4 timeo
 	size_t			tmpbuflen;
 	pid_t			peerpid;
 	TID			timer_id;
-	int4			msec_timeout;
 	char			complete_buf[STR_LIT_LEN(PASS_COMPLETE)];
 	char			*errptr;
 	int4			errlen;
@@ -398,7 +380,6 @@ void iosocket_accept_local(io_desc *iod, mval *handlesvar, pid_t pid, int4 timeo
 	ESTABLISH_GTMIO_CH(&iod->pair, ch_set);
 	ENSURE_PASS_SOCKET(socketptr);
 	out_of_time = FALSE;
-
 #	if PID_CHECKING_SUPPORTED
 	if (-1 != pid)
 	{
@@ -415,11 +396,9 @@ void iosocket_accept_local(io_desc *iod, mval *handlesvar, pid_t pid, int4 timeo
 		}
 	}
 #	endif
-
 	/* accept fds */
 	if (NULL == socket_pool)
 		iosocket_poolinit();
-
 	for (argn = 0; argn < argcnt; argn++)
 	{
 		handle = va_arg(args, mval *);
@@ -431,16 +410,12 @@ void iosocket_accept_local(io_desc *iod, mval *handlesvar, pid_t pid, int4 timeo
 		else
 			handles[argn] = handle->str;
 	}
-
 	memcpy(iod->dollar.device, "0", SIZEOF("0"));
-
-	if (NO_M_TIMEOUT != timeout)
+	if (NO_M_TIMEOUT != msec_timeout)
 	{
 		timer_id = (TID)iosocket_accept_local;
-		msec_timeout = timeout2msec(timeout);
 		start_timer(timer_id, msec_timeout, wake_alarm, 0, NULL);
 	}
-
 	msg.msg_name = NULL;
 	msg.msg_namelen = 0;
 	/* read fd count first */
@@ -450,13 +425,11 @@ void iosocket_accept_local(io_desc *iod, mval *handlesvar, pid_t pid, int4 timeo
 	msg.msg_iovlen = 1;
 	msg.msg_control = (struct cmsghdr *)cmsg_buffer;
 	msg.msg_controllen = CMSG_SPACE(MAX_PASS_FDS * SIZEOF(int));
-
 	do
 	{
 		rval = recvmsg(socketptr->sd, &msg, 0);
 	}
 	while (!outofband && !out_of_time && (-1 == rval) && (EINTR == errno));
-
 	if (0 == rval)
 	{
 		rval = -1;
@@ -466,13 +439,12 @@ void iosocket_accept_local(io_desc *iod, mval *handlesvar, pid_t pid, int4 timeo
 		goto ioerr;
 	if (SIZEOF(mdata) != rval)
 	{
-		if ((NO_M_TIMEOUT != timeout) && !out_of_time)
+		if ((NO_M_TIMEOUT != msec_timeout) && !out_of_time)
 			cancel_timer(timer_id);
 		rts_error_csa(CSA_ARG(NULL) VARLSTCNT(2) ERR_SOCKNOTPASSED, 0);
 		return;
 	}
 	assert(rval == iov.iov_len);
-
 	if ((MSG_MAGIC != mdata.magic) || (MSG_PROTO_VERSION != mdata.proto_version))
 	{
 		iod->dollar.za = 9;
@@ -483,34 +455,29 @@ void iosocket_accept_local(io_desc *iod, mval *handlesvar, pid_t pid, int4 timeo
 		if (socketptr->ioerror)
 			rts_error_csa(CSA_ARG(NULL) VARLSTCNT(6) ERR_SOCKACCEPT, 0, ERR_TEXT, 2, errlen, errptr);
 	}
-
 	cmsg = CMSG_FIRSTHDR(&msg);
 	while((cmsg != NULL) && ((SOL_SOCKET != cmsg->cmsg_level) || (SCM_RIGHTS != cmsg->cmsg_type)))
 		cmsg = CMSG_NXTHDR(&msg, cmsg);
-
 	if (NULL == cmsg)
 	{
-		if ((NO_M_TIMEOUT != timeout) && !out_of_time)
+		if ((NO_M_TIMEOUT != msec_timeout) && !out_of_time)
 			cancel_timer(timer_id);
 		rts_error_csa(CSA_ARG(NULL) VARLSTCNT(2) ERR_SOCKNOTPASSED, 0);
 		return;
 	}
-
 	fdcount = mdata.fdcount;
 	fds = (int *)CMSG_DATA(cmsg);
 	assert(((cmsg->cmsg_len - ((char *)CMSG_DATA(cmsg) - (char *)cmsg)) / SIZEOF(int)) == fdcount);
-
 	if (0 == fdcount)
 	{
-		if ((NO_M_TIMEOUT != timeout) && !out_of_time)
+		if ((NO_M_TIMEOUT != msec_timeout) && !out_of_time)
 			cancel_timer(timer_id);
 		rts_error_csa(CSA_ARG(NULL) VARLSTCNT(2) ERR_SOCKNOTPASSED, 0);
 		return;
 	}
-
 	if (gtm_max_sockets <= (socket_pool->n_socket + fdcount))
 	{
-		if ((NO_M_TIMEOUT != timeout) && !out_of_time)
+		if ((NO_M_TIMEOUT != msec_timeout) && !out_of_time)
 			cancel_timer(timer_id);
 		for (fdn = 0; fdn < fdcount; fdn++)
 		{
@@ -519,7 +486,6 @@ void iosocket_accept_local(io_desc *iod, mval *handlesvar, pid_t pid, int4 timeo
 		rts_error_csa(CSA_ARG(NULL) VARLSTCNT(3) ERR_SOCKMAX, 1, gtm_max_sockets);
 		return;
 	}
-
 	for (fdn=0; fdn < fdcount; fdn++)
 	{
 		/* read handle length */
@@ -527,16 +493,13 @@ void iosocket_accept_local(io_desc *iod, mval *handlesvar, pid_t pid, int4 timeo
 		if (-1 == rval)
 			goto ioerr;
 		assertpro(SIZEOF(handlestr.len) == rval);
-
 		/* read handle */
 		ENSURE_STP_FREE_SPACE(MAX_HANDLE_LEN);
 		handlestr.addr = (char *)stringpool.free;
-
 		RECVALL(socketptr->sd, handlestr.addr, handlestr.len, rval);
 		if (-1 == rval)
 			goto ioerr;
 		assertpro(handlestr.len == rval);
-
 		if ((fdn >= argcnt) || (NULL == handles[fdn].addr))
 		{
 			/* If the passed handle name already exists in the socket pool, create a new one */
@@ -547,13 +510,11 @@ void iosocket_accept_local(io_desc *iod, mval *handlesvar, pid_t pid, int4 timeo
 		}
 		else
 			handlestr = handles[fdn];	/* Use the handle from the argument list */
-
 		/* read socket buffer length */
 		RECVALL(socketptr->sd, &tmpbuflen, SIZEOF(tmpbuflen), rval);
 		if (-1 == rval)
 			goto ioerr;
 		assertpro(SIZEOF(tmpbuflen) == rval);
-
 		psocketptr = iosocket_create(NULL,
 					((tmpbuflen > DEFAULT_SOCKET_BUFFER_SIZE) ? tmpbuflen : DEFAULT_SOCKET_BUFFER_SIZE),
 					fds[fdn], FALSE);
@@ -564,7 +525,6 @@ void iosocket_accept_local(io_desc *iod, mval *handlesvar, pid_t pid, int4 timeo
 		socket_pool->socket[socket_pool->n_socket++] = psocketptr;
 		socket_pool->current_socket = socket_pool->n_socket - 1;
 		scnt++;
-
 		if (0 < tmpbuflen)
 		{
 			/* read socket buffer */
@@ -575,7 +535,6 @@ void iosocket_accept_local(io_desc *iod, mval *handlesvar, pid_t pid, int4 timeo
 			assertpro(psocketptr->buffered_length == rval);
 		}
 		psocketptr->buffered_offset = 0;
-
 		handleslen += handlestr.len;
 	}
 	RECVALL(socketptr->sd, complete_buf, STR_LIT_LEN(PASS_COMPLETE), rval);
@@ -584,7 +543,7 @@ void iosocket_accept_local(io_desc *iod, mval *handlesvar, pid_t pid, int4 timeo
 	assert(rval == STR_LIT_LEN(PASS_COMPLETE));
 	if (0 != STRNCMP_LIT(complete_buf, PASS_COMPLETE))
 	{
-		if ((NO_M_TIMEOUT != timeout) && !out_of_time)
+		if ((NO_M_TIMEOUT != msec_timeout) && !out_of_time)
 			cancel_timer(timer_id);
 		for (fdn = scnt - 1; fdn >= 0; fdn--)
 		{
@@ -609,10 +568,8 @@ void iosocket_accept_local(io_desc *iod, mval *handlesvar, pid_t pid, int4 timeo
 	if (-1 == rval)
 		goto ioerr;
 	assert(rval == STR_LIT_LEN(ACCEPT_COMPLETE));
-
-	if ((NO_M_TIMEOUT != timeout) && !out_of_time)
+	if ((NO_M_TIMEOUT != msec_timeout) && !out_of_time)
 		cancel_timer(timer_id);
-
 	if (NULL != handlesvar)
 	{
 		handleslen += (fdcount > 1) ? (fdcount - 1) : 0;		/* space for delimiters */
@@ -622,10 +579,8 @@ void iosocket_accept_local(io_desc *iod, mval *handlesvar, pid_t pid, int4 timeo
 		handlesvar->mvtype = MV_STR;
 		handlesvar->str.addr = hptr;
 		handlesvar->str.len = handleslen;
-
 		memcpy(hptr, handles[0].addr, handles[0].len);
 		hptr += handles[0].len;
-
 		for (fdn=1; fdn < fdcount; fdn++)
 		{
 			*hptr++ = '|';
@@ -633,8 +588,7 @@ void iosocket_accept_local(io_desc *iod, mval *handlesvar, pid_t pid, int4 timeo
 			hptr += handles[fdn].len;
 		}
 	}
-
-	if (NO_M_TIMEOUT != timeout)
+	if (NO_M_TIMEOUT != msec_timeout)
 		dollar_truth = TRUE;
 	return;
 
@@ -644,7 +598,7 @@ ioerr:
 	{
 		dollar_truth = FALSE;
 	}
-	if ((NO_M_TIMEOUT != timeout) && !out_of_time)
+	if ((NO_M_TIMEOUT != msec_timeout) && !out_of_time)
 		cancel_timer(timer_id);
 	for (fdn = scnt - 1; fdn >= 0; fdn--)
 	{
diff --git a/sr_unix/iosocket_tls.c b/sr_unix/iosocket_tls.c
index a3bfaa1..ecfa8de 100644
--- a/sr_unix/iosocket_tls.c
+++ b/sr_unix/iosocket_tls.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	*
@@ -15,7 +15,7 @@
 
 #include <errno.h>
 #ifdef USE_POLL
-#include <poll.h>
+#include "gtm_poll.h"
 #else
 #include "gtm_select.h"
 #endif
@@ -71,17 +71,17 @@ typedef enum
 	tlsopt_renegotiate
 } tls_option;
 
-void	iosocket_tls(mval *optionmval, int4 timeoutarg, mval *tlsid, mval *password, mval *extraarg)
+void	iosocket_tls(mval *optionmval, int4 msec_timeout, mval *tlsid, mval *password, mval *extraarg)
 {
-	int4			length, flags, timeout, msec_timeout, status, status2, len, devlen, tls_errno, save_errno;
+	int4			devlen, flags, len, length, save_errno, status, status2, timeout, tls_errno;
 	int4			errlen, errlen2;
 	io_desc			*iod;
 	d_socket_struct 	*dsocketptr;
 	socket_struct		*socketptr;
-	char			optionstr[MAX_TLSOPTION], idstr[MAX_TLSID_LEN + SIZEOF(RENEGOTIATE) + 1];
+	char			idstr[MAX_TLSID_LEN + SIZEOF(RENEGOTIATE) + 1], optionstr[MAX_TLSOPTION];
 	char			passwordstr[GTM_PASSPHRASE_MAX_ASCII + 1];
 	const char		*errp, *errp2;
-	char			*extrastr, *extraptr, *charptr;
+	char			*charptr, *extraptr, *extrastr;
 	tls_option		option;
 	gtm_tls_socket_t	*tlssocket;
 	ABS_TIME		cur_time, end_time;
@@ -89,7 +89,7 @@ void	iosocket_tls(mval *optionmval, int4 timeoutarg, mval *tlsid, mval *password
 	struct pollfd		fds;
 #	else
 	fd_set			fds, *readfds, *writefds;
-	struct timeval		timeout_spec, *timeout_ptr;
+	struct timeval		*timeout_ptr, timeout_spec;
 #	endif
 	boolean_t		ch_set;
 
@@ -164,13 +164,11 @@ void	iosocket_tls(mval *optionmval, int4 timeoutarg, mval *tlsid, mval *password
 	else
 		option = tlsopt_invalid;
 	memcpy(iod->dollar.device, "0", SIZEOF("0"));
-	if (NO_M_TIMEOUT != timeoutarg)
+	if (NO_M_TIMEOUT != msec_timeout)
 	{
-		msec_timeout = timeout2msec(timeoutarg);
 		sys_get_curr_time(&cur_time);
 		add_int_to_abs_time(&cur_time, msec_timeout, &end_time);
-	} else
-		msec_timeout = -1;
+	}
 	if ((tlsopt_client == option) || (tlsopt_server == option))
 	{	/* most of the setup is common */
 		if (socketptr->tlsenabled)
@@ -199,7 +197,7 @@ void	iosocket_tls(mval *optionmval, int4 timeoutarg, mval *tlsid, mval *password
 					iod->dollar.device[SIZEOF(iod->dollar.device) - 1] = '\0';
 				if (socketptr->ioerror)
 					rts_error_csa(CSA_ARG(NULL) VARLSTCNT(6) ERR_TLSINIT, 0, ERR_TEXT, 2, errlen, errp);
-				if (NO_M_TIMEOUT != timeoutarg)
+				if (NO_M_TIMEOUT != msec_timeout)
 					dollar_truth = FALSE;
 				REVERT_GTMIO_CH(&iod->pair, ch_set);
 				return;
@@ -283,14 +281,14 @@ void	iosocket_tls(mval *optionmval, int4 timeoutarg, mval *tlsid, mval *password
 				iod->dollar.device[SIZEOF(iod->dollar.device) - 1] = '\0';
 			if (socketptr->ioerror)
 				rts_error_csa(CSA_ARG(NULL) VARLSTCNT(6) ERR_TLSCONVSOCK, 0, ERR_TEXT, 2, errlen, errp);
-			if (NO_M_TIMEOUT != timeoutarg)
+			if (NO_M_TIMEOUT != msec_timeout)
 				dollar_truth = FALSE;
 			REVERT_GTMIO_CH(&iod->pair, ch_set);
 			return;
 		}
 		status = 0;
 #		ifndef	USE_POLL
-		if (NO_M_TIMEOUT == timeoutarg)
+		if (NO_M_TIMEOUT == msec_timeout)
 			timeout_ptr = NULL;
 		else
 		{
@@ -316,7 +314,7 @@ void	iosocket_tls(mval *optionmval, int4 timeoutarg, mval *tlsid, mval *password
 				writefds = (GTMTLS_WANT_WRITE == status) ? &fds : NULL;
 				readfds = (GTMTLS_WANT_READ == status) ? &fds : NULL;
 #				endif
-				POLL_ONLY(if (-1 == (status2 = poll(&fds, 1, msec_timeout))))
+				POLL_ONLY(if (-1 == (status2 = poll(&fds, 1, (NO_M_TIMEOUT == msec_timeout) ? -1 : msec_timeout))))
 				SELECT_ONLY(if (-1 == (status2 = select(socketptr->sd + 1, readfds, writefds, NULL, timeout_ptr))))
 				{
 					save_errno = errno;
@@ -358,14 +356,14 @@ void	iosocket_tls(mval *optionmval, int4 timeoutarg, mval *tlsid, mval *password
 				if (socketptr->ioerror)
 					rts_error_csa(CSA_ARG(NULL) VARLSTCNT(6) ERR_TLSHANDSHAKE, 0,
 						ERR_TEXT, 2, errlen, errp);
-				if (NO_M_TIMEOUT != timeoutarg)
+				if (NO_M_TIMEOUT != msec_timeout)
 					dollar_truth = FALSE;
 				REVERT_GTMIO_CH(&iod->pair, ch_set);
 				return;
 			}
 			if ((0 != status) && (0 <= status2))	/* not accepted/connected and not error */
 			{	/* check for timeout if not error or want read or write */
-				if ((0 != timeoutarg) && (NO_M_TIMEOUT != timeoutarg))
+				if ((0 != msec_timeout) && (NO_M_TIMEOUT != msec_timeout))
 				{
 					sys_get_curr_time(&cur_time);
 					cur_time = sub_abs_time(&end_time, &cur_time);
@@ -386,7 +384,7 @@ void	iosocket_tls(mval *optionmval, int4 timeoutarg, mval *tlsid, mval *password
 						timeout_spec.tv_usec = (gtm_tv_usec_t)cur_time.at_usec;
 #					endif
 					}
-				} else if (0 == timeoutarg)
+				} else if (0 == msec_timeout)
 				{	/* only one chance */
 					gtm_tls_session_close((gtm_tls_socket_t **)&socketptr->tlssocket);
 					socketptr->tlsenabled = FALSE;
@@ -432,7 +430,7 @@ void	iosocket_tls(mval *optionmval, int4 timeoutarg, mval *tlsid, mval *password
 			if (socketptr->ioerror)
 				rts_error_csa(CSA_ARG(NULL) VARLSTCNT(6) ERR_TLSRENEGOTIATE, 0,
 					ERR_TEXT, 2, errlen, errp);
-			if (NO_M_TIMEOUT != timeoutarg)
+			if (NO_M_TIMEOUT != msec_timeout)
 				dollar_truth = FALSE;
 			REVERT_GTMIO_CH(&iod->pair, ch_set);
 			return;
@@ -461,7 +459,7 @@ void	iosocket_tls(mval *optionmval, int4 timeoutarg, mval *tlsid, mval *password
 				if (socketptr->ioerror)
 					rts_error_csa(CSA_ARG(NULL) VARLSTCNT(10) ERR_TLSRENEGOTIATE, 0,
 						ERR_TEXT, 2, errlen, errp, ERR_TEXT, 2, errlen2, errp2);
-				if (NO_M_TIMEOUT != timeoutarg)
+				if (NO_M_TIMEOUT != msec_timeout)
 					dollar_truth = FALSE;
 				REVERT_GTMIO_CH(&iod->pair, ch_set);
 				return;
@@ -517,7 +515,7 @@ void	iosocket_tls(mval *optionmval, int4 timeoutarg, mval *tlsid, mval *password
 			if (socketptr->ioerror)
 				rts_error_csa(CSA_ARG(NULL) VARLSTCNT(6) ERR_TLSRENEGOTIATE, 0,
 					ERR_TEXT, 2, errlen, errp);
-			if (NO_M_TIMEOUT != timeoutarg)
+			if (NO_M_TIMEOUT != msec_timeout)
 				dollar_truth = FALSE;
 			REVERT_GTMIO_CH(&iod->pair, ch_set);
 			return;
@@ -525,7 +523,7 @@ void	iosocket_tls(mval *optionmval, int4 timeoutarg, mval *tlsid, mval *password
 	} else
 		rts_error_csa(CSA_ARG(NULL) VARLSTCNT(6) ERR_TLSPARAM, 4, LEN_AND_STR(optionstr),
 			LEN_AND_LIT("not a valid option"));
-	if (NO_M_TIMEOUT != timeoutarg)
+	if (NO_M_TIMEOUT != msec_timeout)
 		dollar_truth = TRUE;
 	REVERT_GTMIO_CH(&iod->pair, ch_set);
 	return;
diff --git a/sr_unix/iott_rdone.c b/sr_unix/iott_rdone.c
index 96a4e8c..5f7b26c 100755
--- a/sr_unix/iott_rdone.c
+++ b/sr_unix/iott_rdone.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,7 +15,7 @@
 #include <errno.h>
 #include <wctype.h>
 #include <wchar.h>
-#include <signal.h>
+#include <gtm_signal.h>
 #include "gtm_string.h"
 #include "gtm_select.h"
 
@@ -58,7 +58,7 @@ error_def(ERR_ZINTRECURSEIO);
 error_def(ERR_STACKOFLOW);
 error_def(ERR_STACKCRIT);
 
-int	iott_rdone (mint *v, int4 timeout)	/* timeout in seconds */
+int	iott_rdone (mint *v, int4 msec_timeout)	/* timeout in milliseconds */
 {
 	boolean_t	ret = FALSE, timed, utf8_active, zint_restart, first_time;
 	unsigned char	inbyte;
@@ -73,7 +73,6 @@ int	iott_rdone (mint *v, int4 timeout)	/* timeout in seconds */
 	tt_interrupt	*tt_state;
 	TID		timer_id;
 	int		rdlen, selstat, status, utf8_more, inchar_width;
-	int4		msec_timeout;		/* timeout in milliseconds */
 	uint4		mask;
 	int		msk_in, msk_num;
 	unsigned char	*zb_ptr, *zb_top;
@@ -156,28 +155,27 @@ int	iott_rdone (mint *v, int4 timeout)	/* timeout in seconds */
 		}
 	}
 	out_of_time = FALSE;
-	if (timeout == NO_M_TIMEOUT)
+	if (NO_M_TIMEOUT == msec_timeout)
 	{
 		timed = FALSE;
 		input_timeval.tv_sec  = 100;
-		msec_timeout = NO_M_TIMEOUT;
+		input_timeval.tv_usec = 0;
 	} else
 	{
 		timed = TRUE;
-		input_timeval.tv_sec  = timeout;
-		msec_timeout = timeout2msec(timeout);
+		input_timeval.tv_sec = msec_timeout / MILLISECS_IN_SEC;
+		input_timeval.tv_usec = (msec_timeout % MILLISECS_IN_SEC) * MICROSECS_IN_MSEC;
 		if (0 == msec_timeout)
 		{
 			if (!zint_restart)
 				iott_mterm(io_ptr);
 		} else
 		{
-   			sys_get_curr_time(&cur_time);
+			sys_get_curr_time(&cur_time);
 			if (!zint_restart)
 				add_int_to_abs_time(&cur_time, msec_timeout, &end_time);
 		}
 	}
-	input_timeval.tv_usec = 0;
 	first_time = TRUE;
 	do
 	{
@@ -197,7 +195,7 @@ int	iott_rdone (mint *v, int4 timeout)	/* timeout in seconds */
 				}
 				tt_state->zb_ptr = zb_ptr;
 				tt_state->zb_top = zb_top;
-                                PUSH_MV_STENT(MVST_ZINTDEV);	/* used as a flag only */
+				PUSH_MV_STENT(MVST_ZINTDEV);	/* used as a flag only */
 				mv_chain->mv_st_cont.mvs_zintdev.buffer_valid = FALSE;
 				mv_chain->mv_st_cont.mvs_zintdev.io_ptr = io_ptr;
 				tt_ptr->mupintr = TRUE;
@@ -265,15 +263,13 @@ int	iott_rdone (mint *v, int4 timeout)	/* timeout in seconds */
 		} else if ((rdlen = (int)(read(tt_ptr->fildes, &inbyte, 1))) == 1)	/* This read is protected */
 		{
 			assert(FD_ISSET(tt_ptr->fildes, &input_fd) != 0);
-
 			/* --------------------------------------------------
 			 * set prin_in_dev_failure to FALSE to indicate that
 			 * input device is working now.
 			 * --------------------------------------------------
 			 */
 			prin_in_dev_failure = FALSE;
-
-#ifdef UNICODE_SUPPORTED
+#			ifdef UNICODE_SUPPORTED
 			if (utf8_active)
 			{
 				if (tt_ptr->discard_lf)
@@ -334,15 +330,14 @@ int	iott_rdone (mint *v, int4 timeout)	/* timeout in seconds */
 				GTM_IO_WCWIDTH(inchar, inchar_width);
 			} else
 			{
-#endif
+#			endif
 				if (mask & TRM_CONVERT)
 					NATIVE_CVT2UPPER(inbyte, inbyte);
 				inchar = inbyte;
 				inchar_width = 1;
-#ifdef UNICODE_SUPPORTED
+#			ifdef UNICODE_SUPPORTED
 			}
-#endif
-
+#			endif
 			GETASCII(asc_inchar, inchar);
 			if (INPUT_CHAR < ' '  &&  ((1 << INPUT_CHAR) & tt_ptr->enbld_outofbands.mask))
 			{
@@ -369,7 +364,6 @@ int	iott_rdone (mint *v, int4 timeout)	/* timeout in seconds */
 						 * $zb overflow
 						 * -------------
 						 */
-
 						io_ptr->dollar.za = 2;
 						break;
 					}
@@ -388,7 +382,6 @@ int	iott_rdone (mint *v, int4 timeout)	/* timeout in seconds */
 						 * Escape sequence failed parse.
 						 * ------------------------------
 						 */
-
 						io_ptr->dollar.za = 2;
 						break;
 					}
@@ -396,22 +389,16 @@ int	iott_rdone (mint *v, int4 timeout)	/* timeout in seconds */
 					inchar = inbyte;
 					GETASCII(asc_inchar, inchar);
 				} while (1 == rdlen);
-
 				*zb_ptr++ = 0;
-
 				if (rdlen != 1  &&  io_ptr->dollar.za == 0)
 					io_ptr->dollar.za = 9;
-
 				/* -------------------------------------------------
 				 * End of escape sequence...do not process further.
 				 * -------------------------------------------------
 				 */
-
 				break;
-			}
-			else
-			{
-/* may need to deal with terminators > ASCII_MAX and/or LS and PS if default_mask_term */
+			} else
+			{	/* may need to deal with terminators > ASCII_MAX and/or LS and PS if default_mask_term */
 				ret = TRUE;
 				if (!utf8_active || ASCII_MAX >= INPUT_CHAR)
 				{
@@ -481,13 +468,11 @@ int	iott_rdone (mint *v, int4 timeout)	/* timeout in seconds */
 			break;
 		}
 	} while (!out_of_time);
-
 	if (timed)
 	{
-   		if (0 == msec_timeout)
-	    		iott_rterm(io_ptr);
+		if (0 == msec_timeout)
+			iott_rterm(io_ptr);
 	}
-
 	if (mask & TRM_READSYNC)
 	{
 		DOWRITERC(tt_ptr->fildes, &dc3, 1, status);
@@ -496,8 +481,7 @@ int	iott_rdone (mint *v, int4 timeout)	/* timeout in seconds */
 			io_ptr->dollar.za = 9;
 			rts_error_csa(CSA_ARG(NULL) VARLSTCNT(1) status);
 		}
-        }
-
+	}
 	if (outofband && jobinterrupt != outofband)
 	{
 		io_ptr->dollar.za = 9;
@@ -505,7 +489,6 @@ int	iott_rdone (mint *v, int4 timeout)	/* timeout in seconds */
 		return FALSE;
 	}
 	io_ptr->dollar.za = 0;
-
 	if (ret  &&  io_ptr->esc_state != FINI)
 	{
 		*v = INPUT_CHAR;
@@ -517,13 +500,13 @@ int	iott_rdone (mint *v, int4 timeout)	/* timeout in seconds */
 				tt_ptr->recall_buff.addr[0] = INPUT_CHAR;
 				tt_ptr->recall_buff.len = 1;
 			}
-#ifdef UNICODE_SUPPORTED
+#			ifdef UNICODE_SUPPORTED
 			else
 			{
 				memcpy(tt_ptr->recall_buff.addr, &INPUT_CHAR, SIZEOF(INPUT_CHAR));
 				tt_ptr->recall_buff.len = SIZEOF(INPUT_CHAR);
 			}
-#endif
+#			endif
 			tt_ptr->recall_width = inchar_width;
 		}
 		/* SIMPLIFY THIS! */
@@ -549,12 +532,11 @@ int	iott_rdone (mint *v, int4 timeout)	/* timeout in seconds */
 					io_ptr->dollar.y %= io_ptr->length;
 				io_ptr->dollar.x %= io_ptr->width;
 				if (io_ptr->dollar.x == 0)
-                                        DOWRITE(tt_ptr->fildes, NATIVE_TTEOL, STRLEN(NATIVE_TTEOL));
+					DOWRITE(tt_ptr->fildes, NATIVE_TTEOL, STRLEN(NATIVE_TTEOL));
 			}
 		}
 	}
 	memcpy(io_ptr->dollar.key, io_ptr->dollar.zb, (zb_ptr - io_ptr->dollar.zb));
-
 	REVERT_GTMIO_CH(&io_curr_device, ch_set);
 	return ret;
 }
diff --git a/sr_unix/iott_read.c b/sr_unix/iott_read.c
index 9021c11..ad5bedd 100755
--- a/sr_unix/iott_read.c
+++ b/sr_unix/iott_read.c
@@ -1,6 +1,7 @@
 /****************************************************************
  *								*
- *	Copyright 2001, 2006 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	*
@@ -16,11 +17,11 @@
 
 GBLREF	io_pair		io_curr_device;
 
-int	iott_read (mval *v, int4 timeout)   /* timeout in seconds */
+int	iott_read (mval *v, int4 msec_timeout)   /* timeout in milliseconds */
 
 {
 	d_tt_struct	*tt_ptr;
 
 	tt_ptr = (d_tt_struct*) (io_curr_device.in->dev_sp);
-	return iott_readfl(v, tt_ptr->in_buf_sz, timeout);
+	return iott_readfl(v, tt_ptr->in_buf_sz, msec_timeout);
 }
diff --git a/sr_unix/iott_readfl.c b/sr_unix/iott_readfl.c
index 9d208a8..48c2e26 100755
--- a/sr_unix/iott_readfl.c
+++ b/sr_unix/iott_readfl.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	*
@@ -93,13 +93,13 @@ error_def(ERR_STACKCRIT);
 void iott_readfl_badchar(mval *vmvalptr, wint_t *dataptr32, int datalen,
 			 int delimlen, unsigned char *delimptr, unsigned char *strend, unsigned char *buffer_start)
 {
-        int             i, tmplen, len;
-        unsigned char   *delimend, *outptr, *outtop;
+	int		 i, len, tmplen;
+	unsigned char   *delimend, *outptr, *outtop;
 	wint_t		*curptr32;
-        io_desc         *iod;
+	io_desc		*iod;
 
-        if (0 < datalen && NULL != dataptr32)
-        {       /* Return how much input we got */
+	if (0 < datalen && NULL != dataptr32)
+	{       /* Return how much input we got */
 		if (gtm_utf8_mode)
 		{
 			outptr = buffer_start;
@@ -113,30 +113,30 @@ void iott_readfl_badchar(mval *vmvalptr, wint_t *dataptr32, int datalen,
 		vmvalptr->str.addr = (char *)buffer_start;
 		if (IS_AT_END_OF_STRINGPOOL(buffer_start, 0))
 			stringpool.free += vmvalptr->str.len;	/* The BADCHAR error after this won't do this for us */
-        }
-        if (NULL != strend && NULL != delimptr)
-        {       /* First find the end of the delimiter (max of 4 bytes) */
-                if (0 == delimlen)
+	}
+	if (NULL != strend && NULL != delimptr)
+	{       /* First find the end of the delimiter (max of 4 bytes) */
+		if (0 == delimlen)
 		{
 			for (delimend = delimptr; 4 >= delimlen && delimend < strend; ++delimend, ++delimlen)
 			{
 				if (UTF8_VALID(delimend, strend, tmplen))
 					break;
 			}
-                }
-                if (0 < delimlen)
-                {       /* Set $ZB with the failing badchar */
-                        iod = io_curr_device.in;
-                        memcpy(iod->dollar.zb, delimptr, MIN(delimlen, ESC_LEN - 1));
-                        iod->dollar.zb[MIN(delimlen, ESC_LEN - 1)] = '\0';
-                        memcpy(iod->dollar.key, delimptr, MIN(delimlen, DD_BUFLEN - 1));
-                        iod->dollar.key[MIN(delimlen, DD_BUFLEN - 1)] = '\0';
-                }
-        }
+		}
+		if (0 < delimlen)
+		{       /* Set $ZB with the failing badchar */
+			iod = io_curr_device.in;
+			memcpy(iod->dollar.zb, delimptr, MIN(delimlen, ESC_LEN - 1));
+			iod->dollar.zb[MIN(delimlen, ESC_LEN - 1)] = '\0';
+			memcpy(iod->dollar.key, delimptr, MIN(delimlen, DD_BUFLEN - 1));
+			iod->dollar.key[MIN(delimlen, DD_BUFLEN - 1)] = '\0';
+		}
+	}
 }
 #endif
 
-int	iott_readfl(mval *v, int4 length, int4 timeout)	/* timeout in seconds */
+int	iott_readfl(mval *v, int4 length, int4 msec_timeout)	/* timeout in milliseconds */
 {
 	boolean_t	ret, nonzerotimeout, timed, insert_mode, edit_mode, utf8_active, zint_restart, buffer_moved;
 	uint4		mask;
@@ -161,7 +161,6 @@ int	iott_readfl(mval *v, int4 length, int4 timeout)	/* timeout in seconds */
 	int		keypad_len, backspace, delete;
 	int		up, down, right, left, insert_key;
 	boolean_t	escape_edit, empterm;
-	int4		msec_timeout;		/* timeout in milliseconds */
 	io_desc		*io_ptr;
 	d_tt_struct	*tt_ptr;
 	io_terminator	outofbands;
@@ -317,16 +316,16 @@ int	iott_readfl(mval *v, int4 length, int4 timeout)	/* timeout in seconds */
 	if (!zint_restart)
 		dx = dx_start;
 	nonzerotimeout = FALSE;
-	if (NO_M_TIMEOUT == timeout)
+	if (NO_M_TIMEOUT == msec_timeout)
 	{
 		timed = FALSE;
 		input_timeval.tv_sec = 100;
-		msec_timeout = NO_M_TIMEOUT;
+		input_timeval.tv_usec = 0;
 	} else
 	{
 		timed = TRUE;
-		input_timeval.tv_sec = timeout;
-		msec_timeout = timeout2msec(timeout);
+		input_timeval.tv_sec = msec_timeout / MILLISECS_IN_SEC;
+		input_timeval.tv_usec = (msec_timeout % MILLISECS_IN_SEC) * MICROSECS_IN_MSEC;
 		if (!msec_timeout)
 		{
 			if (!zint_restart)
@@ -339,7 +338,6 @@ int	iott_readfl(mval *v, int4 length, int4 timeout)	/* timeout in seconds */
 				add_int_to_abs_time(&cur_time, msec_timeout, &end_time);
 		}
 	}
-	input_timeval.tv_usec = 0;
 	do
 	{
 		if (outofband)
@@ -520,7 +518,7 @@ int	iott_readfl(mval *v, int4 length, int4 timeout)	/* timeout in seconds */
 #ifdef UNICODE_SUPPORTED
 			}
 #endif
-                        GETASCII(asc_inchar,inchar);
+			GETASCII(asc_inchar,inchar);
 			if (!edit_mode && (dx >= ioptr_width) && io_ptr->wrap && !(mask & TRM_NOECHO))
 			{
 				DOWRITE(tt_ptr->fildes, NATIVE_TTEOL, STRLEN(NATIVE_TTEOL));
@@ -926,10 +924,10 @@ int	iott_readfl(mval *v, int4 length, int4 timeout)	/* timeout in seconds */
 						prin_in_dev_failure = TRUE;
 					else
 					{
-                                        	send_msg_csa(CSA_ARG(NULL) VARLSTCNT(1) ERR_NOPRINCIO);
-                                        	stop_image_no_core();
+						send_msg_csa(CSA_ARG(NULL) VARLSTCNT(1) ERR_NOPRINCIO);
+						stop_image_no_core();
 					}
-                                }
+				}
 				if (io_ptr->dollar.zeof)
 				{
 					io_ptr->dollar.za = 9;
diff --git a/sr_unix/iott_use.c b/sr_unix/iott_use.c
index de40d26..0be6a6c 100755
--- a/sr_unix/iott_use.c
+++ b/sr_unix/iott_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	*
@@ -39,6 +39,7 @@
 #include "gtm_tputs.h"
 #include "gtm_tparm.h"
 #include "outofband.h"
+#include "restrict.h"
 
 LITDEF nametabent filter_names[] =
 {
@@ -138,7 +139,7 @@ void iott_use(io_desc *iod, mval *pp)
 					tt_ptr->ext_cap &= ~TT_EMPTERM;
 					break;
 				case iop_cenable:
-					if (!ctrlc_on)
+					if (!ctrlc_on && !RESTRICTED(cenable))
 					{	/* if it's already cenable, no need to change */
 						temp_ptr = (d_tt_struct *)io_std_device.in->dev_sp;
 						if (tt_ptr->fildes == temp_ptr->fildes)
@@ -152,7 +153,7 @@ void iott_use(io_desc *iod, mval *pp)
 					}
 					break;
 				case iop_nocenable:
-					if (ctrlc_on)
+					if (ctrlc_on && !RESTRICTED(cenable))
 					{	/* if it's already nocenable, no need to change */
 						temp_ptr = (d_tt_struct *)io_std_device.in->dev_sp;
 						if (tt_ptr->fildes == temp_ptr->fildes)
diff --git a/sr_unix/iottdef.h b/sr_unix/iottdef.h
index 171f5f2..5c7e68e 100755
--- a/sr_unix/iottdef.h
+++ b/sr_unix/iottdef.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	*
@@ -15,6 +15,7 @@
 
 #include "gtm_termios.h"
 #include "gtm_stdio.h"
+#include "compiler.h"
 
 #define TERM_MSK	0x08002400	/* CR LF ESC */
 #define TERM_MSK_UTF8_0	0x08003400	/* add FF */
@@ -24,7 +25,7 @@
 
 #define NUM_BITS_IN_INT4	(SIZEOF(int4) * 8)
 
-#define TTDEF_BUF_SZ 		1024
+#define TTDEF_BUF_SZ 		MAX_SRCLINE
 #define TTDEF_PG_WIDTH 		255
 
 #define IOTT_FLUSH_WAIT		300
diff --git a/sr_unix/is_fstype_nfs.c b/sr_unix/is_fstype_nfs.c
index 8303836..3b0007a 100644
--- a/sr_unix/is_fstype_nfs.c
+++ b/sr_unix/is_fstype_nfs.c
@@ -1,6 +1,6 @@
 /****************************************************************
  *								*
- * Copyright (c) 2016 Fidelity National Information		*
+ * Copyright (c) 2016-2017 Fidelity National Information	*
  * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
@@ -35,7 +35,7 @@ boolean_t is_fstype_nfs(int fd)
 	is_nfs = FALSE;
 	if (0 != fstatfs(fd, &buf))
 		return is_nfs;
-#	if defined(__linux__)
+#	if defined(__linux__) || defined(__CYGWIN__)
 	is_nfs = (NFS_SUPER_MAGIC == buf.f_type);
 #	elif defined(_AIX)
 	is_nfs = (MNT_NFS == buf.f_vfstype);
diff --git a/sr_unix/jnl_output_sp.c b/sr_unix/jnl_output_sp.c
index 6021996..ac8ce93 100644
--- a/sr_unix/jnl_output_sp.c
+++ b/sr_unix/jnl_output_sp.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	*
@@ -69,10 +69,11 @@ uint4 jnl_sub_qio_start(jnl_private_control *jpc, boolean_t aligned_write)
 	unsigned int		status;
 	int			save_errno;
 	uint4			aligned_dskaddr, dskaddr;
+	uint4			jnl_wrt_start_mask;
 	int4			aligned_dsk, dsk;
 	int			aligned_tsz;
 	sm_uc_ptr_t		aligned_base;
-	uint4			jnl_fs_block_size;
+	uint4			jnl_fs_block_size, new_dsk, new_dskaddr;
 	gd_region		*reg;
 
 	assert(NULL != jpc);
@@ -101,6 +102,7 @@ uint4 jnl_sub_qio_start(jnl_private_control *jpc, boolean_t aligned_write)
 #	endif
 	if (jb->dsk != (jb->dskaddr % jb->size))
 	{
+		assert(gtm_white_box_test_case_enabled && (WBTEST_JNL_FILE_LOST_DSKADDR == gtm_white_box_test_case_number));
 		RELEASE_SWAPLOCK(&jb->io_in_prog_latch);
 		jnl_qio_in_prog--;
 		assert(0 <= jnl_qio_in_prog);
@@ -141,7 +143,7 @@ uint4 jnl_sub_qio_start(jnl_private_control *jpc, boolean_t aligned_write)
 	}
 	free_ptr = jb->free;
         /* The following barrier is to make sure that for the value of "free" that we extract (which may be
-         * slightly stale but that is not a correctness issue) we make sure we dont write out a stale version of
+         * slightly stale but that is not a correctness issue) we make sure we don't write out a stale version of
          * the journal buffer contents. While it is possible that we see journal buffer contents that are more
          * uptodate than "free", this would only mean writing out a less than optimal number of bytes but again,
          * not a correctness issue. Secondary effect is that it also enforces a corresponding non-stale value of
@@ -152,6 +154,34 @@ uint4 jnl_sub_qio_start(jnl_private_control *jpc, boolean_t aligned_write)
 	dskaddr = jb->dskaddr;
 	was_wrapped = (free_ptr < dsk);
 	jnl_fs_block_size = jb->fs_block_size;
+	base = &jb->buff[dsk + jb->buff_off];
+	aligned_base = (sm_uc_ptr_t)ROUND_DOWN2((uintszofptr_t)base, jnl_fs_block_size);
+	assert(aligned_base >= &jb->buff[jb->buff_off]);
+	aligned_dskaddr = ROUND_DOWN2(dskaddr, jnl_fs_block_size);
+	if (jb->re_read_dskaddr)
+	{	/* Need to re-read the filesystem-block-size-aligned partial block before jb->dskaddr */
+		assert(jb->re_read_dskaddr == dskaddr);
+		tsz = dskaddr - aligned_dskaddr;
+		if (tsz)
+		{
+			/* Assert that both ends of the source buffer for the read falls within journal buffer limits */
+			assert(aligned_base >= &jb->buff[jb->buff_off]);
+			assert(aligned_base + tsz <= &jb->buff[jb->buff_off + jb->size]);
+			LSEEKREAD(jpc->channel, aligned_dskaddr, aligned_base, tsz, jpc->status);
+			if (SS_NORMAL != jpc->status)
+			{
+				RELEASE_SWAPLOCK(&jb->io_in_prog_latch);
+				jnl_qio_in_prog--;
+				assert(0 <= jnl_qio_in_prog);
+				jpc->status2 = SS_NORMAL;
+				jnl_send_oper(jpc, ERR_JNLRDERR);
+				rts_error_csa(CSA_ARG(csa) VARLSTCNT(5) ERR_JNLRDERR, 2, JNL_LEN_STR(csa->hdr), jpc->status);
+				assert(FALSE);	/* should not come here as the rts_error above should not return */
+				return ERR_JNLRDERR; /* ensure we do not fall through to code below as we no longer have the lock */
+			}
+		}
+		jb->re_read_dskaddr = 0;
+	}
 	if (aligned_write)
 		free_ptr = ROUND_DOWN2(free_ptr, jnl_fs_block_size);
 	assert(!(jb->size % jnl_fs_block_size));
@@ -162,14 +192,12 @@ uint4 jnl_sub_qio_start(jnl_private_control *jpc, boolean_t aligned_write)
 	assert(dskaddr + tsz <= jb->freeaddr);
 	status = SS_NORMAL;
 	if (tsz)
-	{	/* ensure that dsk and free are never equal and we have left space for JNL_WRT_START_MASK */
+	{	/* ensure that dsk and free are never equal and we have left space for filesystem-aligned offset BEFORE dsk */
 		assert(SS_NORMAL == status);
-		assert((free_ptr > dsk) || (free_ptr < (dsk & JNL_WRT_START_MASK(jb)))
-			|| (dsk != (dsk & JNL_WRT_START_MASK(jb))));
+		DEBUG_ONLY(jnl_wrt_start_mask = ~(jb->fs_block_size - 1);)
+		assert((free_ptr > dsk) || (free_ptr < (dsk & jnl_wrt_start_mask)) || (dsk != (dsk & jnl_wrt_start_mask)));
 		jb->wrtsize = tsz;
 		jb->qiocnt++;
-		base = &jb->buff[dsk + jb->buff_off];
-		assert((base + tsz) <= (jb->buff + jb->size + jnl_fs_block_size));
 		assert(NOJNL != jpc->channel);
 		/* If sync_io is turned on, we would have turned on the O_DIRECT flag on some platforms. That will
 		 * require us to do aligned writes. Both the source buffer and the size of the write need to be aligned
@@ -184,10 +212,8 @@ uint4 jnl_sub_qio_start(jnl_private_control *jpc, boolean_t aligned_write)
 		 * last valid record. This is considered okay as journal recovery has logic to scan past the garbage and
 		 * locate the last valid record in case of a crash before writing the EOF.
 		 */
-		aligned_dsk = ROUND_DOWN2(dsk, jnl_fs_block_size);
-		aligned_dskaddr = ROUND_DOWN2(dskaddr, jnl_fs_block_size);
+		DEBUG_ONLY(aligned_dsk = ROUND_DOWN2(dsk, jnl_fs_block_size));
 		aligned_tsz = ROUND_UP2((tsz + (dskaddr - aligned_dskaddr)), jnl_fs_block_size);
-		aligned_base = (sm_uc_ptr_t)ROUND_DOWN2((uintszofptr_t)base, jnl_fs_block_size);
 		/* Assert that aligned_dsk never backs up to a point BEFORE where the free pointer is */
 		assert((aligned_dsk > free_ptr) || (dsk <= free_ptr));
 		/* Assert that aligned_dskaddr never backs up to a point inside journal file header territory.
@@ -205,19 +231,20 @@ uint4 jnl_sub_qio_start(jnl_private_control *jpc, boolean_t aligned_write)
 		{	/* update jnl_buff pointers to reflect the successful write to the journal file */
 			assert(dsk <= jb->size);
 			assert(jb->io_in_prog_latch.u.parts.latch_pid == process_id);
-			jpc->new_dsk = dsk + tsz;
-			if (jpc->new_dsk >= jb->size)
+			new_dskaddr = dskaddr + tsz;
+			new_dsk = dsk + tsz;
+			if (new_dsk >= jb->size)
 			{
-				assert(jpc->new_dsk == jb->size);
-				jpc->new_dsk = 0;
+				assert(new_dsk == jb->size);
+				new_dsk = 0;
 			}
-			jpc->new_dskaddr = dskaddr + tsz;
-			assert(jpc->new_dsk == jpc->new_dskaddr % jb->size);
-			assert(jb->freeaddr >= jpc->new_dskaddr);
-			jpc->dsk_update_inprog = TRUE;	/* for secshr_db_clnup to clean it up (when it becomes feasible in Unix) */
-			jb->dsk = jpc->new_dsk;
-			jb->dskaddr = jpc->new_dskaddr;
-			jpc->dsk_update_inprog = FALSE;
+			assert(new_dsk == new_dskaddr % jb->size);
+			assert(jb->freeaddr >= new_dskaddr);
+			/* Note: "wcs_flu" does a "performCASLatchCheck" of jb->io_in_prog_latch and relies
+			 * on "jb->dskaddr" being updated BEFORE "jb->dsk".
+			 */
+			jb->dskaddr = new_dskaddr;
+			jb->dsk = new_dsk;
 			cnl = csa->nl;
 			INCR_GVSTATS_COUNTER(csa, cnl, n_jfile_bytes, aligned_tsz);
 			INCR_GVSTATS_COUNTER(csa, cnl, n_jfile_writes, 1);
@@ -283,6 +310,7 @@ uint4 jnl_qio_start(jnl_private_control *jpc)
 	sgmnt_addrs		*csa;
 	unix_db_info		*udi;
 	uint4			jnl_fs_block_size;
+	int			index1;
 
 	assert(NULL != jpc);
 	udi = FILE_INFO(jpc->region);
@@ -292,6 +320,13 @@ uint4 jnl_qio_start(jnl_private_control *jpc)
 	 * and the next block of code (after the yield()) processes the tail end of the data (if necessary)
 	 */
 	lcl_dskaddr = jb->dskaddr;
+	/* Check if there are any pending jnl phase2 commits that can be cleaned up. That will bring jb->freeaddr more uptodate. */
+	index1 = jb->phase2_commit_index1;
+	ASSERT_JNL_PHASE2_COMMIT_INDEX_IS_VALID(index1, JNL_PHASE2_COMMIT_ARRAY_SIZE);
+	if ((index1 != jb->phase2_commit_index2) && jb->phase2_commit_array[index1].write_complete
+				&& (LOCK_AVAILABLE == jb->phase2_commit_latch.u.parts.latch_pid))
+		jnl_phase2_cleanup(csa, jb);
+	/* Now that any possible phase2 commit cleanup is done, go ahead with qio (if needed) using updated jb->freeaddr */
 	target_freeaddr = jb->freeaddr;
 	if (lcl_dskaddr >= target_freeaddr)
 		return SS_NORMAL;
diff --git a/sr_unix/jnlpool_init.c b/sr_unix/jnlpool_init.c
old mode 100755
new mode 100644
index 2108e4a..c314e24
--- a/sr_unix/jnlpool_init.c
+++ b/sr_unix/jnlpool_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	*
@@ -123,18 +123,10 @@ error_def(ERR_TEXT);
 													\
 	if (NULL != jnlpool.jnlpool_ctl)								\
 	{												\
- 		JNLPOOL_SHMDT(status, save_errno);							\
+ 		JNLPOOL_SHMDT(jnlpool, status, save_errno);						\
  		if (0 > status)										\
  			RTS_ERROR_OR_GTM_PUTMSG(CSA_ARG(NULL) VARLSTCNT(5) ERR_REPLWARN, 2,		\
 				RTS_ERROR_LITERAL("Could not detach from journal pool"), save_errno);	\
-		jnlpool_ctl = NULL;									\
-		jnlpool.jnlpool_ctl = NULL;								\
-		jnlpool.repl_inst_filehdr = NULL;							\
-		jnlpool.gtmsrc_lcl_array = NULL;							\
-		jnlpool.gtmsource_local_array = NULL;							\
-		jnlpool.jnldata_base = NULL;								\
-		jnlpool.jnlpool_dummy_reg->open = FALSE;						\
-		pool_init = FALSE;									\
 	}												\
 }
 
@@ -191,8 +183,10 @@ void jnlpool_init(jnlpool_user pool_user, boolean_t gtmsource_startup, boolean_t
 	jnlpool_ctl_ptr_t	tmp_jnlpool_ctl;
 	struct sembuf   	sop[3];
 	uint4           	sopcnt;
-	DEBUG_ONLY(int4		semval;)
-	DEBUG_ONLY(boolean_t	sem_created = FALSE;)
+	DEBUG_ONLY(int4		semval);
+	DEBUG_ONLY(boolean_t	sem_created = FALSE);
+	DEBUG_ONLY(int		i);
+	DEBUG_ONLY(char 	*ptr);
 	DCL_THREADGBL_ACCESS;
 
 	SETUP_THREADGBL_ACCESS;
@@ -445,7 +439,7 @@ void jnlpool_init(jnlpool_user pool_user, boolean_t gtmsource_startup, boolean_t
 		save_errno = errno;
 		DETACH_AND_REMOVE_SHM_AND_SEM;	/* remove any sem/shm we had created */
 		ftok_sem_release(jnlpool.jnlpool_dummy_reg, udi->counter_ftok_incremented, TRUE);
-		/* Assert below ensures we dont try to clean up the journal pool even though we errored out while attaching to it */
+		/* Assert below ensures we don't try to clean up journal pool even though we errored out while attaching to it */
 		assert(NULL == jnlpool.jnlpool_ctl);
 		rts_error_csa(CSA_ARG(NULL) VARLSTCNT(7) ERR_JNLPOOLSETUP, 0, ERR_TEXT, 2,
 			RTS_ERROR_LITERAL("Error with journal pool shmat"), save_errno);
@@ -496,12 +490,18 @@ void jnlpool_init(jnlpool_user pool_user, boolean_t gtmsource_startup, boolean_t
 	 * journal pool.
 	 */
 	assert(MERRORS_ARRAY_SZ > merrors_ctl.msg_cnt);
-	csa->critical = (mutex_struct_ptr_t)((sm_uc_ptr_t)jnlpool.jnlpool_ctl + JNLPOOL_CTL_SIZE); /* secshr_db_clnup uses this
-												    * relationship */
+	csa->critical = (mutex_struct_ptr_t)((sm_uc_ptr_t)jnlpool.jnlpool_ctl + JNLPOOL_CTL_SIZE);
+	assert(jnlpool.jnlpool_ctl == REPLCSA2JPL(csa));	/* secshr_db_clnup uses this relationship */
 	jnlpool_mutex_spin_parms = (mutex_spin_parms_ptr_t)((sm_uc_ptr_t)csa->critical + JNLPOOL_CRIT_SPACE);
 	csa->nl = (node_local_ptr_t)((sm_uc_ptr_t)jnlpool_mutex_spin_parms + SIZEOF(mutex_spin_parms_struct));
+#	ifdef DEBUG
 	if (new_ipc)
-		memset(csa->nl, 0, SIZEOF(node_local)); /* Make csa->nl->glob_sec_init FALSE */
+	{	/* We allocated shared storage -- "shmget" ensures it is null initialized. Assert that. */
+		ptr = (char *)csa->nl;
+		for (i = 0; i < SIZEOF(*csa->nl); i++)
+			assert('\0' == ptr[i]);
+	}
+#	endif
 	csa->now_crit = FALSE;
 	csa->onln_rlbk_cycle = jnlpool.jnlpool_ctl->onln_rlbk_cycle; /* Take a copy of the latest onln_rlbk_cycle */
 	jnlpool.repl_inst_filehdr = (repl_inst_hdr_ptr_t)((sm_uc_ptr_t)csa->critical + JNLPOOL_CRIT_SIZE);
@@ -665,7 +665,7 @@ void jnlpool_init(jnlpool_user pool_user, boolean_t gtmsource_startup, boolean_t
 						reset_gtmsrclcl_info = FALSE;
 					} else if (!gtmsource_options.needrestart && !gtmsource_options.showbacklog
 							&& !gtmsource_options.checkhealth)
-					{	/* If NEEDRESTART, we dont care if the source server is alive or not. All that
+					{	/* If NEEDRESTART, we don't care if the source server is alive or not. All that
 						 * we care about is if the primary and secondary did communicate or not. That
 						 * will be determined in gtmsource_needrestart.c. Do not trigger an error here.
 						 * If SHOWBACKLOG or CHECKHEALTH, do not trigger an error as slot was found
@@ -780,6 +780,14 @@ void jnlpool_init(jnlpool_user pool_user, boolean_t gtmsource_startup, boolean_t
 	if (!new_ipc)
 	{	/* We did not create shm or sem so no need to remove any of them for any "rts_error" within this IF */
 		assert(!STRCMP(repl_instance.inst_info.this_instname, jnlpool.repl_inst_filehdr->inst_info.this_instname));
+		/* Source Server restart - attempt to install custom errors if not installed before */
+		if (gtmsource_startup && (!jnlpool_ctl->instfreeze_environ_inited) && CUSTOM_ERRORS_AVAILABLE
+				&& !init_anticipatory_freeze_errors())
+		{
+			ftok_sem_release(jnlpool.jnlpool_dummy_reg, udi->counter_ftok_incremented, TRUE);
+			rts_error_csa(CSA_ARG(NULL) VARLSTCNT(6) ERR_JNLPOOLSETUP, 0, ERR_TEXT, 2,
+					LEN_AND_LIT("Error initializing custom errors"));
+		}
 		/* Check compatibility of caller source server or receiver server command with the current state of journal pool */
 		if (!jnlpool.jnlpool_ctl->upd_disabled)
 		{
@@ -816,7 +824,7 @@ void jnlpool_init(jnlpool_user pool_user, boolean_t gtmsource_startup, boolean_t
 				{	/* ACTIVATE was specified. Check if there is a receiver server OR update process
 					 * attached to the journal pool. If so we cannot allow the ACTIVATE (issue ACTIVATEFAIL
 					 * error). Those have to be shut down before the instance can be activated. In addition,
-					 * disallow an in-progress receiver server startup command. This is because we dont want
+					 * disallow an in-progress receiver server startup command. This is because we don't want
 					 * the activate to sneak in between the jnlpool_init and recvpool_init calls done by the
 					 * receiver server startup command creating a confusing situation (because the receiver
 					 * will be ready to play updates as if this is a secondary but an active source server
@@ -852,7 +860,7 @@ void jnlpool_init(jnlpool_user pool_user, boolean_t gtmsource_startup, boolean_t
 			}
 		} else if ((GTMRECEIVE == pool_user) && gtmrecv_options.start)
 		{	/* This is a receiver server startup command. Increment RECV_SERV_STARTUP_SEM semaphore for
-			 * a later source server activate command to know this command is in progress. We dont do
+			 * a later source server activate command to know this command is in progress. We don't do
 			 * a corresponding decr_sem later but rely on the OS doing it when the receiver startup command
 			 * exits (due to the SEM_UNDO done inside incr_sem).
 			 */
@@ -894,10 +902,9 @@ void jnlpool_init(jnlpool_user pool_user, boolean_t gtmsource_startup, boolean_t
 		jnlpool_ctl->jnldata_base_off = JNLDATA_BASE_OFF;
 		jnlpool_ctl->jnlpool_size = gtmsource_options.buffsize - jnlpool_ctl->jnldata_base_off;
 		assert((jnlpool_ctl->jnlpool_size & ~JNL_WRT_END_MASK) == 0);
-		jnlpool_ctl->write = 0;
 		jnlpool_ctl->lastwrite_len = 0;
-		QWASSIGNDW(jnlpool_ctl->early_write_addr, 0);
-		QWASSIGNDW(jnlpool_ctl->write_addr, 0);
+		jnlpool_ctl->write_addr = 0;
+		jnlpool_ctl->rsrv_write_addr = 0;
 		if (0 < jnlpool.repl_inst_filehdr->num_histinfo)
 		{
 			grab_lock(jnlpool.jnlpool_dummy_reg, TRUE, ASSERT_NO_ONLINE_ROLLBACK);
@@ -948,6 +955,18 @@ void jnlpool_init(jnlpool_user pool_user, boolean_t gtmsource_startup, boolean_t
 		assert(0 == offsetof(jnlpool_ctl_struct, jnlpool_id));
 					/* ensure that the pool identifier is at the top of the pool */
 		jnlpool_ctl->jnlpool_id.pool_type = JNLPOOL_SEGMENT;
+		SET_LATCH_GLOBAL(&jnlpool_ctl->phase2_commit_latch, LOCK_AVAILABLE);
+		jnlpool_ctl->phase2_commit_index1 = jnlpool_ctl->phase2_commit_index2 = 0;
+		/* The below value of "tot_jrec_len == 0" is relied upon by "mutex_salvage" of jnlpool in case the
+		 * jnlpool is created, a process goes to t_end and gets killed and salvage happens right afterwards.
+		 * The salvage logic needs to set jnlpool_ctl->lastwrite_len correctly and for that it needs to
+		 * go one previous entry in the phase2_commit_array. "shmget()" guarantees this by initializing
+		 * all of shm to 0 at startup.
+		 */
+		assert(0 == jnlpool_ctl->phase2_commit_array[JPL_PHASE2_COMMIT_ARRAY_SIZE - 1].process_id);
+		assert(0 == jnlpool_ctl->phase2_commit_array[JPL_PHASE2_COMMIT_ARRAY_SIZE - 1].start_write_addr);
+		assert(0 == jnlpool_ctl->phase2_commit_array[JPL_PHASE2_COMMIT_ARRAY_SIZE - 1].tot_jrec_len);
+		assert(0 == jnlpool_ctl->phase2_commit_array[JPL_PHASE2_COMMIT_ARRAY_SIZE - 1].jnl_seqno);
 		csa->nl->glob_sec_init = TRUE;
 		assert(NULL != jnlpool_creator);
 		*jnlpool_creator = TRUE;
diff --git a/sr_unix/kitstart.csh b/sr_unix/kitstart.csh
index 1654d50..7391019 100755
--- a/sr_unix/kitstart.csh
+++ b/sr_unix/kitstart.csh
@@ -183,7 +183,8 @@ endif
 
 version $version p  # Set the current version so that relative paths work
 cmsver $version	    # Set appropriate path to locate $version sources in CMS, the default is V990
-set releasever = `$gtm_dist/mumps -run %XCMD 'write $piece($zversion," ",2),!'`
+set zver = `$gtm_dist/mumps -run %XCMD 'write $zversion'`
+set releasever = $zver[2]
 
 # create a README.txt which has the current year in it
 setenv readme_txt ${gtm_com}/README.txt
@@ -358,6 +359,37 @@ foreach image ($imagetype)
 end
 echo ""
 
+if (-f $gtm_tools/gtmpcat.m) then
+	pushd $gtm_tools
+	set nonomatch ; set fldbld = (gtmpcat*On*${version}.m) ; unset nonomatch
+	if (("$fldbld" == "gtmpcat*On*${version}.m") || ($#fldbld > 1)) then
+		echo ""
+		echo "FAIL:missing or duplicate gtmpcat field build file ($fldbld)"
+	else
+		set dist_file = "${dist}/gtmpcat_for_${version}_${osname}_${arch}.${package_ext}"
+		echo ""
+		echo "Creating $dist_file"
+		sed "s/#ZVERSION#/${zver}/;s/#FLDBLD#/${fldbld}/" < install_gtmpcat_sh.txt > install_gtmpcat.sh
+		cat gtmpcat_sh.txt > gtmpcat.sh
+		chmod 500 install_gtmpcat.sh gtmpcat.sh
+		set prev_user = `filetest -U gtmpcat.m`
+		set prev_group = `filetest -G gtmpcat.m`
+		set prev_perm = `filetest -P: gtmpcat.m`
+		chown 0:0 gtmpcat.m $fldbld
+		chmod 400 gtmpcat.m $fldbld
+		$package $dist_file gtmpcat.m $fldbld install_gtmpcat.sh gtmpcat.sh || exit 10
+		chown ${prev_user}:${prev_group} gtmpcat.m $fldbld
+		chmod ${prev_perm} gtmpcat.m $fldbld
+		echo ""
+		echo "Gzipping $dist_file"
+		gzip $dist_file || exit 11
+	endif
+	popd
+else
+	echo ""
+	echo "FAIL:gtmpcat was not found"
+endif
+
 find $dist -type f -exec chmod 444 {} \;
 find $dist -type d -exec chmod 755 {} \;
 chown -R library:gtc $dist
@@ -546,6 +578,18 @@ CONFIGURE_EOF
 			set leavedir = 1
 		endif
 
+		# Install gtmpcat
+		pushd $gtm_tools
+		yes | env gtm_dist=${install}/defgroup/${image} sh ./install_gtmpcat.sh
+		yes | env gtm_dist=${install}/${image} sh ./install_gtmpcat.sh
+		popd
+
+		# Test gtmpcat
+		pushd /tmp
+		(source ${install}/defgroup/${image}/gtmcshrc ; $gtm_dist/mumps -r %XCMD 'zsystem "$gtm_dist/gtmpcat "_$job')
+		(source ${install}/${image}/gtmcshrc ; $gtm_dist/mumps -r %XCMD 'zsystem "$gtm_dist/gtmpcat "_$job')
+		popd
+
 	end
 endif
 
diff --git a/sr_unix/list_file.c b/sr_unix/list_file.c
index e04bcbb..112d59f 100755
--- a/sr_unix/list_file.c
+++ b/sr_unix/list_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	*
@@ -24,13 +25,15 @@
 
 #define LISTEXT ".lis"
 
-GBLREF int		(*op_open_ptr)(mval *v, mval *p, int t, mval *mspace);
+GBLREF int		(*op_open_ptr)(mval *v, mval *p, mval *t, mval *mspace);
 GBLREF command_qualifier cmd_qlf;
 GBLREF mident		module_name;
 GBLREF io_pair 		io_curr_device;
 GBLREF list_params 	lst_param;
-
 GBLREF char rev_time_buf[20];
+
+LITREF	mval		literal_zero;
+
 static char print_time_buf[20];
 static io_pair dev_in_use;
 static readonly struct
@@ -91,7 +94,7 @@ void open_list_file(void)
 	file.str.addr = &fname[0];
 	parms.str.len = SIZEOF(open_params_list);
 	parms.str.addr = (char *)&open_params_list;
-	(*op_open_ptr)(&file, &parms, 30, 0);
+	(*op_open_ptr)(&file, &parms, (mval *)&literal_zero, 0);
 	parms.str.len = 1;
 	charspace = (char)iop_eol;
 	parms.str.addr = &charspace;
diff --git a/sr_unix/lke.c b/sr_unix/lke.c
old mode 100755
new mode 100644
index 22c038e..e97883f
--- a/sr_unix/lke.c
+++ b/sr_unix/lke.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	*
@@ -15,7 +16,7 @@
 #include "gtm_inet.h"
 #include "gtm_fcntl.h"
 #include "gtm_unistd.h"
-#include <signal.h>
+#include "gtm_signal.h"
 
 #include "mlkdef.h"
 #include "gtm_stdlib.h"
@@ -48,7 +49,6 @@
 #include "lke_fileio.h"
 #include "gtm_startup_chk.h"
 #include "generic_signal_handler.h"
-#include "init_secshr_addrs.h"
 #include "cli_parse.h"
 #include "getzdir.h"
 #include "getjobname.h"
@@ -77,6 +77,7 @@ GBLREF spdesc			rts_stringpool, stringpool;
 GBLREF global_latch_t		defer_latch;
 GBLREF char			cli_err_str[];
 GBLREF CLI_ENTRY		lke_cmd_ary[];
+GBLREF ch_ret_type		(*stpgc_ch)();			/* Function pointer to stp_gcol_ch */
 
 GBLDEF CLI_ENTRY		*cmd_ary = &lke_cmd_ary[0];	/* Define cmd_ary to be the LKE specific cmd table */
 
@@ -99,9 +100,9 @@ int main (int argc, char *argv[])
 	atexit(util_exit_handler);
 	SET_LATCH_GLOBAL(&defer_latch, LOCK_AVAILABLE);
 	stp_init(STP_INITSIZE);
+	stpgc_ch = &stp_gcol_ch;
 	rts_stringpool = stringpool;
 	getjobname();
-	INVOKE_INIT_SECSHR_ADDRS;
 	getzdir();
 	gtm_chk_dist(argv[0]);
 	prealloc_gt_timers();
diff --git a/sr_unix/mu_cre_file.c b/sr_unix/mu_cre_file.c
index 06479ed..7e32bc5 100644
--- a/sr_unix/mu_cre_file.c
+++ b/sr_unix/mu_cre_file.c
@@ -48,38 +48,57 @@
 #include "db_write_eof_block.h"
 #include "get_fs_block_size.h"
 #include "gtm_permissions.h"
+#include "getzposition.h"
+#include "error.h"
 
 #define BLK_SIZE (((gd_segment*)gv_cur_region->dyn.addr)->blk_size)
 
-#define CLEANUP(XX)								\
-MBSTART {									\
-	int	rc;								\
-										\
-	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);							\
+/* Note: CLEANUP macro is invoked by "mu_cre_file_ch" and "mu_cre_file" and hence needs to use "static" variables
+ * (mu_cre_file_fd & mu_cre_file_path) instead of "local" variables.
+ */
+#define CLEANUP(XX)											\
+MBSTART {												\
+	int	rc;											\
+													\
+	if (cs_data)											\
+		free(cs_data);										\
+	if (FD_INVALID != mu_cre_file_fd)								\
+		CLOSEFILE_RESET(mu_cre_file_fd, rc); /* resets "mu_cre_file_fd" to FD_INVALID */	\
+	assert(NULL != mu_cre_file_path);								\
+	if (EXIT_ERR == XX)										\
+		UNLINK(mu_cre_file_path);								\
 } MBEND
 
-#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;			\
+/* Macros to send warning or error messages to the correct destination:
+ *  - If MUPIP image, message goes to stderr of the process.
+ *  - Else MUMPS image captures the error message and wraps it with MUCREFILERR and sends it to the system log.
+ * In addition, some messages require cleanup if they are emitted past a certain point in the processing (said point
+ * setting the 'cleanup_needed' flag to TRUE.
+ */
+#define PUTMSG_MSG_ROUTER_CSA(CSAARG, VARCNT, ERRORID, ...)								\
+MBSTART {														\
+	mval		zpos;												\
+															\
+	if (IS_MUPIP_IMAGE)												\
+		gtm_putmsg_csa(CSA_ARG(CSAARG) VARLSTCNT(VARCNT) ERRORID, __VA_ARGS__);					\
+	else														\
+	{														\
+		/* Need to reflect the current error to the syslog - find entry ref to add to error. The VARLSTCNT	\
+		 * computation is 8 for the prefix message, plus the VARLSTCNT() that would apply to the actual error	\
+		 * message that got us here.										\
+		 */													\
+		getzposition(&zpos);											\
+		send_msg_csa(CSA_ARG(CSAARG) VARLSTCNT((8 + VARCNT)) ERR_MUCREFILERR, 6, zpos.str.len, zpos.str.addr,	\
+			     DB_LEN_STR(gv_cur_region), REG_LEN_STR(gv_cur_region), ERRORID, __VA_ARGS__);		\
+	}														\
 } MBEND
-
-#define PUTMSG_WARN_CSA(MSGPARMS)			\
-MBSTART {						\
-	if (IS_MUPIP_IMAGE)				\
-		gtm_putmsg_csa MSGPARMS;		\
-	else						\
-		send_msg_csa MSGPARMS;			\
+#define PUTMSG_ERROR_CSA(CSAARG, VARCNT, ERRORID, ...)									\
+MBSTART {														\
+	if (cleanup_needed)												\
+		CLEANUP(EXIT_ERR);											\
+	PUTMSG_MSG_ROUTER_CSA(CSAARG, VARCNT, ERRORID, __VA_ARGS__);							\
 } MBEND
+#define PUTMSG_WARN_CSA(CSAARG, VARCNT, ERRORID, ...) PUTMSG_MSG_ROUTER_CSA(CSAARG, VARCNT, ERRORID, __VA_ARGS__)
 
 /* 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
@@ -103,6 +122,9 @@ GBLREF	uint4			gtmDebugLevel;
 GBLREF	boolean_t		in_mu_cre_file;
 #endif
 
+STATICDEF	int	mu_cre_file_fd;		/* needed for "mu_cre_file_ch" */
+STATICDEF	char	*mu_cre_file_path;	/* needed for "mu_cre_file_ch" */
+
 error_def(ERR_DBBLKSIZEALIGN);
 error_def(ERR_DBFILECREATED);
 error_def(ERR_DBOPNERR);
@@ -110,6 +132,7 @@ error_def(ERR_DSKSPCCHK);
 error_def(ERR_FILECREERR);
 error_def(ERR_FNTRANSERROR);
 error_def(ERR_LOWSPACECRE);
+error_def(ERR_MUCREFILERR);
 error_def(ERR_MUNOSTRMBKUP);
 error_def(ERR_NOCREMMBIJ);
 error_def(ERR_NOCRENETFILE);
@@ -118,11 +141,26 @@ error_def(ERR_PARNORMAL);
 error_def(ERR_PREALLOCATEFAIL);
 error_def(ERR_RAWDEVUNSUP);
 
+/* Condition handler primarily to handle ERR_MEMORY errors by cleaning up the file that we created
+ * before passing on control to higher level condition handlers.
+ */
+CONDITION_HANDLER(mu_cre_file_ch)
+{
+	START_CH(TRUE);
+	if ((SUCCESS == SEVERITY) || (INFO == SEVERITY))
+	{
+		assert(FALSE);	/* don't know of any possible INFO/SUCCESS errors */
+		CONTINUE;			/* Keep going for non-error issues */
+	}
+	CLEANUP(EXIT_ERR);
+	NEXTCH;
+}
+
 unsigned char mu_cre_file(void)
 {
 	char		path[MAX_FBUFF + 1], errbuff[512];
 	unsigned char	buff[DISK_BLOCK_SIZE];
-	int		fd = FD_INVALID, i, lower, upper, norm_vbn;
+	int		i, lower, upper, norm_vbn;
         ssize_t         status;
 	uint4		raw_dev_size;		/* size of a raw device, in bytes */
 	int4		save_errno;
@@ -146,6 +184,8 @@ unsigned char mu_cre_file(void)
 	DCL_THREADGBL_ACCESS;
 
 	SETUP_THREADGBL_ACCESS;
+	DEBUG_ONLY(mu_cre_file_fd = FD_INVALID);
+	DEBUG_ONLY(mu_cre_file_path = NULL);
 	cleanup_needed = FALSE;
 	DEBUG_ONLY(in_mu_cre_file = TRUE;)
 	assert((-(SIZEOF(uint4) * 2) & SIZEOF_FILE_HDR_DFLT) == SIZEOF_FILE_HDR_DFLT);
@@ -161,21 +201,21 @@ unsigned char mu_cre_file(void)
 	*(path + file.len) = '\0';
 	if (is_raw_dev(path))
 	{
-		PUTMSG_ERROR_CSA((CSA_ARG(cs_addrs) VARLSTCNT(4) ERR_RAWDEVUNSUP, 2, REG_LEN_STR(gv_cur_region)));
+		PUTMSG_ERROR_CSA(cs_addrs, 4, ERR_RAWDEVUNSUP, 2, REG_LEN_STR(gv_cur_region));
 		return EXIT_ERR;
 	}
 	pblk.def1_buf = DEF_DBEXT;
 	pblk.def1_size = SIZEOF(DEF_DBEXT) - 1;
 	if (ERR_PARNORMAL != (retcode = parse_file(&file, &pblk)))	/* Note assignment */
 	{
-		PUTMSG_ERROR_CSA((CSA_ARG(cs_addrs) VARLSTCNT(4) ERR_FNTRANSERROR, 2, REG_LEN_STR(gv_cur_region)));
+		PUTMSG_ERROR_CSA(cs_addrs, 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);
-		PUTMSG_ERROR_CSA((CSA_ARG(cs_addrs) VARLSTCNT(4) ERR_NOCRENETFILE, 2, LEN_AND_STR(path)));
+		PUTMSG_ERROR_CSA(cs_addrs, 4, ERR_NOCRENETFILE, 2, LEN_AND_STR(path));
 		return EXIT_WRN;
 	}
 	udi = &udi_struct;
@@ -191,8 +231,8 @@ unsigned char mu_cre_file(void)
 			return EXIT_ERR;
 		}
 	}
-	fd = OPEN3(pblk.l_dir, O_CREAT | O_EXCL | O_RDWR, 0600);
-	if (FD_INVALID == fd)
+	mu_cre_file_fd = OPEN3(pblk.l_dir, O_CREAT | O_EXCL | O_RDWR, 0600);
+	if (FD_INVALID == mu_cre_file_fd)
 	{	/* Avoid error message if file already exists (another process created it) for AUTODBs that are NOT also
 		 * STATSDBs.
 		 */
@@ -205,28 +245,33 @@ unsigned char mu_cre_file(void)
 			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));
+			PUTMSG_ERROR_CSA(cs_addrs, 5, ERR_DBOPNERR, 2, LEN_AND_STR(path), save_errno);
 		return EXIT_ERR;
 	}
 	cleanup_needed = TRUE;			/* File open now so cleanup needed */
+	mu_cre_file_path = &path[0];	/* needed by "mu_cre_file_ch" */
+	/* mu_cre_file_fd is also needed by "mu_cre_file_ch" but that is already set */
+	ESTABLISH_RET(mu_cre_file_ch, EXIT_ERR);
 #	ifdef __MVS__
-	if (-1 == gtm_zos_set_tag(fd, TAG_BINARY, TAG_NOTTEXT, TAG_FORCE, &realfiletag))
+	if (-1 == gtm_zos_set_tag(mu_cre_file_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)))
+	if (0 != (save_errno = disk_block_available(mu_cre_file_fd, &avail_blocks, FALSE)))
 	{
 		errno = save_errno;
-		PUTMSG_ERROR_CSA((CSA_ARG(cs_addrs) VARLSTCNT(5) ERR_DSKSPCCHK, 2, LEN_AND_STR(path), errno));
+		PUTMSG_ERROR_CSA(cs_addrs, 5, ERR_DSKSPCCHK, 2, LEN_AND_STR(path), errno); /* Note: Internally invokes CLEANUP */
+		REVERT;
 		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);
+		fsb_size = get_fs_block_size(mu_cre_file_fd);
 		if (0 != (seg->blk_size % fsb_size))
 		{
-			PUTMSG_ERROR_CSA((CSA_ARG(cs_addrs) VARLSTCNT(6) ERR_DBBLKSIZEALIGN, 4,
-					  LEN_AND_STR(path), seg->blk_size, fsb_size));
+			PUTMSG_ERROR_CSA(cs_addrs, 6, ERR_DBBLKSIZEALIGN, 4, LEN_AND_STR(path), seg->blk_size, fsb_size);
+				/* Note: Above macro internally invokes CLEANUP(EXIT_ERR) */
+			REVERT;
 			return EXIT_ERR;
 		}
 	}
@@ -249,21 +294,22 @@ unsigned char mu_cre_file(void)
 		 * 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));
+		assert((NULL == jnlpool.jnlpool_ctl) || IS_AUTODB_REG(gv_cur_region));
 		if (avail_blocks < blocks_for_create)
 		{
-			PUTMSG_ERROR_CSA((CSA_ARG(cs_addrs) VARLSTCNT(6) ERR_NOSPACECRE, 4, LEN_AND_STR(path),
-					  &blocks_for_create, &avail_blocks));
+			PUTMSG_ERROR_CSA(cs_addrs, 6, ERR_NOSPACECRE, 4, LEN_AND_STR(path), &blocks_for_create, &avail_blocks);
+				/* Note: Above macro internally invokes CLEANUP(EXIT_ERR) */
 			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);
+			REVERT;
 			return EXIT_ERR;
 		}
 		delta_blocks = avail_blocks - blocks_for_create;
 		if (delta_blocks < blocks_for_extension)
 		{
-			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));
+			PUTMSG_WARN_CSA(cs_addrs,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);
@@ -272,7 +318,7 @@ unsigned char mu_cre_file(void)
 	gv_cur_region->dyn.addr->file_cntl = &fc;
 	memset(&fc, 0, SIZEOF(file_control));
 	fc.file_info = (void*)&udi_struct;
-	udi->fd = fd;
+	udi->fd = mu_cre_file_fd;
 	cs_data = (sgmnt_data_ptr_t)malloc(SIZEOF_FILE_HDR_DFLT);
 	memset(cs_data, 0, SIZEOF_FILE_HDR_DFLT);
 	cs_data->createinprogress = TRUE;
@@ -288,7 +334,9 @@ 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))
 	{
-		PUTMSG_ERROR_CSA((CSA_ARG(cs_addrs) VARLSTCNT(4) ERR_NOCREMMBIJ, 2, LEN_AND_STR(path)));
+		PUTMSG_ERROR_CSA(cs_addrs, 4, ERR_NOCREMMBIJ, 2, LEN_AND_STR(path));
+			/* Note: Above macro internally invokes CLEANUP(EXIT_ERR) */
+		REVERT;
 		return EXIT_ERR;
 	}
 	cs_data->trans_hist.total_blks = gv_cur_region->dyn.addr->allocation;
@@ -305,6 +353,7 @@ unsigned char mu_cre_file(void)
 		if (0 != gtmcrypt_errno)
 		{
 			GTMCRYPT_REPORT_ERROR(gtmcrypt_errno, gtm_putmsg, file.len, file.addr);
+			REVERT;
 			CLEANUP(EXIT_ERR);
 			return EXIT_ERR;
 		}
@@ -314,6 +363,7 @@ unsigned char mu_cre_file(void)
 		if (0 != gtmcrypt_errno)
 		{
 			GTMCRYPT_REPORT_ERROR(gtmcrypt_errno, gtm_putmsg, file.len, file.addr);
+			REVERT;
 			CLEANUP(EXIT_ERR);
 			return EXIT_ERR;
 		}
@@ -330,16 +380,18 @@ unsigned char mu_cre_file(void)
 	DB_LSEEKWRITE(cs_addrs, udi, udi->fn, udi->fd, 0, cs_data, SIZEOF_FILE_HDR_DFLT, status);
 	if (0 != status)
 	{
-		PUTMSG_ERROR_CSA((CSA_ARG(cs_addrs) VARLSTCNT(7) ERR_FILECREERR, 4, LEN_AND_LIT("writing out file header"),
-				  LEN_AND_LIT(path), status));
+		PUTMSG_ERROR_CSA(cs_addrs, 7, ERR_FILECREERR, 4, LEN_AND_LIT("writing out file header"), LEN_AND_LIT(path), status);
+			/* Note: Above macro internally invokes CLEANUP(EXIT_ERR) */
+		REVERT;
 		return EXIT_ERR;
 	}
 	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)
 	{
-		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));
+		PUTMSG_ERROR_CSA(cs_addrs, 7, ERR_FILECREERR, 4, LEN_AND_LIT("writing out end-of-file marker"), LEN_AND_LIT(path),
+				 status); /* Note: Above macro internally invokes CLEANUP(EXIT_ERR) */
+		REVERT;
 		return EXIT_ERR;
 	}
 	if (!cs_data->defer_allocate)
@@ -349,8 +401,9 @@ unsigned char mu_cre_file(void)
 		if (0 != status)
 		{
 			assert(ENOSPC == status);
-			PUTMSG_ERROR_CSA((CSA_ARG(cs_addrs) VARLSTCNT(5) ERR_PREALLOCATEFAIL, 2, DB_LEN_STR(gv_cur_region),
-					  status));
+			PUTMSG_ERROR_CSA(cs_addrs, 5, ERR_PREALLOCATEFAIL, 2, DB_LEN_STR(gv_cur_region), status);
+				/* Note: Above macro internally invokes CLEANUP(EXIT_ERR) */
+			REVERT;
 			return EXIT_ERR;
 		}
 	}
@@ -364,16 +417,20 @@ unsigned char mu_cre_file(void)
 		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));
+			PUTMSG_ERROR_CSA(cs_addrs, 7, ERR_FILECREERR, 4,
+					 LEN_AND_LIT("getting base file information"), LEN_AND_STR(path), save_errno);
+				/* Note: Above macro internally invokes CLEANUP(EXIT_ERR) */
+			REVERT;
 			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));
+			PUTMSG_ERROR_CSA(cs_addrs, 7, ERR_FILECREERR, 4,
+					 LEN_AND_LIT("obtaining permissions from base DB"),  LEN_AND_STR(path), EPERM);
+				/* Note: Above macro internally invokes CLEANUP(EXIT_ERR) */
+			REVERT;
 			return EXIT_ERR;
 		}
 	} else
@@ -381,15 +438,17 @@ unsigned char mu_cre_file(void)
 	if (-1 == CHMOD(pblk.l_dir, perms))
 	{
 		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));
+		PUTMSG_WARN_CSA(cs_addrs, 7, MAKE_MSG_WARNING(ERR_FILECREERR), 4, LEN_AND_LIT("changing file mode"),
+				LEN_AND_LIT(path), save_errno);
+		REVERT;
+		CLEANUP(EXIT_WRN);
 		return EXIT_WRN;
 	}
 	if ((32 * 1024 - SIZEOF(shmpool_blk_hdr)) < cs_data->blk_size)
-		PUTMSG_WARN_CSA((CSA_ARG(cs_addrs) VARLSTCNT(5) ERR_MUNOSTRMBKUP, 3, RTS_ERROR_STRING(path),
-				 32 * 1024 - DISK_BLOCK_SIZE));
+		PUTMSG_WARN_CSA(cs_addrs, 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)));
+		PUTMSG_WARN_CSA(cs_addrs, 4, ERR_DBFILECREATED, 2, LEN_AND_STR(path));
+	REVERT;
 	CLEANUP(EXIT_NRM);
 	return EXIT_NRM;
 }
diff --git a/sr_unix/mu_extract.c b/sr_unix/mu_extract.c
index 0e12aae..fe7200a 100755
--- a/sr_unix/mu_extract.c
+++ b/sr_unix/mu_extract.c
@@ -65,7 +65,7 @@
 #include "is_proc_alive.h"
 #include "gtm_reservedDB.h"
 
-GBLREF	int			(*op_open_ptr)(mval *v, mval *p, int t, mval *mspace);
+GBLREF	int			(*op_open_ptr)(mval *v, mval *p, mval *t, mval *mspace);
 GBLREF	bool			mu_ctrlc_occurred;
 GBLREF	bool			mu_ctrly_occurred;
 GBLREF	gd_region		*gv_cur_region;
@@ -94,6 +94,7 @@ error_def(ERR_TEXT);
 
 LITDEF mval	mu_bin_datefmt	= DEFINE_MVAL_LITERAL(MV_STR, 0, 0, SIZEOF(BIN_HEADER_DATEFMT) - 1,
 						      BIN_HEADER_DATEFMT, 0, 0);
+LITREF	mval	literal_zero;
 
 LITREF mstr	chset_names[];
 
@@ -435,7 +436,7 @@ void mu_extract(void)
 	op_pars.str.len = SIZEOF(open_params_list);
 	op_pars.str.addr = (char *)open_params_list;
 	op_val.mvtype = MV_STR;
-	(*op_open_ptr)(&op_val, &op_pars, 0, 0);
+	(*op_open_ptr)(&op_val, &op_pars, (mval *)&literal_zero, 0);
 	ESTABLISH(mu_extract_handler1);
 	op_pars.str.len = SIZEOF(use_params);
 	op_pars.str.addr = (char *)&use_params;
diff --git a/sr_unix/mu_op_open.c b/sr_unix/mu_op_open.c
index 3c0f222..112524d 100755
--- a/sr_unix/mu_op_open.c
+++ b/sr_unix/mu_op_open.c
@@ -57,10 +57,10 @@ error_def(ERR_SYSCALL);
 LITREF mstr			chset_names[];
 LITREF	unsigned char		io_params_size[];
 
-static bool mu_open_try(io_log_name *, io_log_name *, mval *, mval *);
+static boolean_t mu_open_try(io_log_name *, io_log_name *, mval *, mval *);
 
 /*	The third parameter is dummy to keep the inteface same as op_open	*/
-int mu_op_open(mval *v, mval *p, int t, mval *mspace)
+int mu_op_open(mval *v, mval *p, mval *t, mval *mspace)
 {
 	char		buf1[MAX_TRANS_NAME_LEN]; /* buffer to hold translated name */
 	int4		stat;		/* status */
@@ -106,7 +106,7 @@ int mu_op_open(mval *v, mval *p, int t, mval *mspace)
 	return (stat);
 }
 
-static bool mu_open_try(io_log_name *naml, io_log_name *tl, mval *pp, mval *mspace)
+static boolean_t mu_open_try(io_log_name *naml, io_log_name *tl, mval *pp, mval *mspace)
 {
 	boolean_t	ichset_specified, ochset_specified, filecreated = FALSE;
 	char		*buf, namebuf[LOGNAME_LEN + 1];
diff --git a/sr_unix/mu_op_open.h b/sr_unix/mu_op_open.h
index 7eacfb1..2638bfa 100755
--- a/sr_unix/mu_op_open.h
+++ b/sr_unix/mu_op_open.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	*
@@ -12,6 +13,6 @@
 #ifndef MU_OP_OPEN_INCLUDED
 #define MU_OP_OPEN_INCLUDED
 
-int mu_op_open(mval *v, mval *p, int t, mval *mspace);
+int mu_op_open(mval *v, mval *p, mval *t, mval *mspace);
 
 #endif /* MU_OP_OPEN_INCLUDED */
diff --git a/sr_unix/mu_rndwn_all.c b/sr_unix/mu_rndwn_all.c
index fa4bc07..2aea9d0 100755
--- a/sr_unix/mu_rndwn_all.c
+++ b/sr_unix/mu_rndwn_all.c
@@ -90,8 +90,11 @@ MBSTART {														\
 			SHMID, LEN_AND_STR(FNAME));									\
 } MBEND
 
-GBLREF gd_region        *gv_cur_region;
-GBLREF semid_queue_elem	*keep_semids;
+GBLREF	gd_region		*gv_cur_region;
+GBLREF	mval			dollar_zdir;
+GBLREF	semid_queue_elem	*keep_semids;
+GBLREF	uid_t			user_id;
+GBLREF	uint4			process_id;
 
 LITREF char             gtm_release_name[];
 LITREF int4             gtm_release_name_len;
@@ -102,6 +105,7 @@ error_def(ERR_MUFILRNDWNSUC);
 error_def(ERR_MUJPOOLRNDWNFL);
 error_def(ERR_MUJPOOLRNDWNSUC);
 error_def(ERR_MUNOTALLSEC);
+error_def(ERR_MURNDWNARGLESS);
 error_def(ERR_MURPOOLRNDWNFL);
 error_def(ERR_MURPOOLRNDWNSUC);
 error_def(ERR_SEMREMOVED);
@@ -197,6 +201,9 @@ int mu_rndwn_all(void)
 	char			*fname, *fgets_res;
 	shm_parms		*parm_buff;
 
+	/* Record the start of an argumentless MUPIP RUNDOWN with current directory info. Useful for debugging purposes */
+	send_msg_csa(CSA_ARG(NULL) VARLSTCNT(6) ERR_MURNDWNARGLESS, 4, process_id, user_id,
+									dollar_zdir.str.len, dollar_zdir.str.addr);
 	if (NULL == (pf = POPEN(IPCS_CMD_STR ,"r")))
         {
 		save_errno = errno;
diff --git a/sr_unix/mu_rndwn_file.c b/sr_unix/mu_rndwn_file.c
index e7dc5a1..5bcfa0b 100755
--- a/sr_unix/mu_rndwn_file.c
+++ b/sr_unix/mu_rndwn_file.c
@@ -532,7 +532,12 @@ boolean_t mu_rndwn_file(gd_region *reg, boolean_t standalone)
 			 * otherwise.
 			 */
 			need_statsdb_rundown = statsDBudi->grabbed_ftok_sem;
-			assert(!need_statsdb_rundown || !baseDBrundown_status);
+			/* Note: It is possible that need_statsdb_rundown is TRUE and baseDBrundown_status is also TRUE
+			 * in case the baseDB has already been run down but statsDB has not been rundown and
+			 * the gtm_statsdir env var used to create this statsDB is different from the current value of
+			 * the gtm_statsdir env var. Therefore continue running down the statsDB as long as that is
+			 * needed, irrespective of the rundown status of the baseDB.
+			 */
 			if (!need_statsdb_rundown)
 			{
 				mu_gv_cur_reg_free();
diff --git a/sr_unix/mu_rndwn_replpool.c b/sr_unix/mu_rndwn_replpool.c
old mode 100755
new mode 100644
index 8f0cf6b..e1d7992
--- a/sr_unix/mu_rndwn_replpool.c
+++ b/sr_unix/mu_rndwn_replpool.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	*
@@ -171,12 +171,7 @@ int     mu_rndwn_replpool2(replpool_identifier *replpool_id, repl_inst_hdr_ptr_t
 				 * "jnlpool.repl_inst_filehdr" as otherwise other routines (e.g. "repl_inst_recvpool_reset") are
 				 * affected by whether this is NULL or not.
 				 */
-				jnlpool.jnlpool_ctl = NULL;
-				jnlpool_ctl = NULL;
-				jnlpool.gtmsrc_lcl_array = NULL;
-				jnlpool.gtmsource_local_array = NULL;
-				jnlpool.jnldata_base = NULL;
-				jnlpool.repl_inst_filehdr = NULL;
+				JNLPOOL_CLEAR_FIELDS(jnlpool);
 			}
 		} /* else we are ONLINE ROLLBACK. repl_inst_flush_jnlpool will be done later after gvcst_init in mur_open_files */
 	}
@@ -231,12 +226,8 @@ int     mu_rndwn_replpool2(replpool_identifier *replpool_id, repl_inst_hdr_ptr_t
 			 */
 			if (argumentless_rundown)
 			{
-				JNLPOOL_SHMDT(status, save_errno);
+				JNLPOOL_SHMDT(jnlpool, status, save_errno);
 				assert(0 == status);	/* even if shmdt fails, there is not much we can do so move on in pro */
-				jnlpool.gtmsrc_lcl_array = NULL;
-				jnlpool.gtmsource_local_array = NULL;
-				jnlpool.jnldata_base = NULL;
-				jnlpool.repl_inst_filehdr = NULL;
 			}
 		}
 		if (RECVPOOL_SEGMENT == pool_type)
@@ -290,7 +281,7 @@ CONDITION_HANDLER(mu_rndwn_replpool_ch)
 {
 	unix_db_info		*udi;
 	int			status, save_errno;
-	repl_inst_hdr_ptr_t	inst_hdr;
+	int			jnlpool_shmid;
 
 	START_CH(TRUE);
 	PRN_ERROR; /* flush the error string */
@@ -305,22 +296,15 @@ CONDITION_HANDLER(mu_rndwn_replpool_ch)
 	 */
 	if ((NULL != jnlpool.jnlpool_ctl) && (!INST_FREEZE_ON_ERROR_POLICY || argumentless_rundown))
 	{
-		JNLPOOL_SHMDT(status, save_errno);
+		jnlpool_shmid = jnlpool.repl_inst_filehdr->jnlpool_shmid;
+		JNLPOOL_SHMDT(jnlpool, status, save_errno);
 		if (0 > status)
 		{
-			inst_hdr = jnlpool.repl_inst_filehdr;
-			assert(NULL != inst_hdr);
 			assert(NULL != jnlpool.jnlpool_dummy_reg);
 			udi = FILE_INFO(jnlpool.jnlpool_dummy_reg);
 			assert(ERR_REPLINSTOPEN == SIGNAL); /* only reason we know why mu_rndwn_replpool can fail */
-			assert(NULL != jnlpool.jnlpool_ctl);
-			assert(INVALID_SHMID != inst_hdr->jnlpool_shmid);
-			ISSUE_REPLPOOLINST(save_errno, inst_hdr->jnlpool_shmid, udi->fn, "shmdt()");
+			ISSUE_REPLPOOLINST(save_errno, jnlpool_shmid, udi->fn, "shmdt()");
 		}
-		jnlpool.gtmsrc_lcl_array = NULL;
-		jnlpool.gtmsource_local_array = NULL;
-		jnlpool.jnldata_base = NULL;
-		jnlpool.repl_inst_filehdr = NULL;
 	}
 	UNWIND(NULL, NULL);
 }
diff --git a/sr_unix/mu_truncate.c b/sr_unix/mu_truncate.c
index 397f476..35dca1e 100644
--- a/sr_unix/mu_truncate.c
+++ b/sr_unix/mu_truncate.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	*
@@ -378,7 +378,7 @@ boolean_t mu_truncate(int4 truncate_percent)
 		else
 		{
 			if (0 == jpc->pini_addr)
-				jnl_put_jrt_pini(csa);
+				jnl_write_pini(csa);
 			jnl_write_trunc_rec(csa, old_total, csa->ti->free_blocks, new_total);
 			inctn_opcode = inctn_mu_reorg;
 			jnl_write_inctn_rec(csa);
diff --git a/sr_unix/mubfilcpy.c b/sr_unix/mubfilcpy.c
index 8e48952..fe0ce57 100755
--- a/sr_unix/mubfilcpy.c
+++ b/sr_unix/mubfilcpy.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	*
@@ -420,8 +420,13 @@ bool	mubfilcpy (backup_reg_list *list)
 				CLEANUP_AND_RETURN_FALSE;
 			}
 			if (counter & 0xF)
+			{
+#				ifdef DEBUG
+				if (WBTEST_ENABLED(WBTEST_FORCE_SHMPLRECOV)) /* Fake shmpool_blocked */
+					cs_addrs->shmpool_buffer->shmpool_blocked = TRUE;
+#				endif
 				wcs_sleep(counter);
-			else
+			} else
 			{	/* Force recovery every few retries - this should not be happening */
 				if (FALSE == shmpool_lock_hdr(gv_cur_region))
 				{
diff --git a/sr_unix/mubinccpy.c b/sr_unix/mubinccpy.c
index f8a84a4..b7410a2 100755
--- a/sr_unix/mubinccpy.c
+++ b/sr_unix/mubinccpy.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	*
@@ -544,8 +544,13 @@ bool	mubinccpy (backup_reg_list *list)
 				CLEANUP_AND_RETURN_FALSE;
 			}
 			if (counter & 0xF)
+			{
+#				ifdef DEBUG
+				if (WBTEST_ENABLED(WBTEST_FORCE_SHMPLRECOV)) /* Fake shmpool_blocked */
+					cs_addrs->shmpool_buffer->shmpool_blocked = TRUE;
+#				endif
 				wcs_sleep(counter);
-			else
+			} else
 			{	/* Force shmpool recovery to see if it can find the lost blocks */
 				if (!shmpool_lock_hdr(gv_cur_region))
 				{
diff --git a/sr_unix/mupip.c b/sr_unix/mupip.c
old mode 100755
new mode 100644
index b680d5a..0c8f013
--- a/sr_unix/mupip.c
+++ b/sr_unix/mupip.c
@@ -47,7 +47,6 @@
 #include "lke.h"
 #include "gtm_startup_chk.h"
 #include "generic_signal_handler.h"
-#include "init_secshr_addrs.h"
 #include "mu_op_open.h"
 #include "cli_parse.h"
 #include "getzdir.h"
@@ -70,7 +69,7 @@
 GBLREF	u_casemap_t 		gtm_strToTitle_ptr;		/* Function pointer for gtm_strToTitle */
 #endif
 
-GBLREF	int			(*op_open_ptr)(mval *v, mval *p, int t, mval *mspace);
+GBLREF	int			(*op_open_ptr)(mval *v, mval *p, mval *t, mval *mspace);
 GBLREF	bool			in_backup;
 GBLREF	bool			licensed;
 GBLREF	int			(*func)();
diff --git a/sr_unix/mupip_rundown.c b/sr_unix/mupip_rundown.c
old mode 100755
new mode 100644
index 2d92d42..368e0bd
--- a/sr_unix/mupip_rundown.c
+++ b/sr_unix/mupip_rundown.c
@@ -15,6 +15,7 @@
 #include <sys/shm.h>
 #include "gtm_string.h"
 #include "gtm_inet.h"
+#include "gtm_ipc.h"
 
 #include "stp_parms.h"
 #include "gdsroot.h"
@@ -52,7 +53,6 @@
 #include "mu_rndwn_repl_instance.h"
 #include "util.h"
 #include "anticipatory_freeze.h"
-#include "gtm_ipc.h"
 #include "repl_sem.h"
 #include "ftok_sems.h"
 #include "ipcrmid.h"
@@ -164,11 +164,7 @@ void mupip_rundown(void)
 					if ((NULL != jnlpool_ctl) && !anticipatory_freeze_available)
 					{
 						shmid = jnlpool.repl_inst_filehdr->jnlpool_shmid;
-						JNLPOOL_SHMDT(status, save_errno);
-						jnlpool.gtmsrc_lcl_array = NULL;
-						jnlpool.repl_inst_filehdr = NULL;
-						jnlpool.gtmsource_local_array = NULL;
-						jnlpool.jnldata_base = NULL;
+						JNLPOOL_SHMDT(jnlpool, status, save_errno);
 						if (0 > status)
 						{
 							ISSUE_REPLPOOLINST(save_errno, shmid, instfilename, "shmdt()");
@@ -216,11 +212,7 @@ void mupip_rundown(void)
 			semid = jnlpool.repl_inst_filehdr->jnlpool_semid;
 			shmid = jnlpool.repl_inst_filehdr->jnlpool_shmid;
 			/* Detach from the journal pool */
-			JNLPOOL_SHMDT(status, save_errno);
-			jnlpool.gtmsrc_lcl_array = NULL;
-			jnlpool.repl_inst_filehdr = NULL;
-			jnlpool.gtmsource_local_array = NULL;
-			jnlpool.jnldata_base = NULL;
+			JNLPOOL_SHMDT(jnlpool, status, save_errno);
 			if (0 > status)
 			{
 				ISSUE_REPLPOOLINST(save_errno, shmid, instfilename, "shmdt()");
diff --git a/sr_unix/mupip_set_file.c b/sr_unix/mupip_set_file.c
index 167cde8..084ed4f 100644
--- a/sr_unix/mupip_set_file.c
+++ b/sr_unix/mupip_set_file.c
@@ -175,7 +175,7 @@ int4 mupip_set_file(int db_fn_len, char *db_fn)
 			}
 		} else
 		{
-			gtm_putmsg_csa(CSA_ARG(NULL) VARLSTCNT(4) ERR_SETQUALPROB, LEN_AND_LIT("EXTENSION COUNT"));
+			gtm_putmsg_csa(CSA_ARG(NULL) VARLSTCNT(4) ERR_SETQUALPROB, 2, LEN_AND_LIT("EXTENSION COUNT"));
 			exit_stat |= EXIT_ERR;
 		}
 	}
@@ -197,7 +197,7 @@ int4 mupip_set_file(int db_fn_len, char *db_fn)
 			}
 		} else
 		{
-			gtm_putmsg_csa(CSA_ARG(NULL) VARLSTCNT(4) ERR_SETQUALPROB, LEN_AND_LIT("GLOBAL_BUFFERS"));
+			gtm_putmsg_csa(CSA_ARG(NULL) VARLSTCNT(4) ERR_SETQUALPROB, 2, LEN_AND_LIT("GLOBAL_BUFFERS"));
 			exit_stat |= EXIT_ERR;
 		}
 		need_standalone = TRUE;
@@ -221,7 +221,7 @@ int4 mupip_set_file(int db_fn_len, char *db_fn)
 			}
 		} else
 		{
-			gtm_putmsg_csa(CSA_ARG(NULL) VARLSTCNT(4) ERR_SETQUALPROB, LEN_AND_LIT("KEY_SIZE"));
+			gtm_putmsg_csa(CSA_ARG(NULL) VARLSTCNT(4) ERR_SETQUALPROB, 2, LEN_AND_LIT("KEY_SIZE"));
 			exit_stat |= EXIT_ERR;
 		}
 		need_standalone = TRUE;
@@ -246,7 +246,7 @@ int4 mupip_set_file(int db_fn_len, char *db_fn)
 			}
 		} else
 		{
-			gtm_putmsg_csa(CSA_ARG(NULL) VARLSTCNT(4) ERR_SETQUALPROB, LEN_AND_LIT("LOCK_SPACE"));
+			gtm_putmsg_csa(CSA_ARG(NULL) VARLSTCNT(4) ERR_SETQUALPROB, 2, LEN_AND_LIT("LOCK_SPACE"));
 			exit_stat |= EXIT_ERR;
 		}
 		need_standalone = TRUE;
@@ -268,7 +268,7 @@ int4 mupip_set_file(int db_fn_len, char *db_fn)
 			}
 		} else
 		{
-			gtm_putmsg_csa(CSA_ARG(NULL) VARLSTCNT(4) ERR_SETQUALPROB, LEN_AND_LIT("MUTEX_SLOTS"));
+			gtm_putmsg_csa(CSA_ARG(NULL) VARLSTCNT(4) ERR_SETQUALPROB, 2, LEN_AND_LIT("MUTEX_SLOTS"));
 			exit_stat |= EXIT_ERR;
 		}
 		need_standalone = TRUE;
@@ -287,7 +287,7 @@ int4 mupip_set_file(int db_fn_len, char *db_fn)
 			}
 		} else
 		{
-			gtm_putmsg_csa(CSA_ARG(NULL) VARLSTCNT(4) ERR_SETQUALPROB, LEN_AND_LIT("RECORD_SIZE"));
+			gtm_putmsg_csa(CSA_ARG(NULL) VARLSTCNT(4) ERR_SETQUALPROB, 2, LEN_AND_LIT("RECORD_SIZE"));
 			exit_stat |= EXIT_ERR;
 		}
 		need_standalone = TRUE;
@@ -296,7 +296,7 @@ int4 mupip_set_file(int db_fn_len, char *db_fn)
 	{
 		if (!cli_get_int("RESERVED_BYTES", &reserved_bytes))
 		{
-			gtm_putmsg_csa(CSA_ARG(NULL) VARLSTCNT(4) ERR_SETQUALPROB, LEN_AND_LIT("RESERVED_BYTES"));
+			gtm_putmsg_csa(CSA_ARG(NULL) VARLSTCNT(4) ERR_SETQUALPROB, 2, LEN_AND_LIT("RESERVED_BYTES"));
 			exit_stat |= EXIT_ERR;
 		}
 		need_standalone = TRUE;
@@ -314,7 +314,7 @@ int4 mupip_set_file(int db_fn_len, char *db_fn)
 			}
 		} else
 		{
-			gtm_putmsg_csa(CSA_ARG(NULL) VARLSTCNT(4) ERR_SETQUALPROB, LEN_AND_LIT("SLEEP_SPIN_COUNT"));
+			gtm_putmsg_csa(CSA_ARG(NULL) VARLSTCNT(4) ERR_SETQUALPROB, 2, LEN_AND_LIT("SLEEP_SPIN_COUNT"));
 			exit_stat |= EXIT_ERR;
 		}
 	}
@@ -327,8 +327,7 @@ int4 mupip_set_file(int db_fn_len, char *db_fn)
 				gtm_putmsg_csa(CSA_ARG(NULL) VARLSTCNT(6) ERR_MUPIPSET2BIG, 4, new_spin_sleep,
 					LEN_AND_LIT("SPIN_SLEEP_LIMIT"), MAX_SPIN_SLEEP);
 				exit_stat |= EXIT_ERR;
-			}
-			if (new_spin_sleep)
+			} else if (new_spin_sleep)
 			{	/* find the power of 2 equal to or greater than the value */
 				for (spin_sleep_status = 2; spin_sleep_status < new_spin_sleep; spin_sleep_status <<= 1)
 					;
@@ -336,7 +335,7 @@ int4 mupip_set_file(int db_fn_len, char *db_fn)
 			}
 		} else
 		{
-			gtm_putmsg_csa(CSA_ARG(NULL) VARLSTCNT(4) ERR_SETQUALPROB, LEN_AND_LIT("SPIN_SLEEP_LIMIT"));
+			gtm_putmsg_csa(CSA_ARG(NULL) VARLSTCNT(4) ERR_SETQUALPROB, 2, LEN_AND_LIT("SPIN_SLEEP_LIMIT"));
 			exit_stat |= EXIT_ERR;
 		}
 	}
@@ -367,7 +366,7 @@ int4 mupip_set_file(int db_fn_len, char *db_fn)
 			need_standalone = TRUE;
 		} else
 		{
-			gtm_putmsg_csa(CSA_ARG(NULL) VARLSTCNT(4) ERR_SETQUALPROB, LEN_AND_LIT("WAIT_DISK"));
+			gtm_putmsg_csa(CSA_ARG(NULL) VARLSTCNT(4) ERR_SETQUALPROB, 2, LEN_AND_LIT("WAIT_DISK"));
 			exit_stat |= EXIT_ERR;
 		}
 	}
@@ -492,7 +491,7 @@ int4 mupip_set_file(int db_fn_len, char *db_fn)
 						pvt_csd->defer_time = defer_time;
 					} else
 					{
-						gtm_putmsg_csa(CSA_ARG(NULL) VARLSTCNT(4) ERR_SETQUALPROB,
+						gtm_putmsg_csa(CSA_ARG(NULL) VARLSTCNT(4) ERR_SETQUALPROB, 2,
 							LEN_AND_LIT("DEFER_TIME"));
 						reg_exit_stat |= EXIT_WRN;
 					}
diff --git a/sr_unix/mupip_trigger.c b/sr_unix/mupip_trigger.c
index ade9b07..69a3630 100644
--- a/sr_unix/mupip_trigger.c
+++ b/sr_unix/mupip_trigger.c
@@ -35,6 +35,7 @@
 #include "targ_alloc.h"
 #include "gvcst_protos.h"
 #include "trigger_upgrade_protos.h"
+#include "restrict.h"
 
 GBLREF	gd_addr		*gd_header;
 GBLREF	boolean_t	is_replicator;
@@ -43,6 +44,7 @@ error_def(ERR_INVSTRLEN);
 error_def(ERR_MUNOACTION);
 error_def(ERR_MUPCLIERR);
 error_def(ERR_NOSELECT);
+error_def(ERR_RESTRICTEDOP);
 error_def(ERR_TRIGMODREGNOTRW);
 
 void mupip_trigger(void)
@@ -72,6 +74,11 @@ void mupip_trigger(void)
 			util_out_print("Missing input file name", TRUE);
 			mupip_exit(ERR_MUPCLIERR);
 		}
+		if (RESTRICTED(trigger_mod))
+		{
+			gtm_putmsg_csa(CSA_ARG(NULL) VARLSTCNT(3) ERR_RESTRICTEDOP, 1, "MUPIP TRIGGER -TRIGGERFILE");
+			mupip_exit(ERR_MUNOACTION);
+		}
 		is_replicator = TRUE;
 		TREF(ok_to_see_statsdb_regs) = TRUE;
 		gvinit();
@@ -105,6 +112,11 @@ void mupip_trigger(void)
 	}
 	if (CLI_PRESENT == cli_present("UPGRADE"))
 	{	/* Invoke MUPIP TRIGGER -UPGRADE */
+		if (RESTRICTED(trigger_mod))
+		{
+			gtm_putmsg_csa(CSA_ARG(NULL) VARLSTCNT(3) ERR_RESTRICTEDOP, 1, "MUPIP TRIGGER -UPGRADE");
+			mupip_exit(ERR_MUNOACTION);
+		}
 		gvinit();
 		DEBUG_ONLY(TREF(in_trigger_upgrade) = TRUE;)
 		for (reg = gd_header->regions, reg_top = reg + gd_header->n_regions; reg < reg_top; reg++)
diff --git a/sr_unix/mur_cre_file_extfmt.c b/sr_unix/mur_cre_file_extfmt.c
index 13d68f8..7e17151 100755
--- a/sr_unix/mur_cre_file_extfmt.c
+++ b/sr_unix/mur_cre_file_extfmt.c
@@ -56,11 +56,13 @@
 
 GBLREF 	mur_gbls_t	murgbl;
 GBLREF	mur_opt_struct	mur_options;
-GBLREF	int		(*op_open_ptr)(mval *v, mval *p, int t, mval *mspace);
+GBLREF	int		(*op_open_ptr)(mval *v, mval *p, mval *t, mval *mspace);
 GBLREF	mur_shm_hdr_t	*mur_shm_hdr;	/* Pointer to mur_forward-specific header in shared memory */
 GBLREF	reg_ctl_list	*mur_ctl;
 GBLREF	readonly char 	*ext_file_type[];
 
+LITREF	mval		literal_zero;
+
 error_def(ERR_FILECREATE);
 error_def(ERR_FILENAMETOOLONG);
 error_def(ERR_FILENOTCREATE);
@@ -232,7 +234,7 @@ int4 mur_cre_file_extfmt(jnl_ctl_list *jctl, int recstat)
 		op_val.mvtype = MV_STR;
 		op_val.str.len = file_info->fn_len;
 		op_val.str.addr = (char *)file_info->fn;
-		if ((status = (*op_open_ptr)(&op_val, &op_pars, 0, NULL)) == 0)
+		if ((status = (*op_open_ptr)(&op_val, &op_pars, (mval *)&literal_zero, NULL)) == 0)
 		{
 			gtm_putmsg_csa(CSA_ARG(NULL) VARLSTCNT(7) MAKE_MSG_ERROR(ERR_FILENOTCREATE), 4,
 					LEN_AND_STR(ext_file_type[recstat]), file_info->fn_len, file_info->fn, errno);
diff --git a/sr_unix/mutex.c b/sr_unix/mutex.c
old mode 100755
new mode 100644
index 1ab0f56..1bbc3ae
--- a/sr_unix/mutex.c
+++ b/sr_unix/mutex.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	*
@@ -24,7 +24,7 @@
 #include "gtm_un.h"
 
 #include <errno.h>
-#if defined(__sparc) || defined(__hpux) || defined(__MVS__) || defined(__linux__) || defined(__CYGWIN__)
+#if defined(__MVS__) || defined(__linux__) || defined(__CYGWIN__)
 #include "gtm_limits.h"
 #else
 #include <sys/limits.h>
@@ -67,21 +67,6 @@
 #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.
- * This is possible if the csa corresponds to the journal pool where there is no notion of a db hdr.
- * In that case, we skip invoking the * macros.
- */
-#define	PROBE_SET_TRACEABLE_VAR(CSA, VALUE)					\
-{										\
-	sgmnt_data_ptr_t	lcl_csd;					\
-										\
-	lcl_csd = CSA->hdr;							\
-	assert((NULL != lcl_csd)						\
-		|| (CSA == &FILE_INFO(jnlpool.jnlpool_dummy_reg)->s_addrs));	\
-	if (NULL != lcl_csd)							\
-		SET_TRACEABLE_VAR(CSA->nl->wc_blocked, TRUE);			\
-}
-
 #define	PROBE_BG_TRACE_PRO_ANY(CSA, EVENT)					\
 {										\
 	sgmnt_data_ptr_t	lcl_csd;					\
@@ -971,45 +956,226 @@ void mutex_seed_init(void)
 
 void mutex_salvage(gd_region *reg)
 {
-	sgmnt_addrs	*csa;
-	int		salvage_status;
-	uint4		holder_pid, onln_rlbk_pid;
-	boolean_t	mutex_salvaged;
-	VMS_ONLY(uint4	holder_imgcnt;)
+	sgmnt_addrs		*csa;
+	int			index1, index2, orig_index2, salvage_status;
+	uint4			holder_pid, onln_rlbk_pid, start_freeaddr, orig_freeaddr;
+	boolean_t		mutex_salvaged;
+	sgmnt_data_ptr_t	csd;
+	jnlpool_ctl_ptr_t	jpl;
+	jpl_phase2_in_prog_t	*lastJplCmt;
+	jbuf_phase2_in_prog_t	*lastJbufCmt;
+	node_local		*cnl;
+	seq_num			jnl_seqno, strm_seqno, strmSeqno60;
+	int			strmIndex;
+	jnl_buffer_ptr_t	jbp;
 	DCL_THREADGBL_ACCESS;
 
 	SETUP_THREADGBL_ACCESS;
 	csa = &FILE_INFO(reg)->s_addrs;
+	cnl = csa->nl;
 	if (0 != (holder_pid = csa->critical->semaphore.u.parts.latch_pid))
 	{
 		mutex_salvaged = FALSE;
-		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;
-			/* Mutex crash repaired, want to do write cache recovery, just in case.
-			 * Take care not to do it for jnlpool which has no concept of a db cache.
-			 * In that case csa->hdr is NULL so use PROBE_SET_TRACEABLE_VAR macro.
-			 */
-			PROBE_SET_TRACEABLE_VAR(csa, TRUE);
-			mutex_salvaged = TRUE;
-			MUTEX_DPRINT2("%d : mutex salvaged, culprit was our own process\n", process_id);
-		} else if (!is_proc_alive(holder_pid, UNIX_ONLY(0) VMS_ONLY(holder_imgcnt)))
-		{	/* Release the COMPSWAP lock AFTER setting csa->nl->in_crit to 0 as an assert in
-			 * grab_crit (checking that csa->nl->in_crit is 0) relies on this order.
+		/* If we were trying to obtain a lock we already held, it is an out-of-design situation. We cannot safely
+		 * release the lock in that case so create a core file even in pro.
+		 */
+		assertpro(holder_pid != process_id);
+		if (!is_proc_alive(holder_pid, 0))
+		{	/* Release the COMPSWAP lock AFTER setting cnl->in_crit to 0 as an assert in
+			 * grab_crit (checking that cnl->in_crit is 0) relies on this order.
 			 */
 			send_msg_csa(CSA_ARG(csa) VARLSTCNT(5) ERR_MUTEXFRCDTERM, 3, holder_pid, REG_LEN_STR(reg));
-			csa->nl->in_crit = 0;
+			cnl->in_crit = 0;
 			/* Mutex crash repaired, want to do write cache recovery, 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
 			 * GTMASSERTs in PIN_CACHE_RECORD macro in t_end/tp_tend.				BYPASSOK(GTMASSERT)
-			 * Take care not to do it for jnlpool which has no concept of a db cache.
-			 * In that case csa->hdr is NULL so use PROBE_SET_TRACEABLE_VAR macro.
+			 * Take care not to do it for jnlpool (csa->hdr is NULL in that case) which has no concept of a db cache.
 			 */
-			PROBE_SET_TRACEABLE_VAR(csa, TRUE);
+			csd = csa->hdr;
+			assert((NULL != csd) || (csa == &FILE_INFO(jnlpool.jnlpool_dummy_reg)->s_addrs));
+			if (NULL == csd)
+			{	/* This is a jnlpool. Check if a process in t_end/tp_tend was killed BEFORE
+				 * it incremented jpl->jnl_seqno. If so, undo any changes done in UPDATE_JPL_RSRV_WRITE_ADDR.
+				 */
+				jpl = jnlpool.jnlpool_ctl;
+				assert(NULL != jpl);
+				index1 = jpl->phase2_commit_index1;
+				index2 = jpl->phase2_commit_index2;
+				orig_index2 = index2;
+				assert(jpl->write_addr <= jpl->rsrv_write_addr);
+				DECR_PHASE2_COMMIT_INDEX(index2, JPL_PHASE2_COMMIT_ARRAY_SIZE);
+				lastJplCmt = &jpl->phase2_commit_array[index2];
+				/* This process could have been killed during a commit in t_end/tp_tend.
+				 *	a) In the middle of Step CMT03 (see secshr_db_clnup.c for CMTxx steps)
+				 *		UPDATE_JPL_RSRV_WRITE_ADDR macro OR
+				 *	b) After Step CMT03 but before Step CMT07 finished.
+				 * In either case, we need to reset jpl to what it was BEFORE Step CMT03 began i.e. roll back.
+				 * If the process gets killed AFTER CMT07 finishes, the transaction is rolled forward even
+				 *	if it means writing JRT_NULL and/or JRT_INCTN records in jnlpool and/or jnlbuff.
+				 * Note that there is still a small window of instructions after CMT07 is done but before
+				 *	CMT08 is done (for the first region in case of a multi-region TP transaction) if
+				 *	a process gets killed, we will roll forward the jnlpool but roll back the jnlbuff
+				 *	and so there would be a seqno with no corresponding journal records in the journal
+				 *	files. This is not easily handled so is left as a todo for the future.
+				 */
+				if ((index1 == orig_index2) || (lastJplCmt->process_id != holder_pid))
+				{	/* CMT02 < killed <= CMT03.
+					 * Kill could have happened before CMT03 finished so reset things.
+					 * This reset is a no-op if the kill happened even before CMT03 started.
+					 * This is Case (a).
+					 */
+					jpl->rsrv_write_addr = lastJplCmt->start_write_addr + lastJplCmt->tot_jrec_len;
+					assert(((lastJplCmt->jnl_seqno + 1) == jpl->jnl_seqno) || !lastJplCmt->jnl_seqno);
+					jpl->lastwrite_len = lastJplCmt->tot_jrec_len;
+				} else
+				{
+					assert((lastJplCmt->jnl_seqno == jpl->jnl_seqno)
+						|| ((lastJplCmt->jnl_seqno + 1) == jpl->jnl_seqno));
+					if (lastJplCmt->jnl_seqno == jpl->jnl_seqno)
+					{	/* CMT03 < killed < CMT07 */
+						jpl->rsrv_write_addr = lastJplCmt->start_write_addr;
+						jpl->lastwrite_len = lastJplCmt->prev_jrec_len;
+						SHM_WRITE_MEMORY_BARRIER; /* similar layout as UPDATE_JPL_RSRV_WRITE_ADDR */
+						jpl->phase2_commit_index2 = index2;	/* remove last commit entry */
+					}
+					/* else : CMT07 < killed and so no rollback needed */
+				}
+			} else
+			{	/* This is a database shm. Check if a process in t_end/tp_tend was killed BEFORE
+				 * Step CMT08 (see secshr_db_clnup.c) when it would have set cnl->update_underway_tn.
+				 * If so, undo any changes done in Step CMT06 (UPDATE_JBP_RSRV_FREEADDR).
+				 * Effectively rolling back the aborted commit in this region.
+				 */
+				assert((csd->trans_hist.early_tn == csd->trans_hist.curr_tn)
+					|| (csd->trans_hist.early_tn == (csd->trans_hist.curr_tn + 1)));
+				assert(cnl->update_underway_tn <= csd->trans_hist.curr_tn);
+				assert(csd->trans_hist.early_tn >= cnl->update_underway_tn);
+				if (JNL_ENABLED(csd) && (csd->trans_hist.early_tn != csd->trans_hist.curr_tn))
+				{	/* i.e. Process was killed after CMT04 but before CMT12. It is represented as
+					 *	CMT04 < killed < CMT12
+					 */
+					assert(NULL != csa->jnl);
+					assert(NULL != csa->jnl->jnl_buff);
+					jbp = csa->jnl->jnl_buff;
+					index1 = jbp->phase2_commit_index1;
+					index2 = jbp->phase2_commit_index2;
+					orig_index2 = index2;
+					assert(jbp->freeaddr <= jbp->rsrv_freeaddr);
+					DECR_PHASE2_COMMIT_INDEX(index2, JNL_PHASE2_COMMIT_ARRAY_SIZE);
+					lastJbufCmt = &jbp->phase2_commit_array[index2];
+					if (cnl->update_underway_tn != csd->trans_hist.curr_tn)
+					{	/* CMT04 < killed < CMT08.
+						 * ----------------------------------------------------------------
+						 * Roll-back the entire transaction's effect on this database file
+						 * ----------------------------------------------------------------
+						 */
+						start_freeaddr = lastJbufCmt->start_freeaddr;
+						if ((index1 == orig_index2) || (lastJbufCmt->process_id != holder_pid))
+						{	/* CMT04 < KILLED <= CMT06.
+							 * Kill could have happened before CMT06 finished so reset things.
+							 * This reset is a no-op if the kill happened even before CMT06 started.
+							 */
+							SET_JBP_RSRV_FREEADDR(jbp, start_freeaddr + lastJbufCmt->tot_jrec_len);
+						} else
+						{	/* CMTO6 < killed < CMT08 */
+							assert(lastJbufCmt->curr_tn == csd->trans_hist.curr_tn);
+							/* CMT06 finished. So undo it as a whole */
+							assert(lastJbufCmt->process_id == holder_pid);
+							/* If CMT06a was in progress when the process was KILLED, then it is
+							 * possible jbp->freeaddr was updated as CMT16 (which is what CMT06a
+							 * executes) progressed. So undo that too. Likewise for dskaddr,
+							 * fsync_dskaddr etc. And finally reset rsrv_freeaddr.
+							 */
+							assert(jbp->fsync_dskaddr <= jbp->dskaddr);
+							orig_freeaddr = jbp->freeaddr;
+							if (orig_freeaddr > start_freeaddr)
+							{
+								jbp->freeaddr = start_freeaddr;
+								jbp->free = start_freeaddr % jbp->size;
+							} else
+								assert(jbp->free == (orig_freeaddr % jbp->size));
+							if (jbp->dskaddr > start_freeaddr)
+							{
+								assert(!GLOBAL_LATCH_HELD_BY_US(&jbp->io_in_prog_latch));
+								grab_latch(&jbp->io_in_prog_latch, GRAB_LATCH_INDEFINITE_WAIT);
+								/* Fix jbp->dskaddr & jbp->dsk while holding io latch */
+								assert(orig_freeaddr > start_freeaddr);
+								jbp->dskaddr = start_freeaddr;
+								jbp->dsk = start_freeaddr % jbp->size;
+								/* Setting jbp->dskaddr to start_freeaddr is not enough.
+								 * We also need to re-read the partial filesystem-block-size
+								 * aligned block of data that precedes the new jbp->dskaddr
+								 * since that part is most likely no longer in the jnl buffer
+								 * (have been overwritten by the current aborted tn's jnl records).
+								 * We can try and optimize this by avoiding setting
+								 * jbp->re_read_dskaddr in case no overwrite happened. But it is
+								 * not straightforward to detect that and the risk is journal
+								 * file corruption. Given "mutex_salvage" is a rare occurrence,
+								 * it is safer to re-read unconditionally.
+								 */
+								jbp->re_read_dskaddr = start_freeaddr;
+								rel_latch(&jbp->io_in_prog_latch);
+								if (jbp->fsync_dskaddr > start_freeaddr)
+								{	/* Fix jbp->fsync_dskaddr while holding fsync io latch */
+									assert(!GLOBAL_LATCH_HELD_BY_US(&jbp->fsync_in_prog_latch));
+									grab_latch(&jbp->fsync_in_prog_latch,
+											GRAB_LATCH_INDEFINITE_WAIT);
+									jbp->fsync_dskaddr = start_freeaddr;
+									rel_latch(&jbp->fsync_in_prog_latch);
+								}
+							} else
+								assert(jbp->dsk == (jbp->dskaddr % jbp->size));
+							/* "jnl_write_phase2" is never called with JRT_EPOCH (see assert there
+							 * at function entry of possible rectype values and EPOCH is not in that
+							 * list). Therefore we are guaranteed a "jnl_write_epoch_rec" call never
+							 * happened since the first call to "jnl_write_reserve" happened in this
+							 * transaction. Therefore no UNDO of the effects of "jnl_write_epoch_rec"
+							 * needed here (e.g. jbp->post_epoch_freeaddr).
+							 */
+							assert(jbp->post_epoch_freeaddr <= start_freeaddr);
+							SET_JBP_RSRV_FREEADDR(jbp, start_freeaddr);
+							SHM_WRITE_MEMORY_BARRIER;	/* see corresponding
+											 * SHM_READ_MEMORY_BARRIER in
+											 * "jnl_phase2_cleanup".
+											 */
+							jbp->phase2_commit_index2 = index2; /* remove last commit entry */
+						}
+						csd->trans_hist.early_tn = csd->trans_hist.curr_tn;	/* Undo CMT04 */
+						/* CMT07 is jnlpool related, so no undo done here (in db mutex_salvage) for that */
+					} else
+					{	/* CMT08 < killed < CMT12.
+						 * -------------------------------------------------------------------
+						 * Roll-forward the entire transaction's effect on this database file
+						 * -------------------------------------------------------------------
+						 * In case process got killed before CMT09 occurred, redo it.
+						 * If the process got killed after CMT09, the below redo is a no-op.
+						 */
+						/* CMT09 redo : start */
+						jnl_seqno = lastJbufCmt->jnl_seqno + 1;
+						strm_seqno = lastJbufCmt->strm_seqno;
+						/* If "strm_seqno" is 0, we are guaranteed this is not a supplementary
+						 * instance (i.e. "supplementary" variable in t_end/tp_tend is FALSE).
+						 */
+						if (strm_seqno)
+						{
+							strmIndex = GET_STRM_INDEX(strm_seqno);
+							strmSeqno60 = GET_STRM_SEQ60(strm_seqno) + 1;
+						}
+						SET_REG_SEQNO(csa, jnl_seqno, strm_seqno, strmIndex, strmSeqno60, SKIP_ASSERT_TRUE);
+						/* CMT09 redo : end */
+						csd->trans_hist.curr_tn = csd->trans_hist.early_tn;	/* Redo CMT12 */
+					}
+				}
+				/* else: Step CMT04 did not happen OR Database is not journaled.
+				 *	 Nothing to undo in this db for Steps CMT01, CMT02 and CMT03.
+				 */
+				SET_TRACEABLE_VAR(cnl->wc_blocked, TRUE); /* This will ensure we call "wcs_recover" which
+									   * will recover CMT04 and other CMTxx steps.
+									   */
+			}
 			COMPSWAP_UNLOCK(&csa->critical->semaphore, holder_pid, holder_imgcnt, LOCK_AVAILABLE, 0);
 			mutex_salvaged = TRUE;
-			/* Reset jb->blocked as well if the holder_pid had it set */
+			/* Reset jbp->blocked as well if the holder_pid had it set */
 			if ((NULL != csa->jnl) && (NULL != csa->jnl->jnl_buff) && (csa->jnl->jnl_buff->blocked == holder_pid))
 				csa->jnl->jnl_buff->blocked = 0;
 			MUTEX_DPRINT3("%d : mutex salvaged, culprit was %d\n", process_id, holder_pid);
@@ -1028,7 +1194,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);
+			SET_TRACEABLE_VAR(cnl->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.
 								   */
@@ -1052,7 +1218,7 @@ void	mutex_per_process_init(void)
 	mutex_seed_init();
 #	ifndef MUTEX_MSEM_WAKE
 	if (mutex_per_process_init_pid)
-	{	/* Close socket opened by the first call. But dont delete the socket file as the parent process will do that. */
+	{	/* Close socket opened by the first call. But don't delete the socket file as the parent process will do that. */
 		assert(FD_INVALID != mutex_sock_fd);
 		if (FD_INVALID != mutex_sock_fd)
 			CLOSEFILE_RESET(mutex_sock_fd, status);	/* resets "mutex_sock_fd" to FD_INVALID */
diff --git a/sr_unix/ojstartchild.c b/sr_unix/ojstartchild.c
index f54111e..86c2dca 100644
--- a/sr_unix/ojstartchild.c
+++ b/sr_unix/ojstartchild.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	*
@@ -81,21 +81,11 @@ GBLREF	int			sys_nerr;
 #endif
 #endif
 
-#ifdef	__osf__
-/* environ is from the O/S which only uses 64-bit pointers on OSF/1. */
-#pragma	pointer_size (save)
-#pragma pointer_size (long)
-#endif
-
 GBLREF char		**environ;
 GBLREF char		gtm_dist[GTM_PATH_MAX];
 GBLREF boolean_t	gtm_dist_ok_to_use;
 LITREF gtmImageName	gtmImageNames[];
 
-#ifdef	__osf__
-#pragma pointer_size (restore)
-#endif
-
 #define MAX_MUMPS_EXE_PATH_LEN	8192
 #define MAX_PATH		 128	/* Maximum file path length */
 #define MAX_LAB_LEN		  32	/* Maximum Label string length */
@@ -115,7 +105,7 @@ LITREF gtmImageName	gtmImageNames[];
 {											\
 	if (-1 != (RET_VAL = kill(PROCESS_ID, SIGNAL)))					\
 	{										\
-		/* reap the just killed child, so there wont be any zombies */		\
+		/* reap the just killed child, so there won't be any zombies */		\
 		WAITPID(PROCESS_ID, &wait_status, 0, done_pid);				\
 		assert(done_pid == PROCESS_ID);						\
 	}										\
@@ -139,6 +129,7 @@ LITREF gtmImageName	gtmImageNames[];
 	job_errno = errno;										\
 	DOWRITERC(pipe_fd, &job_errno, SIZEOF(job_errno), pipe_status);					\
 	ARLINK_ONLY(relinkctl_rundown(FALSE, FALSE));	/* do not decrement counters, just shmdt */	\
+	assert(FALSE);											\
 	UNDERSCORE_EXIT(joberr);									\
 }
 
@@ -149,6 +140,7 @@ LITREF gtmImageName	gtmImageNames[];
 	job_errno = errno;										\
 	DOWRITERC(pipe_fds[1], &job_errno, SIZEOF(job_errno), pipe_status);				\
 	ARLINK_ONLY(relinkctl_rundown(FALSE, FALSE));	/* do not decrement counters, just shmdt */	\
+	assert(FALSE);											\
 	UNDERSCORE_EXIT(joberr);									\
 }
 
@@ -194,7 +186,7 @@ static CONDITION_HANDLER(middle_child)
 	UNDERSCORE_EXIT(joberr);
 }
 
-/* Following condition handles the rts_error occurred in the grandchild before doing execv(). Sinec we have not started executing
+/* Following condition handles the rts_error occurred in the grandchild before doing execv(). Since we have not started executing
  * M-cmd specified as a part of JOB command, it is enough to print the error and exit.
  */
 static CONDITION_HANDLER(grand_child)
@@ -222,8 +214,10 @@ STATICFNDEF void job_term_handler(int sig)
 		if (0 == ret)
 			return;
 		else if (0 > ret)
+		{
+			assert(FALSE);
 			UNDERSCORE_EXIT(exit_status);
-		else
+		} else
 			return;
 }
 
@@ -371,18 +365,10 @@ int ojstartchild (job_params_type *jparms, int argcnt, boolean_t *non_exit_retur
 	job_arg_count_msg	arg_count;
 	job_arg_msg		arg_msg;
 	job_buffer_size_msg	buffer_size;
-#	ifdef	__osf__
-		/* These must be O/S-compatible 64-bit pointers for OSF/1.  */
-#		pragma	pointer_size (save)
-#		pragma pointer_size (long)
-#	endif
-	char		*c1, *c2, **c3;
-	char		*argv[4];
-	char		**env_ary, **env_ind;
-	char		**new_env_cur, **new_env_top, **old_env_cur, **old_env_top, *env_end;
-#	ifdef	__osf__
-#		pragma pointer_size (restore)
-#	endif
+	char			*c1, *c2, **c3;
+	char			*argv[4];
+	char			**env_ary, **env_ind;
+	char			**new_env_cur, **new_env_top, **old_env_cur, **old_env_top, *env_end;
 	DCL_THREADGBL_ACCESS;
 
 	SETUP_THREADGBL_ACCESS;
@@ -423,6 +409,7 @@ int ojstartchild (job_params_type *jparms, int argcnt, boolean_t *non_exit_retur
 			joberr = joberr_pipe_mgc;
 			job_errno = errno;
 			DOWRITERC(pipe_fds[1], &job_errno, SIZEOF(job_errno), pipe_status);
+			assert(FALSE);
 			UNDERSCORE_EXIT(joberr);
 		}
 		if (!IS_JOB_SOCKET(jparms->input.addr, jparms->input.len))
@@ -438,6 +425,7 @@ int ojstartchild (job_params_type *jparms, int argcnt, boolean_t *non_exit_retur
 				joberr = joberr_io_stdin_open;
 				job_errno = errno;
 				DOWRITERC(pipe_fds[1], &job_errno, SIZEOF(job_errno), pipe_status);
+				assert(FALSE);
 				UNDERSCORE_EXIT(joberr);
 			}
 			CLOSEFILE(0, rc);
@@ -447,13 +435,14 @@ int ojstartchild (job_params_type *jparms, int argcnt, boolean_t *non_exit_retur
 				joberr = joberr_io_stdin_dup;
 				job_errno = errno;
 				DOWRITERC(pipe_fds[1], &job_errno, SIZEOF(job_errno), pipe_status);
+				assert(FALSE);
 				UNDERSCORE_EXIT(joberr);
 			}
-#ifdef __MVS__
+#			ifdef __MVS__
 			/* policy tagging because by default input is /dev/null */
 			if (-1 == gtm_zos_tag_to_policy(in_fd, TAG_UNTAGGED, &realfiletag))
 				TAG_POLICY_SEND_MSG(fname_buf, errno, realfiletag, TAG_UNTAGGED);
-#endif
+#			endif
 			CLOSEFILE_RESET(in_fd, rc);	/* resets "in_fd" to FD_INVALID */
 		}
 		if (0 != jparms->directory.len)
@@ -463,6 +452,7 @@ int ojstartchild (job_params_type *jparms, int argcnt, boolean_t *non_exit_retur
 			{
 				joberr = joberr_cd_toolong;
 				DOWRITERC(pipe_fds[1], &job_errno, SIZEOF(job_errno), pipe_status);
+				assert(FALSE);
 				UNDERSCORE_EXIT(joberr);
 			}
 			strncpy(pbuff, jparms->directory.addr, jparms->directory.len);
@@ -483,13 +473,14 @@ int ojstartchild (job_params_type *jparms, int argcnt, boolean_t *non_exit_retur
 		if ((status = ojchildioset(jparms)))
 		{
 			DOWRITERC(pipe_fds[1], &job_errno, SIZEOF(job_errno), pipe_status);
+			assert(FALSE);
 			UNDERSCORE_EXIT(status);
 		}
 		/* Record the fact that this process is interested in the relinkctl files inherited from the parent by
 		 * incrementing the linkctl->hdr->nattached count. This is required by the relinkctl_rundown(TRUE, FALSE)
 		 * call done as part of the RELINKCTL_RUNDOWN_MIDDLE_PARENT macro in the middle child or the grandchild.
 		 * Do this BEFORE the call to job_addr. In case that does a relinkctl_attach of a new relinkctl file,
-		 * we would increment the counter automatically so dont want that to go through a double-increment.
+		 * we would increment the counter automatically so don't want that to go through a double-increment.
 		 */
 		ARLINK_ONLY(relinkctl_incr_nattached());
 		joberr = joberr_rtn;
@@ -518,6 +509,7 @@ int ojstartchild (job_params_type *jparms, int argcnt, boolean_t *non_exit_retur
 			job_errno = errno;
 			DOWRITERC(pipe_fds[1], &job_errno, SIZEOF(job_errno), pipe_status);
 			ARLINK_ONLY(RELINKCTL_RUNDOWN_MIDDLE_PARENT(need_rtnobj_shm_free, rtnhdr));
+			assert(FALSE);
 			UNDERSCORE_EXIT(joberr);
 		}
 
@@ -527,6 +519,7 @@ int ojstartchild (job_params_type *jparms, int argcnt, boolean_t *non_exit_retur
 			job_errno = errno;
 			DOWRITERC(pipe_fds[1], &job_errno, SIZEOF(job_errno), pipe_status);
 			ARLINK_ONLY(RELINKCTL_RUNDOWN_MIDDLE_PARENT(need_rtnobj_shm_free, rtnhdr));
+			assert(FALSE);
 			UNDERSCORE_EXIT(joberr);
 		}
 
@@ -563,6 +556,7 @@ int ojstartchild (job_params_type *jparms, int argcnt, boolean_t *non_exit_retur
 						kill(child_pid, SIGTERM);
 					DOWRITERC(pipe_fds[1], &job_errno, SIZEOF(job_errno), pipe_status);
 					ARLINK_ONLY(relinkctl_rundown(FALSE, FALSE));	/* do not decrement counters, just shmdt */
+					assert(FALSE);
 					UNDERSCORE_EXIT(joberr);
 				}
 			}
@@ -576,6 +570,7 @@ int ojstartchild (job_params_type *jparms, int argcnt, boolean_t *non_exit_retur
 				job_errno = errno;
 				DOWRITERC(pipe_fds[1], &job_errno, SIZEOF(job_errno), pipe_status);
 				ARLINK_ONLY(relinkctl_rundown(FALSE, FALSE));	/* do not decrement counters, just shmdt */
+				assert(FALSE);
 				UNDERSCORE_EXIT(joberr);
 			}
 			/* send job parameters and arguments to final mumps process over setup socket */
@@ -623,6 +618,7 @@ int ojstartchild (job_params_type *jparms, int argcnt, boolean_t *non_exit_retur
 					job_errno = ERR_JOBPARTOOLONG;
 					DOWRITERC(pipe_fds[1], &job_errno, SIZEOF(job_errno), pipe_status);
 					ARLINK_ONLY(relinkctl_rundown(FALSE, FALSE));	/* do not decrement counters, just shmdt */
+					assert(FALSE);
 					UNDERSCORE_EXIT(joberr);
 				}
 				if (0 == jp->parm->mvtype)
@@ -719,11 +715,6 @@ int ojstartchild (job_params_type *jparms, int argcnt, boolean_t *non_exit_retur
 		/* Count the number of environment variables.  */
 		for (environ_count = 0, c3 = environ, c2 = *c3;  c2;  c3++, c2 = *c3)
 			environ_count++;
-#ifdef	__osf__
-/* Since we're creating an array of pointers for the O/S, make sure SIZEOF(char *) is correct for 64-bit pointers for OSF/1.  */
-#pragma	pointer_size (save)
-#pragma pointer_size (long)
-#endif
 
 		/* the environment array passed to the grandchild is constructed by prefixing the job related environment
 		 * variables ahead of the current environment (pointed to by the "environ" variable)
@@ -755,10 +746,6 @@ int ojstartchild (job_params_type *jparms, int argcnt, boolean_t *non_exit_retur
 
 		env_ind = env_ary = (char **)malloc((environ_count + MAX_JOB_QUALS + 1)*SIZEOF(char *));
 
-#ifdef	__osf__
-#pragma pointer_size (restore)
-#endif
-
 		string_len = STRLEN("%s=%d") + STRLEN(CHILD_FLAG_ENV) + MAX_NUM_LEN - 4;
 		if (string_len >= MAX_MUMPS_EXE_PATH_LEN)
 		{
@@ -794,12 +781,6 @@ int ojstartchild (job_params_type *jparms, int argcnt, boolean_t *non_exit_retur
 #pragma convlit(resume)
 #endif
 		}
-
-#ifdef	__osf__
-/* Make sure SIZEOF(char *) is correct.  */
-#pragma pointer_size (save)
-#pragma pointer_size (long)
-#endif
 		/* before appending the old environment into the environment array, do not add those
 		 * lines that correspond to any of the above already initialized environment variables.
 		 * this prevents indefinite growing of the environment array with nesting of job commands
@@ -833,10 +814,6 @@ int ojstartchild (job_params_type *jparms, int argcnt, boolean_t *non_exit_retur
 		}
 		*env_ind = NULL;	/* null terminator required by execve() */
 
-#ifdef	__osf__
-#pragma pointer_size (restore)
-#endif
-
 		c1 = gtm_dist;
 		string_len = STRLEN(c1);
 		if ((string_len + SIZEOF(MUMPS_EXE_STR)) < SIZEOF(tbuff))
diff --git a/sr_unix/op_fnzconvert.c b/sr_unix/op_fnzconvert.c
index b204d6d..55f1637 100755
--- a/sr_unix/op_fnzconvert.c
+++ b/sr_unix/op_fnzconvert.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	*
@@ -19,6 +19,7 @@
 #include "gtm_utf8.h"
 #include "have_crit.h"
 
+GBLREF	boolean_t	badchar_inhibit;
 GBLREF	boolean_t	gtm_utf8_mode;
 GBLREF	spdesc 		stringpool;
 GBLREF	casemap_t	casemaps[];
@@ -78,7 +79,10 @@ void	op_fnzconvert2(mval *src, mval *kase, mval *dst)
 		(*casemaps[index].m)((unsigned char *)dstbase, (unsigned char *)src->str.addr, dstlen);
 	} else if (0 != src->str.len)
 	{
-		MV_FORCE_LEN_STRICT(src);
+		if (!badchar_inhibit)
+			MV_FORCE_LEN_STRICT(src);
+		else
+			MV_FORCE_LEN(src);
 		if (2 * src->str.char_len <= MAX_ZCONVBUFF)
 		{ /* Check if the stack buffer is sufficient considering the worst case where all
 		     characters are surrogate pairs, each of which needs 2 UChars */
@@ -93,7 +97,14 @@ void	op_fnzconvert2(mval *src, mval *kase, mval *dst)
 		/* Convert UTF-8 src to UTF-16 (UChar*) representation */
 		status = U_ZERO_ERROR;
 		u_strFromUTF8(src_ustr_ptr, src_ustr_len, &src_chlen, src->str.addr, src->str.len, &status);
-		if (U_FAILURE(status))
+		if ((U_ILLEGAL_CHAR_FOUND == status || U_INVALID_CHAR_FOUND == status) && badchar_inhibit)
+		{	/* VIEW "NOBADCHAR" in effect, use the M mode conversion only on error */
+			dstlen = src->str.len;
+			ENSURE_STP_FREE_SPACE(dstlen);
+			dstbase = (char *)stringpool.free;
+			assert(NULL != casemaps[index].m);
+			(*casemaps[index].m)((unsigned char *)dstbase, (unsigned char *)src->str.addr, dstlen);
+		} else if (U_FAILURE(status))
 		{
 			RELEASE_IF_NOT_LOCAL(src_ustr_ptr, src_ustr);
 			if (U_ILLEGAL_CHAR_FOUND == status || U_INVALID_CHAR_FOUND == status)
@@ -102,48 +113,51 @@ void	op_fnzconvert2(mval *src, mval *kase, mval *dst)
 			rts_error_csa(CSA_ARG(NULL) VARLSTCNT(3) ERR_ICUERROR,
 						1, status); /* ICU said bad, we say good or don't recognize error*/
 		}
-		status = U_ZERO_ERROR;
-		dst_ustr_ptr = dst_ustr;
-		dst_chlen = (*casemaps[index].u)(dst_ustr_ptr, MAX_ZCONVBUFF, src_ustr_ptr, src_chlen, NULL, &status);
-		if ( U_BUFFER_OVERFLOW_ERROR == status )
-		{
+		else
+		{	/* BADCHAR should not be possible after the above validations */
 			status = U_ZERO_ERROR;
-			dst_ustr_ptr = (UChar*)malloc(dst_chlen * SIZEOF(UChar));
-			/* Now, perform the real conversion with sufficient buffers */
-			dst_chlen = (*casemaps[index].u)(dst_ustr_ptr, dst_chlen, src_ustr_ptr, src_chlen, NULL, &status);
-		} 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);
-		}
-		RELEASE_IF_NOT_LOCAL(src_ustr_ptr, src_ustr);
-		/* Fake the conversion from UTF-16 to UTF-8 to compute the required buffer size */
-		status = U_ZERO_ERROR;
-		dstlen = 0;
-		u_strToUTF8(NULL, 0, &dstlen, dst_ustr_ptr, dst_chlen, &status);
-		assert(U_BUFFER_OVERFLOW_ERROR == status || U_SUCCESS(status));
-		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);
-		dstbase = (char *)stringpool.free;
-		status = U_ZERO_ERROR;
-		u_strToUTF8(dstbase, dstlen, &ulen, dst_ustr_ptr, dst_chlen, &status);
-		if (U_FAILURE(status))
-		{
+			dst_ustr_ptr = dst_ustr;
+			dst_chlen = (*casemaps[index].u)(dst_ustr_ptr, MAX_ZCONVBUFF, src_ustr_ptr, src_chlen, NULL, &status);
+			if (U_BUFFER_OVERFLOW_ERROR == status)
+			{
+				status = U_ZERO_ERROR;
+				dst_ustr_ptr = (UChar*)malloc(dst_chlen * SIZEOF(UChar));
+				/* Now, perform the real conversion with sufficient buffers */
+				dst_chlen = (*casemaps[index].u)(dst_ustr_ptr, dst_chlen, src_ustr_ptr, src_chlen, NULL, &status);
+			} 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);
+			}
+			/* Fake the conversion from UTF-16 to UTF-8 to compute the required buffer size */
+			status = U_ZERO_ERROR;
+			dstlen = 0;
+			u_strToUTF8(NULL, 0, &dstlen, dst_ustr_ptr, dst_chlen, &status);
+			assert(U_BUFFER_OVERFLOW_ERROR == status || U_SUCCESS(status));
+			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);
+			dstbase = (char *)stringpool.free;
+			status = U_ZERO_ERROR;
+			u_strToUTF8(dstbase, dstlen, &ulen, dst_ustr_ptr, dst_chlen, &status);
 			RELEASE_IF_NOT_LOCAL(src_ustr_ptr, src_ustr);
+			if (U_FAILURE(status))
+			{
+				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 */
+			}
+			assertpro(ulen == 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(3) ERR_ICUERROR,
-					1, status); /* ICU said bad, but same call above just returned OK */
 		}
-		assertpro(ulen == dstlen);
-		RELEASE_IF_NOT_LOCAL(dst_ustr_ptr, dst_ustr);
 	}
 	MV_INIT_STRING(dst, dstlen, dstbase);
 	stringpool.free += dstlen;
diff --git a/sr_unix/op_fnztrnlnm.c b/sr_unix/op_fnztrnlnm.c
index f4b7106..1a99263 100755
--- a/sr_unix/op_fnztrnlnm.c
+++ b/sr_unix/op_fnztrnlnm.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	*
@@ -24,6 +25,7 @@ GBLREF spdesc stringpool;
 
 error_def(ERR_INVSTRLEN);
 error_def(ERR_BADTRNPARAM);
+error_def(ERR_MAXSTRLEN);
 
 #define FULL 3
 #define LENGTH 4
@@ -53,16 +55,16 @@ void op_fnztrnlnm(mval *name, mval *table, int4 ind, mval *mode, mval *case_blin
 	char		buf[MAX_TRANS_NAME_LEN];
 	char		*status;
 	int		item_code;
-	short		retlen;
+	uint4		retlen;
 
 	MV_FORCE_STR(name);
 	if (name->str.len >= MAX_TRANS_NAME_LEN)
-		rts_error(VARLSTCNT(4) ERR_INVSTRLEN, 2, name->str.len, MAX_TRANS_NAME_LEN - 1);
+		rts_error_csa(CSA_ARG(NULL) VARLSTCNT(4) ERR_INVSTRLEN, 2, name->str.len, MAX_TRANS_NAME_LEN - 1);
 	MV_FORCE_STR(item);
 	if (item->str.len)
 	{
 		if ((item_code = namelook(trnitm_index, trnitm_table, item->str.addr, item->str.len)) < 0) /* NOTE assignment */
-			rts_error(VARLSTCNT(4) ERR_BADTRNPARAM,2,item->str.len,item->str.addr);
+			rts_error_csa(CSA_ARG(NULL) VARLSTCNT(4) ERR_BADTRNPARAM,2,item->str.len,item->str.addr);
 	} else
 		item_code = VALUE;
 	ret->mvtype = MV_STR;
@@ -76,6 +78,8 @@ void op_fnztrnlnm(mval *name, mval *table, int4 ind, mval *mode, mval *case_blin
 			if (status)
 			{
 				retlen = strlen(status);
+				if (MAX_STRLEN < retlen)
+					rts_error_csa(CSA_ARG(NULL) VARLSTCNT(1) ERR_MAXSTRLEN);
 				ENSURE_STP_FREE_SPACE(retlen);
 				ret->str.addr = (char *)stringpool.free;
 				ret->str.len = retlen;
diff --git a/sr_unix/op_job.c b/sr_unix/op_job.c
index eaeed80..8bf72fb 100755
--- a/sr_unix/op_job.c
+++ b/sr_unix/op_job.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	*
@@ -66,12 +66,14 @@ GBLREF	int4		outofband;
 GBLREF	d_socket_struct	*socket_pool;
 static	int4	tid;	/* Job Timer ID */
 
-error_def(ERR_TEXT);
+LITREF mval		skiparg;
+
 error_def(ERR_JOBFAIL);
-error_def(ERR_NULLENTRYREF);
 error_def(ERR_JOBLVN2LONG);
+error_def(ERR_NULLENTRYREF);
+error_def(ERR_TEXT);
 
-#define JOBTIMESTR "JOB time too long"
+#define JOBTIMESTR "JOB"
 
 /*
  * ---------------------------------------------------
@@ -96,7 +98,7 @@ int	op_job(int4 argcnt, ...)
 	mval			*label;
 	int4			offset;
 	mval			*routine, *param_buf;
-	int4			timeout;	/* timeout in seconds */
+	mval			*timeout;	/* timeout in milliseconds */
 	int4			msec_timeout;	/* timeout in milliseconds */
 	boolean_t		timed, single_attempt, non_exit_return;
 	unsigned char		buff[128], *c;
@@ -117,8 +119,6 @@ int	op_job(int4 argcnt, ...)
 	job_buffer_size_msg	buffer_size;
 	DCL_THREADGBL_ACCESS;
 
-	LITREF mval		skiparg;
-
 	SETUP_THREADGBL_ACCESS;
 	VAR_START(var, argcnt);
 	assert(argcnt >= 5);
@@ -126,7 +126,7 @@ int	op_job(int4 argcnt, ...)
 	offset = va_arg(var, int4);
 	routine = va_arg(var, mval *);
 	param_buf = va_arg(var, mval *);
-	timeout = va_arg(var, int4);	/* in seconds */
+	timeout = va_arg(var, mval *);	/* in milliseconds */
 	argcnt -= 5;
 	/* initialize $zjob = 0, in case JOB fails */
 	dollar_zjob = 0;
@@ -158,21 +158,12 @@ int	op_job(int4 argcnt, ...)
 		rts_error_csa(CSA_ARG(NULL) VARLSTCNT(4) ERR_JOBFAIL, 0, ERR_NULLENTRYREF, 0);
 	}
 	/* Start the timer */
-	ojtimeout = FALSE;
-	if (timeout < 0)
-		timeout = 0;
-	else if (TREF(tpnotacidtime) < timeout)
-		TPNOTACID_CHECK(JOBTIMESTR);
-	if (NO_M_TIMEOUT == timeout)
-	{
-		timed = FALSE;
-		msec_timeout = NO_M_TIMEOUT;
-	} else
+	ojtimeout = timed = FALSE;
+	MV_FORCE_MSTIMEOUT(timeout, msec_timeout, JOBTIMESTR);
+	if ((0 < msec_timeout) && (NO_M_TIMEOUT != msec_timeout))
 	{
 		timed = TRUE;
-		msec_timeout = timeout2msec(timeout);
-		if (msec_timeout > 0)
-			start_timer((TID)&tid, msec_timeout, job_timer_handler, 0, NULL);
+		start_timer((TID)&tid, msec_timeout, job_timer_handler, 0, NULL);
 	}
 	if (argcnt)
 	{
@@ -234,7 +225,6 @@ int	op_job(int4 argcnt, ...)
 						      errno);
 			}
 		}
-
 	}
 	if (argcnt)
 		free(job_params.parms);
@@ -293,7 +283,6 @@ int	op_job(int4 argcnt, ...)
 							  joberrs[exit_stat].len,
 							  joberrs[exit_stat].msg,
 							  job_errno);
-
 					}
 				} else					/* unknown exit status */
 				{
@@ -316,7 +305,6 @@ int	op_job(int4 argcnt, ...)
 			dollar_truth = 1;
 		assert(0 < zjob_pid);
 		dollar_zjob = zjob_pid;
-
 		if (IS_JOB_SOCKET(job_params.input.addr, job_params.input.len))
 		{
 			handle_len = JOB_SOCKET_HANDLE_LEN(job_params.input.len);
@@ -338,7 +326,6 @@ int	op_job(int4 argcnt, ...)
 			if (-1 != index)
 				iosocket_close_one(socket_pool, index);
 		}
-
 		return TRUE;
 	}
 	return FALSE; /* This will never get executed, added to make compiler happy */
diff --git a/sr_unix/op_zedit.c b/sr_unix/op_zedit.c
index f3b3a75..b01e73c 100755
--- a/sr_unix/op_zedit.c
+++ b/sr_unix/op_zedit.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	*
@@ -29,6 +29,7 @@
 #include "op.h"
 #include "fork_init.h"
 #include "geteditor.h"
+#include "restrict.h"
 #include "wbox_test_init.h"
 
 GBLREF	io_pair		io_std_device;
@@ -38,6 +39,7 @@ GBLREF	int4		dollar_zeditor;
 
 error_def(ERR_NOEDITOR);
 error_def(ERR_ZEDFILSPEC);
+error_def(ERR_RESTRICTEDOP);
 
 void op_zedit(mval *v, mval *p)
 {
@@ -155,6 +157,9 @@ void op_zedit(mval *v, mval *p)
 		}
 	}
 
+	if (RESTRICTED(zedit_op))
+		rts_error_csa(CSA_ARG(NULL) VARLSTCNT(3) ERR_RESTRICTEDOP, 1, "ZEDIT");
+
 	flush_pio();
 	if (tt == io_std_device.in->type)
 		resetterm(io_std_device.in);
diff --git a/sr_unix/peekbyname.mpt b/sr_unix/peekbyname.mpt
index 85c3f7d..442db6a 100755
--- a/sr_unix/peekbyname.mpt
+++ b/sr_unix/peekbyname.mpt
@@ -136,6 +136,11 @@ listiterate(out)
 	. . if 'write set out(fieldname)=^gtmtypes(struct,j,"type")_","_^gtmtypes(struct,j,"len")
 	. . else  write fieldname,!
 	quit
+
+data(field)
+	new $etrap set $etrap="set $ecode="""" quit:$quit 0 quit"
+	quit $data(^|"$gtm_dist/gtmhelp.gld"|gtmtypfldindx($piece(field,"."),$piece(field,".",2,$length(field,".")))) quit
+
 ; the below error definitions derived from merrors.msg are relatively complete so older version where they weren't defined get info
 ERRPBNPARMREQ		;150383746;"A first parameter value "_first_" requires a second parameter specified containing "_args
 ERRPBNNOPARM		;150383754;"First parameter "_first_" does not support a second parameter"
diff --git a/sr_unix/pinentry-gtm.sh b/sr_unix/pinentry-gtm.sh
index d9e2a96..d038fa5 100755
--- a/sr_unix/pinentry-gtm.sh
+++ b/sr_unix/pinentry-gtm.sh
@@ -58,7 +58,7 @@ if [ -n "$gtm_passwd" -a -x "$gtm_dist/mumps" ] ; then
 	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
+	gtm_env_translate= gtm_etrap= gtm_local_collate= gtm_sysid= gtm_trace_gbl_name= gtm_zdate_form= gtm_zstep= gtm_ztrap_form=code 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
diff --git a/sr_unix/pinentry.m b/sr_unix/pinentry.m
index 93acf51..8d84689 100644
--- a/sr_unix/pinentry.m
+++ b/sr_unix/pinentry.m
@@ -15,11 +15,11 @@ pinentry; Custom pinentry that returns an unobfuscated password if $gtm_passwd i
 	; See the following link for non-authoritative information on the pinentry protocol:
 	; http://info2html.sourceforge.net/cgi-bin/info2html-demo/info2html/info2html?%28pinentry%29Protocol
 	;
-	set $etrap="do error",$zinterrupt=$etrap
+	set $etrap="do error^"_$text(+0),$zinterrupt=$etrap
 	; gtm_passwd is validated as non-null by pinentry-gtm.sh
 	set obfpwd=$zconvert($ztrnlnm("gtm_passwd"),"U"),obfpwdlen=$zlength(obfpwd)
-	; Avoid NOBADCHAR on $PRINCIPAL - must use [io]chset on the OPEN and not USE
-	open $principal:(ichset="M":ochset="M")
+	; Avoid NOBADCHAR on $PRINCIPAL and other functions
+	use $principal:(chset="M") view "NOBADCHAR"
 	; Unmask the password ahead of initiating the pinentry protocol. If the external call is not
 	; available, the error handler is invoked
 	set binobfpwd=""
@@ -29,11 +29,14 @@ pinentry; Custom pinentry that returns an unobfuscated password if $gtm_passwd i
 	. set binobfpwd=binobfpwd_$zchar(16*msb+lsb)
 	; If unmasking fails, exit
 	do:$&gpgagent.unmaskpwd(binobfpwd,.clrpwds) error
-	use $principal:(exception="goto error")
+	use $principal:(exception="goto error^"_$text(+0))
 	write "OK Your orders please",!
 	for  read in quit:'$zlength(in)  do
-	. if "GETPIN"=$zconvert($zpiece(in," ",1),"U") write "D ",clrpwds,!,"OK",! zhalt 0
-	. else  write "OK",!
+	. if "GETPIN"'=$zconvert($zpiece(in," ",1),"U") write "OK",! quit
+	. write "D "
+	. write clrpwds,!
+	. write "OK",!
+	. zhalt 0
 	; Since this routine only responds to GETPIN, issue an error if it did not receive that command,
 	; letting pinentry-gtm.sh execute the default pinentry
 	zhalt 1
@@ -43,7 +46,8 @@ pinentry; Custom pinentry that returns an unobfuscated password if $gtm_passwd i
 	; status. Note that the locals are all killed prior to dumping status
 error	kill
 	new $etrap set $etrap="zhalt +$zstatus"
-	set errmsg="%GTM-E-PINENTRYERR, Custom pinentry program failure. "_$zstatus
+	new i,info
+	set errmsg="%GTM-E-PINENTRYERR, Custom pinentry program failure. "_$zstatus_"; from "_$zdirectory
 	if $zsyslog(errmsg)
 	set pinlog=$ztrnlnm("gtm_pinentry_log")
 	if $zlength(pinlog) do
@@ -51,8 +55,11 @@ error	kill
 	. use pinlog
 	. 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"
+	. write "Stack trace:"
+	. for i=$STACK:-1:0 write !,i,?8 for info="ecode","place","mcode" do
+	. . write ":",info,"=",$zjustify($stack(i,info),18)
+	. write !,"Loaded external calls:",! zshow "C"
+	. write "Device parameters:",! zshow "D"
 	. close pinlog
 	zhalt +$zstatus
 	quit
diff --git a/sr_unix/probe.c b/sr_unix/probe.c
deleted file mode 100755
index fe24f76..0000000
--- a/sr_unix/probe.c
+++ /dev/null
@@ -1,35 +0,0 @@
-/****************************************************************
- *								*
- *	Copyright 2001, 2007 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 <sys/mman.h>
-#include "probe.h"
-OS_PAGE_SIZE_DECLARE
-
-boolean_t probe(uint4 len, void *addr, boolean_t write)
-{
-	int status;
-	uint4 temp;
-
-	if (NULL == addr)	/* Special case for null pointer passed */
-		return FALSE;
-#if defined(__alpha)
-	temp = ROUND_DOWN2((uint4)addr, OS_PAGE_SIZE);
-	status = mvalid((caddr_t)temp, (size_t)(len + ((uint4)addr - temp)), write ? PROT_WRITE : PROT_READ);
-	assert(0 == status);
-	return (status == 0 ? TRUE : FALSE);
-#else
-	return TRUE;
-#endif
-}
-
diff --git a/sr_unix/relinkctl.c b/sr_unix/relinkctl.c
index 18795f5..ce0afc7 100644
--- a/sr_unix/relinkctl.c
+++ b/sr_unix/relinkctl.c
@@ -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	*
@@ -322,19 +322,12 @@ int relinkctl_open(open_relinkctl_sgm *linkctl, boolean_t object_dir_missing)
 			}
 		}
 		linkctl->fd = fd;
-		if (RELINKCTL_MMAP_SZ != stat_buf.st_size)
+		FTRUNCATE(fd, RELINKCTL_MMAP_SZ, rc);
+		if (0 != rc)
 		{
-			DBGARLNK((stderr, "relinkctl_open: file size = %d\n", stat_buf.st_size));
-			if (RELINKCTL_MMAP_SZ != stat_buf.st_size)
-			{
-				FTRUNCATE(fd, RELINKCTL_MMAP_SZ, rc);
-				if (0 != rc)
-				{
-					save_errno = errno;
-					SNPRINTF(errstr, SIZEOF(errstr), "ftruncate() of file %s failed", linkctl->relinkctl_path);
-					ISSUE_RELINKCTLERR_SYSCALL(&linkctl->zro_entry_name, errstr, save_errno);
-				}
-			}
+			save_errno = errno;
+			SNPRINTF(errstr, SIZEOF(errstr), "ftruncate() of file %s failed", linkctl->relinkctl_path);
+			ISSUE_RELINKCTLERR_SYSCALL(&linkctl->zro_entry_name, errstr, save_errno);
 		}
 		relinkctl_map(linkctl);	/* linkctl->hdr is now accessible */
 		hdr = linkctl->hdr;
@@ -396,7 +389,7 @@ int relinkctl_open(open_relinkctl_sgm *linkctl, boolean_t object_dir_missing)
 					if (!shm_removed)
 						ISSUE_RELINKCTLERR_SYSCALL(&linkctl->zro_entry_name, errstr, save_errno);
 					else
-						ISSUE_REQRLNKCTLRNDWN_SYSCALL(&linkctl->zro_entry_name, errstr, save_errno);
+						ISSUE_REQRLNKCTLRNDWN_SYSCALL(linkctl, errstr, save_errno);
 				} else
 				{	/* This is MUPIP RUNDOWN -RELINKCTL and shm is removed. There is no point creating one. */
 					DBGARLNK((stderr, "relinkctl_open: Set hdr->relinkctl_shmid to INVALID_SHMID\n"));
@@ -414,8 +407,8 @@ int relinkctl_open(open_relinkctl_sgm *linkctl, boolean_t object_dir_missing)
 			{
 				relinkctl_unlock_exclu(linkctl);
 				relinkctl_unmap(linkctl);
-				rts_error_csa(CSA_ARG(NULL) VARLSTCNT(4) ERR_REQRLNKCTLRNDWN, 2,
-						RTS_ERROR_MSTR(&linkctl->zro_entry_name));
+				rts_error_csa(CSA_ARG(NULL) VARLSTCNT(5) ERR_REQRLNKCTLRNDWN, 3,
+						linkctl->relinkctl_path, RTS_ERROR_MSTR(&linkctl->zro_entry_name));
 			}
 			DBGARLNK((stderr, "relinkctl_open: file first open\n"));
 			hdr->n_records = 0;
diff --git a/sr_unix/relinkctl.h b/sr_unix/relinkctl.h
index b40aed0..f0661a8 100644
--- a/sr_unix/relinkctl.h
+++ b/sr_unix/relinkctl.h
@@ -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	*
@@ -109,9 +109,12 @@ error_def(ERR_RLNKRECLATCH);	/* needed for the RELINKCTL_CYCLE_INCR macro */
 #define	IS_INSERT		0
 #define	IS_DELETE		1
 
-#define ISSUE_REQRLNKCTLRNDWN_SYSCALL(ZRO_ENTRY_NAME, ERRSTR, ERRNO)						\
-	rts_error_csa(CSA_ARG(NULL) VARLSTCNT(12) ERR_REQRLNKCTLRNDWN, 2, RTS_ERROR_MSTR(ZRO_ENTRY_NAME),	\
-		      ERR_SYSCALL, 5, LEN_AND_STR(ERRSTR), CALLFROM, DEBUG_ONLY(saved_errno = )ERRNO)
+error_def(ERR_REQRLNKCTLRNDWN);	/* needed for the ISSUE_REQRLNKCTLRNDWN_SYSCALL macro */
+
+#define ISSUE_REQRLNKCTLRNDWN_SYSCALL(LINKCTL, ERRSTR, ERRNO)							\
+	rts_error_csa(CSA_ARG(NULL) VARLSTCNT(13)								\
+		ERR_REQRLNKCTLRNDWN, 3, LINKCTL->relinkctl_path, RTS_ERROR_MSTR(&LINKCTL->zro_entry_name), 	\
+		ERR_SYSCALL, 5, LEN_AND_STR(ERRSTR), CALLFROM, DEBUG_ONLY(saved_errno = )ERRNO)
 
 #define ISSUE_RELINKCTLERR_SYSCALL(ZRO_ENTRY_NAME, ERRSTR, ERRNO)						\
 	rts_error_csa(CSA_ARG(NULL) VARLSTCNT(12) ERR_RELINKCTLERR, 2, RTS_ERROR_MSTR(ZRO_ENTRY_NAME),		\
diff --git a/sr_unix/remove_rms.c b/sr_unix/remove_rms.c
index f4731d4..565ea4f 100755
--- a/sr_unix/remove_rms.c
+++ b/sr_unix/remove_rms.c
@@ -39,7 +39,7 @@ void remove_rms (io_desc *ciod)
 	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((rm == ciod->type) || (n_io_dev_types == ciod->type) || (NULL == ciod->dev_sp));
 	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));
@@ -74,7 +74,7 @@ void remove_rms (io_desc *ciod)
 		free(rm_ptr->fsblock_buffer);
 	if ((n_io_dev_types != ciod->type) && ciod->newly_created)
 	{
-		assert((NULL == rm_ptr) || !rm_ptr->pipe);
+		assert((NULL == rm_ptr) || !rm_ptr->is_pipe);
 		UNLINK(ciod->trans_name->dollar_io);
 	}
 	for (lpp = &io_root_log_name, lp = *lpp; lp; lp = *lpp)
@@ -116,7 +116,7 @@ void remove_rms (io_desc *ciod)
 	}
 	if (rm_ptr)
 	{
-		if (rm_ptr->pipe)
+		if (rm_ptr->is_pipe)
 		{	/* free up dev_param_pairs if defined */
 			for ( i = 0; i < rm_ptr->dev_param_pairs.num_pairs; i++ )
 			{
diff --git a/sr_unix/repl_inst_create.c b/sr_unix/repl_inst_create.c
index 88cdcd1..0e2e887 100755
--- a/sr_unix/repl_inst_create.c
+++ b/sr_unix/repl_inst_create.c
@@ -133,8 +133,8 @@ void repl_inst_create(void)
 		if ((INVALID_SEMID != repl_instance->jnlpool_semid) || (INVALID_SHMID != repl_instance->jnlpool_shmid)
 			|| (INVALID_SEMID != repl_instance->recvpool_semid) || (INVALID_SHMID != repl_instance->recvpool_shmid))
 		{
+			assert(FALSE || WBTEST_ENABLED(WBTEST_REPLINSTSTNDALN));
 			rts_error_csa(CSA_ARG(NULL) VARLSTCNT(4) ERR_REPLINSTSTNDALN, 2, inst_fn_len, inst_fn);
-			assert(FALSE);
 		}
 		JNL_SHORT_TIME(now);
 		rename_fn_len = ARRAYSIZE(rename_fn);
diff --git a/sr_unix/repl_inst_dump.c b/sr_unix/repl_inst_dump.c
old mode 100755
new mode 100644
index 4ee5d4d..2bb99a1
--- a/sr_unix/repl_inst_dump.c
+++ b/sr_unix/repl_inst_dump.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	*
@@ -600,18 +600,14 @@ void	repl_inst_dump_jnlpoolctl(jnlpool_ctl_ptr_t jnlpool_ctl)
 	util_out_print( PREFIX_JNLPOOLCTL "Journal Pool Size (in bytes)                !10UL [0x!XL]", TRUE,
 		jnlpool_ctl->jnlpool_size, jnlpool_ctl->jnlpool_size);
 
-	PRINT_OFFSET_PREFIX(offsetof(jnlpool_ctl_struct, early_write_addr), SIZEOF(jnlpool_ctl->early_write_addr));
-	util_out_print( PREFIX_JNLPOOLCTL "Early Write Offset                !20 at UQ [0x!16 at XQ]", TRUE,
-		&jnlpool_ctl->early_write_addr, &jnlpool_ctl->early_write_addr);
+	PRINT_OFFSET_PREFIX(offsetof(jnlpool_ctl_struct, rsrv_write_addr), SIZEOF(jnlpool_ctl->rsrv_write_addr));
+	util_out_print( PREFIX_JNLPOOLCTL "Reserved Write Offset             !20 at UQ [0x!16 at XQ]", TRUE,
+		&jnlpool_ctl->rsrv_write_addr, &jnlpool_ctl->rsrv_write_addr);
 
 	PRINT_OFFSET_PREFIX(offsetof(jnlpool_ctl_struct, write_addr), SIZEOF(jnlpool_ctl->write_addr));
 	util_out_print( PREFIX_JNLPOOLCTL "Absolute Write Offset             !20 at UQ [0x!16 at XQ]", TRUE,
 		&jnlpool_ctl->write_addr, &jnlpool_ctl->write_addr);
 
-	PRINT_OFFSET_PREFIX(offsetof(jnlpool_ctl_struct, write), SIZEOF(jnlpool_ctl->write));
-	util_out_print( PREFIX_JNLPOOLCTL "Relative Write Offset                       !10UL [0x!XL]", TRUE,
-		jnlpool_ctl->write, jnlpool_ctl->write);
-
 	PRINT_OFFSET_PREFIX(offsetof(jnlpool_ctl_struct, upd_disabled), SIZEOF(jnlpool_ctl->upd_disabled));
 	PRINT_BOOLEAN(PREFIX_JNLPOOLCTL "Updates Disabled                !R22AZ", jnlpool_ctl->upd_disabled, -1);
 
@@ -653,7 +649,7 @@ void	repl_inst_dump_jnlpoolctl(jnlpool_ctl_ptr_t jnlpool_ctl)
 				SIZEOF(this_side->trigger_supported));
 	PRINT_BOOLEAN(PREFIX_JNLPOOLCTL "Trigger Supported               !R22AZ", this_side->trigger_supported, -1);
 
-	/* The following 3 members of "this_side" dont make sense as the structure reflects properties of this instance whereas
+	/* The following 3 members of "this_side" don't make sense as the structure reflects properties of this instance whereas
 	 * these 3 members require connection with the remote side in order to make sense. So skip dumping them.
 	 *	this_side->cross_endian
 	 *	this_side->endianness_known
@@ -697,10 +693,36 @@ void	repl_inst_dump_jnlpoolctl(jnlpool_ctl_ptr_t jnlpool_ctl)
 		else
 			util_out_print( PREFIX_JNLPOOLCTL "Freeze Comment: !AZ", TRUE, jnlpool_ctl->freeze_comment);
 	}
+	PRINT_OFFSET_PREFIX(offsetof(jnlpool_ctl_struct, instfreeze_environ_inited),
+			SIZEOF(jnlpool_ctl->instfreeze_environ_inited));
+	PRINT_BOOLEAN( PREFIX_JNLPOOLCTL  "Custom Errors Loaded                        !R10AZ",
+			jnlpool_ctl->instfreeze_environ_inited, -1);
 	PRINT_OFFSET_PREFIX(offsetof(jnlpool_ctl_struct, ftok_counter_halted), SIZEOF(jnlpool_ctl->ftok_counter_halted));
 	PRINT_BOOLEAN( PREFIX_JNLPOOLCTL  "FTOK Counter Halted                         !R10AZ",
 									jnlpool_ctl->ftok_counter_halted, -1);
-
+	PRINT_OFFSET_PREFIX(offsetof(jnlpool_ctl_struct, phase2_commit_index1), SIZEOF(jnlpool_ctl->phase2_commit_index1));
+	util_out_print( PREFIX_JNLPOOLCTL "Phase2 Commit Index1                        !10UL [0x!XL]", TRUE,
+		jnlpool_ctl->phase2_commit_index1, jnlpool_ctl->phase2_commit_index1);
+	PRINT_OFFSET_PREFIX(offsetof(jnlpool_ctl_struct, phase2_commit_index2), SIZEOF(jnlpool_ctl->phase2_commit_index2));
+	util_out_print( PREFIX_JNLPOOLCTL "Phase2 Commit Index2                        !10UL [0x!XL]", TRUE,
+		jnlpool_ctl->phase2_commit_index2, jnlpool_ctl->phase2_commit_index2);
+	PRINT_OFFSET_PREFIX(0, 0);
+	util_out_print( PREFIX_JNLPOOLCTL "Phase2 Commit IndexMax                      !10UL [0x!XL]", TRUE,
+		JPL_PHASE2_COMMIT_ARRAY_SIZE, JPL_PHASE2_COMMIT_ARRAY_SIZE);
+	PRINT_OFFSET_PREFIX(offsetof(jnlpool_ctl_struct, phase2_commit_latch), SIZEOF(jnlpool_ctl->phase2_commit_latch));
+	util_out_print( PREFIX_JNLPOOLCTL "Phase2 Commit Latch Pid                     !10UL [0x!XL]", TRUE,
+		jnlpool_ctl->phase2_commit_latch.u.parts.latch_pid, jnlpool_ctl->phase2_commit_latch.u.parts.latch_pid);
+#	define TAB_JPL_TRC_REC(A,B)										\
+	{													\
+		PRINT_OFFSET_PREFIX(offsetof(jnlpool_ctl_struct, B.cntr), SIZEOF(jnlpool_ctl->B.cntr));		\
+		util_out_print( PREFIX_JNLPOOLCTL A " Cntr               !10UL [0x!XL]", TRUE,			\
+			jnlpool_ctl->B.cntr, jnlpool_ctl->B.cntr);						\
+		PRINT_OFFSET_PREFIX(offsetof(jnlpool_ctl_struct, B.seqno), SIZEOF(jnlpool_ctl->B.seqno));	\
+		util_out_print( PREFIX_JNLPOOLCTL A " Seqno              !10UL [0x!XL]", TRUE,			\
+			jnlpool_ctl->B.seqno, jnlpool_ctl->B.seqno);						\
+	}
+#	include "tab_jpl_trc_rec.h"
+#	undef TAB_JPL_TRC_REC
 }
 
 void	repl_inst_dump_gtmsourcelocal(gtmsource_local_ptr_t gtmsourcelocal_ptr)
diff --git a/sr_unix/repl_ipc_cleanup.c b/sr_unix/repl_ipc_cleanup.c
old mode 100755
new mode 100644
index d3650bb..302bb6b
--- a/sr_unix/repl_ipc_cleanup.c
+++ b/sr_unix/repl_ipc_cleanup.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,6 +13,7 @@
 #include "mdef.h"
 
 #include "gtm_inet.h"
+#include "gtm_ipc.h"
 
 #include <sys/shm.h>
 #include <errno.h>
@@ -39,11 +40,10 @@
 #include "repl_instance.h"
 #include "wbox_test_init.h"
 #include "have_crit.h"
-#include "gtm_ipc.h"
 #include "anticipatory_freeze.h"
+#include "jnl.h"
 
 GBLREF	jnlpool_addrs		jnlpool;
-GBLREF	boolean_t		pool_init;
 GBLREF	jnlpool_ctl_ptr_t	jnlpool_ctl;
 GBLREF	int			gtmrecv_srv_count;
 
@@ -122,17 +122,8 @@ int	gtmsource_ipc_cleanup(boolean_t auto_shutdown, int *exit_status, int4 *num_s
 	if (INST_FREEZE_ON_ERROR_POLICY && !(attempt_ipc_cleanup && (INVALID_SHMID != udi->shmid)))
 		return FALSE;
 	/* detach from shared memory irrespective of whether we need to cleanup ipcs or not */
-	JNLPOOL_SHMDT(detach_status, save_errno);
-	if (0 == detach_status)
-	{
-		jnlpool.jnlpool_ctl = NULL; /* Detached successfully */
-		jnlpool_ctl = NULL;
-		jnlpool.repl_inst_filehdr = NULL;
-		jnlpool.gtmsrc_lcl_array = NULL;
-		jnlpool.gtmsource_local_array = NULL;
-		jnlpool.jnldata_base = NULL;
-		pool_init = FALSE;
-	} else
+	JNLPOOL_SHMDT(jnlpool, detach_status, save_errno);
+	if (0 != detach_status)
 	{
 		repl_log(stderr, TRUE, TRUE, "Error detaching from Journal Pool : %s\n", STRERROR(save_errno));
 		attempt_ipc_cleanup = FALSE;
diff --git a/sr_unix/rtnobj.c b/sr_unix/rtnobj.c
index 44f10ee..67f1787 100644
--- a/sr_unix/rtnobj.c
+++ b/sr_unix/rtnobj.c
@@ -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	*
@@ -100,7 +100,7 @@
 					if (!SHM_REMOVED(save_errno))								\
 						ISSUE_RELINKCTLERR_SYSCALL(&LINKCTL->zro_entry_name, errstr, save_errno);	\
 					else											\
-						ISSUE_REQRLNKCTLRNDWN_SYSCALL(&LINKCTL->zro_entry_name, errstr, save_errno);	\
+						ISSUE_REQRLNKCTLRNDWN_SYSCALL(LINKCTL, errstr, save_errno);			\
 				}												\
 				assert(0 == ((UINTPTR_T)shm_base % 8));								\
 				LINKCTL->rtnobj_shmid[i] = shr_shmid;								\
@@ -120,7 +120,6 @@
 #ifdef AUTORELINK_SUPPORTED
 
 error_def(ERR_RELINKCTLERR);
-error_def(ERR_REQRLNKCTLRNDWN);
 error_def(ERR_RLNKRECLATCH);
 error_def(ERR_RLNKSHMLATCH);
 error_def(ERR_SYSCALL);
diff --git a/sr_unix/rts_error.c b/sr_unix/rts_error.c
index 225ef6f..0856787 100755
--- a/sr_unix/rts_error.c
+++ b/sr_unix/rts_error.c
@@ -136,7 +136,7 @@ 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))
+		if (!run_time && (CGP_PARSE == cg_phase) && !DUMP)
 		{
 			(*stx_error_va_fptr)(msgid, var_dup);
 			TREF(director_token) = TK_ERROR;
diff --git a/sr_unix/secshr_client.c b/sr_unix/secshr_client.c
index 36f2ff2..bbd5255 100755
--- a/sr_unix/secshr_client.c
+++ b/sr_unix/secshr_client.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	*
@@ -107,7 +107,7 @@ const static char readonly *secshrstart_error_code[] = {
 };
 
 #define MAX_COMM_ATTEMPTS		4	/* 1 to start secshr, 2 maybe slow, 3 maybe really slow, 4 outside max */
-#define CLIENT_ACK_TIMER		5
+#define CLIENT_ACK_TIMER		5 * MILLISECS_IN_SEC
 
 #define START_SERVER										\
 {												\
@@ -141,8 +141,8 @@ const static char readonly *secshrstart_error_code[] = {
 	client_timer_popped = FALSE;								\
 	recv_complete = FALSE;									\
 	save_errno = 0;										\
-	msec_timeout = timeout2msec(CLIENT_ACK_TIMER);						\
-	start_timer(timer_id, msec_timeout, client_timer_handler, 0, NULL);			\
+	assert(MAXPOSINT4 >= CLIENT_ACK_TIMER);						\
+	start_timer(timer_id, CLIENT_ACK_TIMER, client_timer_handler, 0, NULL);			\
 }
 
 error_def(ERR_GTMDISTUNVERIF);
diff --git a/sr_unix/set_jnl_file_close.c b/sr_unix/set_jnl_file_close.c
index fadb0a9..bf7ddb9 100644
--- a/sr_unix/set_jnl_file_close.c
+++ b/sr_unix/set_jnl_file_close.c
@@ -35,9 +35,9 @@ uint4	set_jnl_file_close(void)
 	if (0 == jnl_status)
 	{
 		if (0 == cs_addrs->jnl->pini_addr)
-			jnl_put_jrt_pini(cs_addrs);
+			jnl_write_pini(cs_addrs);
 		wcs_flu(WCSFLU_FLUSH_HDR | WCSFLU_WRITE_EPOCH);
-		jnl_put_jrt_pfin(cs_addrs);
+		jnl_write_pfin(cs_addrs);
 		jnl_file_close(gv_cur_region, TRUE, TRUE);
 	} else
 		gtm_putmsg_csa(CSA_ARG(cs_addrs) VARLSTCNT(6) jnl_status, 4, JNL_LEN_STR(cs_addrs->hdr),
diff --git a/sr_unix/source_file.c b/sr_unix/source_file.c
index b749225..2273221 100755
--- a/sr_unix/source_file.c
+++ b/sr_unix/source_file.c
@@ -37,19 +37,21 @@
 #include "util.h"
 #include "op_fnzsearch.h"
 
-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 int4		dollar_zcstatus;
-GBLREF io_pair          io_curr_device, io_std_device;
-GBLREF char		object_file_name[];
-GBLREF short		object_name_len;
-GBLREF int		object_file_des;
-GBLREF command_qualifier cmd_qlf;
-GBLREF stack_frame	*frame_pointer;
+GBLREF char			object_file_name[], rev_time_buf[];
+GBLREF command_qualifier	cmd_qlf;
+GBLREF int			object_file_des;
+GBLREF int4			dollar_zcstatus;
+GBLREF io_pair			io_curr_device, io_std_device;
+GBLREF mident			routine_name, module_name, int_module_name;
+GBLREF short			object_name_len;
+GBLREF stack_frame		*frame_pointer;
+GBLREF uint4			dollar_tlevel;
+GBLREF unsigned char		source_file_name[];
+GBLREF unsigned short		source_name_len;
 
-LITREF mval		literal_null;
+LITREF	mval		literal_null;
+LITREF	mval		literal_notimeout;
+LITREF	mval		literal_zero;
 
 static bool	tt_so_do_once;
 static io_pair	compile_src_dev;
@@ -183,7 +185,7 @@ bool	open_source_file (void)
 	val.mvtype = MV_STR;
 	val.str.len = source_name_len;
 	val.str.addr = (char *)source_file_name;
-	op_open(&val, &pars, 0, 0);
+	op_open(&val, &pars, (mval *)&literal_zero, 0);
 	dev_in_use = io_curr_device;	/*	save list file info in use if it is opened	*/
 	op_use(&val, &pars);
 	compile_src_dev = io_curr_device;
@@ -248,7 +250,7 @@ int4	read_source_file (void)
 	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);
+	op_readfl(&val, MAX_SRCLINE, (mval *)(dollar_tlevel ? &literal_zero : &literal_notimeout));
 	REVERT;
 	memcpy((TREF(source_buffer)).addr, val.str.addr, val.str.len);
 	cp = (unsigned char *)((TREF(source_buffer)).addr + val.str.len);
diff --git a/sr_unix/trigger_select.c b/sr_unix/trigger_select.c
index a49fadf..03a8888 100644
--- a/sr_unix/trigger_select.c
+++ b/sr_unix/trigger_select.c
@@ -68,7 +68,7 @@ GBLREF	gv_key			*gv_altkey;
 GBLREF	io_pair			io_curr_device;
 GBLREF	io_pair			io_std_device;			/* standard device */
 GBLREF	sgm_info		*sgm_info_ptr;
-GBLREF	int			(*op_open_ptr)(mval *v, mval *p, int t, mval *mspace);
+GBLREF	int			(*op_open_ptr)(mval *v, mval *p, mval *t, mval *mspace);
 GBLREF	uint4			dollar_tlevel;
 GBLREF	unsigned char		t_fail_hist[CDB_MAX_TRIES];
 #ifdef DEBUG
@@ -620,7 +620,7 @@ boolean_t trigger_select_tpwrap(char *select_list, uint4 select_list_len, char *
 		op_pars.str.addr = (char *)open_params_list;
 		op_val.str.len = file_name_len;
 		op_val.str.addr = (char *)file_name;
-		(*op_open_ptr)(&op_val, &op_pars, 0, 0);
+		(*op_open_ptr)(&op_val, &op_pars, (mval *)&literal_zero, NULL);
 	}
 	save_io_curr_device = io_curr_device;
 	op_use(&op_val, &op_pars);
diff --git a/sr_unix/trigger_source_read_andor_verify.c b/sr_unix/trigger_source_read_andor_verify.c
index 5416c48..4d6df52 100644
--- a/sr_unix/trigger_source_read_andor_verify.c
+++ b/sr_unix/trigger_source_read_andor_verify.c
@@ -319,7 +319,7 @@ STATICFNDEF int trigger_source_raov(mstr *trigname, gd_region *reg, rhdtyp **rtn
 	sgm_info		*save_sgm_info_ptr;
 	sgmnt_addrs		*csa, *regcsa;
 	sgmnt_data_ptr_t	csd;
-	boolean_t		db_trigger_cycle_mismatch, ztrig_cycle_mismatch, needs_reload;
+	boolean_t		db_trigger_cycle_mismatch, ztrig_cycle_mismatch, needs_reload = FALSE;
 	DCL_THREADGBL_ACCESS;
 
 	SETUP_THREADGBL_ACCESS;
@@ -458,7 +458,7 @@ STATICFNDEF int trigger_source_raov(mstr *trigname, gd_region *reg, rhdtyp **rtn
 		 * TP that detects and reloads newer triggers (e.g. trigger invocation) restarts the entire TP transaction.
 		 */
 		gvt->trig_local_tn = local_tn;
-		/* If this trigger is already compiled, we are done */
+		/* If this trigger is already compiled, we are done since they are compiled with embed_source */
 		if (NULL != trigdsc->rtn_desc.rt_adr)
 		{
 			DBGTRIGR((stderr, "trigger_source_raov: trigger already compiled, all done\n"));
@@ -466,8 +466,8 @@ STATICFNDEF int trigger_source_raov(mstr *trigname, gd_region *reg, rhdtyp **rtn
 			*rtn_vec = rtn_vector;
 			return 0;
 		}
-		/* Else load the trigger source as needed */
-		if (NULL == rtn_vector->source_code)
+		/* Else load the trigger source as needed. If needs_reload is true then the source was loaded above */
+		if ((NULL == rtn_vector->source_code) && (!needs_reload))
 		{
 			DBGTRIGR((stderr, "trigger_source_raov: get the source\n"));
 			SET_GVTARGET_TO_HASHT_GBL(csa);
diff --git a/sr_unix/ttt.txt b/sr_unix/ttt.txt
index 693b1eb..1b1293b 100755
--- a/sr_unix/ttt.txt
+++ b/sr_unix/ttt.txt
@@ -682,7 +682,7 @@ OC_JMPTSET-WORD:	blbc	r10,#3
 			brw	jmp.1
 OC_JOB:		jsb 	xfer.xf_restartpc
 		irepab	val.7
-		pushl	val.6
+		pushab	val.6
 		pushab	val.5
 		pushab	val.4
 		pushl	val.3
@@ -699,9 +699,9 @@ OC_LABADDR:	pushl	val.2
 		pushl	val.3
 		calls	#3,xfer.xf_labaddr
 		movl	r0,val.0
-OC_LCKDECR:	pushl	val.1
+OC_LCKDECR:	pushab	val.1
 		calls	#1,xfer.xf_lckdecr
-OC_LCKINCR:	pushl	val.1
+OC_LCKINCR:	pushab	val.1
 		calls	#1,xfer.xf_lckincr
 OC_LDADDR-BYTE:	movab	jmp.1,addr.0
 OC_LDADDR-LONG:	movab	jmp.1,addr.0
@@ -719,7 +719,7 @@ OC_LKNAME:	irepab	val.4
 		pushab	val.3
 		pushl	val.2
 		calls	val.1,xfer.xf_lkname
-OC_LOCK:	pushl	val.1
+OC_LOCK:	pushab	val.1
 		calls	#1,xfer.xf_lock
 OC_LVPATWRITE:	jsb 	xfer.xf_restartpc
 		irepab	val.3
@@ -762,7 +762,7 @@ OC_NUMCMP:	movab	val.1,r0
 		jsb	xfer.xf_numcmp
 OC_OPEN:	jsb 	xfer.xf_restartpc
 		pushab	val.4
-		pushl	val.3
+		pushab	val.3
 		pushab	val.2
 		pushab	val.1
 		calls	#4,xfer.xf_open
@@ -773,15 +773,15 @@ OC_PUTINDX:	irepab	val.2
 		calls	val.1,xfer.xf_putindx
 		movl	r0,addr.0
 OC_RDONE:	jsb 	xfer.xf_restartpc
-		pushl	val.1
+		pushab	val.1
 		pushab	val.0
 		calls	#2,xfer.xf_rdone
 OC_READ:	jsb 	xfer.xf_restartpc
-		pushl	val.1
+		pushab	val.1
 		pushab	val.0
 		calls	#2,xfer.xf_read
 OC_READFL:	jsb 	xfer.xf_restartpc
-		pushl	val.2
+		pushab	val.2
 		pushl	val.1
 		pushab	val.0
 		calls	#3,xfer.xf_readfl
@@ -927,7 +927,7 @@ OC_XKILL:	irepab	val.2
 OC_XNEW:	irepab	val.2
 		pushl	val.1
 		jsb	xfer.xf_xnew
-OC_ZALLOCATE:	pushl	val.1
+OC_ZALLOCATE:	pushab	val.1
 		calls	#1,xfer.xf_zallocate
 OC_ZATTACH:	jsb 	xfer.xf_restartpc
 		pushab	val.1
@@ -936,7 +936,7 @@ OC_ZCOMPILE:	pushl	val.2
 		pushab	val.1
 		calls	#2,xfer.xf_zcompile
 OC_ZCONT:	jsb	xfer.xf_zcont
-OC_ZDEALLOCATE:	pushl	val.1
+OC_ZDEALLOCATE:	pushab	val.1
 		calls	#1,xfer.xf_zdeallocate
 OC_ZEDIT:	jsb 	xfer.xf_restartpc
 		pushab	val.2
diff --git a/sr_unix/util_output.c b/sr_unix/util_output.c
index 7565076..067b503 100755
--- a/sr_unix/util_output.c
+++ b/sr_unix/util_output.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	*
@@ -396,7 +396,14 @@ caddr_t util_format(caddr_t message, va_list fao, caddr_t buff, ssize_t size, in
 							isprintable = TRUE;
 						}
 					}
-					assert('\0' != ch);	/* we dont expect <null> bytes in the middle of the string */
+					assert(('\0' != ch) || (2 != faocnt) || !STRNCMP_LIT(message, "!/!_!AD"));
+					/* the assert above is to detect <NUL> bytes in GT.M messages, which cause trouble;
+					 * however, we have no control over the content of user-supplied input: that may contain
+					 * <NUL> bytes, which, as of this writing, we believe is confined, at least in our testing,
+					 * to reporting source syntax errors; therefore the assert tries to side-step any such
+					 * syntax errors by their signature, which is unique to the messages for SRCLINE and
+					 * EXTSRCLIN and. although DBG only, avoids a GBLDEF or gtm_threadglb_def
+					 */
 					assert((c + chlen) <= ctop);
 					assert(0 < chlen);
 					assert((0 < chwidth) || (0 == chwidth) && gtm_utf8_mode);
diff --git a/sr_unix/versions.csh b/sr_unix/versions.csh
index 7700375..55171cb 100755
--- a/sr_unix/versions.csh
+++ b/sr_unix/versions.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	#
@@ -20,6 +20,6 @@
 ############################################
 
 #	gtm_curpro is the current production version
-setenv	gtm_curpro	"V63000A"
+setenv	gtm_curpro	"V63001A"
 #	gtm_verno is the current production version
 setenv	gtm_verno	$gtm_curpro
diff --git a/sr_unix/wcs_flu.c b/sr_unix/wcs_flu.c
index 222c272..51c7179 100644
--- a/sr_unix/wcs_flu.c
+++ b/sr_unix/wcs_flu.c
@@ -59,6 +59,7 @@ GBLREF	jnl_gbls_t		jgbl;
 GBLREF	bool			in_mupip_freeze;
 #ifdef DEBUG
 GBLREF	boolean_t		in_mu_rndwn_file;
+GBLREF	boolean_t		is_src_server;
 GBLREF	boolean_t		mupip_jnl_recover;
 #endif
 
@@ -173,30 +174,30 @@ MBSTART {					\
 #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;			\
-			}									\
-		}										\
-	}											\
+#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)
@@ -204,12 +205,14 @@ boolean_t wcs_flu(uint4 options)
 	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, asyncio;
+	boolean_t		force_epoch;
+	boolean_t		latch_salvaged;
 	unsigned int		lcnt, pass;
 	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;
-        unix_db_info    	*udi;
+	unix_db_info    	*udi;
 	sgmnt_addrs		*csa;
 	sgmnt_data_ptr_t	csd;
 	node_local_ptr_t	cnl;
@@ -219,7 +222,6 @@ boolean_t wcs_flu(uint4 options)
 	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
 
@@ -231,12 +233,15 @@ boolean_t wcs_flu(uint4 options)
 	flush_msync = options & WCSFLU_MSYNC_DB;
 	speedup_nobefore = options & WCSFLU_SPEEDUP_NOBEFORE;
 	clean_dbsync = options & WCSFLU_CLEAN_DBSYNC;
-	/* WCSFLU_IN_COMMIT bit is set if caller is t_end or tp_tend. In that case, we should NOT invoke wcs_recover if we
-	 * encounter an error. Instead we should return the error as such so they can trigger appropriate error handling.
-	 * This is necessary because t_end and tp_tend could have pinned one or more cache-records (cr->in_cw_set non-zero)
-	 * BEFORE invoking wcs_flu. And code AFTER the wcs_flu in them relies on the fact that those cache records stay
-	 * pinned. If wcs_flu invokes wcs_recover, it will reset cr->in_cw_set to 0 for ALL cache-records so code AFTER
-	 * the wcs_flu in the caller will fail because no buffer is pinned at that point.
+	force_epoch = options & WCSFLU_FORCE_EPOCH;
+	/* WCSFLU_IN_COMMIT bit is set if caller is "t_end" or "tp_tend" or a few other functions (currently only "view_dbop").
+	 * This flag is an indication that we should NOT invoke "wcs_recover" if we enter this function while already holding
+	 * crit (because the caller will otherwise get confused by the persistent effects of "wcs_recover")). Instead we should
+	 * return the error as such so they can trigger appropriate error handling. This is necessary because t_end and tp_tend
+	 * could have pinned one or more cache-records (cr->in_cw_set non-zero) BEFORE invoking wcs_flu. And code AFTER the
+	 * wcs_flu in them relies on the fact that those cache records stay pinned. If wcs_flu invokes wcs_recover, it will
+	 * reset cr->in_cw_set to 0 for ALL cache-records so code AFTER the wcs_flu in the caller will fail because no buffer
+	 * is pinned at that point. As for "view_dbop", the reason is captured in a comment in the caller.
 	 */
 	in_commit = options & WCSFLU_IN_COMMIT;
 	reg = gv_cur_region;
@@ -261,6 +266,32 @@ boolean_t wcs_flu(uint4 options)
 	{
 		DO_DB_FSYNC_OUT_OF_CRIT_IF_NEEDED(reg, csa, jpc, jpc->jnl_buff);
 		grab_crit_encr_cycle_sync(reg);
+		/* If it is safe to invoke "wcs_recover" (indicated by the in_commit variable being 0), do that right away
+		 * to fix any dead phase2 commits if needed.
+		 */
+		if (!in_commit && cnl->wcs_phase2_commit_pidcnt && !wcs_phase2_commit_wait(csa, NULL))
+		{	/* Since phase2-commit-wait failed, set wc_blocked to TRUE if not already set.
+			 * Since we hold crit and know it is safe to invoke "wcs_recover", do invoke it.
+			 * But it is possible it returns right away (e.g. "is_src_server" is TRUE). But that
+			 * is okay since "cnl->wc_blocked" would stay set so someone else who gets crit
+			 * (other than the source server) would do the "wcs_recover" call.
+			 */
+			if (!cnl->wc_blocked)
+			{
+				SET_TRACEABLE_VAR(cnl->wc_blocked, TRUE);
+				BG_TRACE_PRO_ANY(csa, wcb_wcs_flu0);
+				send_msg_csa(CSA_ARG(csa) VARLSTCNT(8) ERR_WCBLOCKED, 6,
+						LEN_AND_LIT("wcb_wcs_flu0"), process_id, &csa->ti->curr_tn,
+						DB_LEN_STR(reg));
+			}
+			wcs_recover(reg);
+			assert(!cnl->wcs_phase2_commit_pidcnt || is_src_server); /* source server does not do "wcs_recover" */
+			if (cnl->wcs_phase2_commit_pidcnt)
+			{
+				REL_CRIT_BEFORE_RETURN(cnl, reg);
+				return FALSE;
+			}
+		}
 	}
 	if (!FREEZE_LATCH_HELD(csa))
 		WAIT_FOR_REGION_TO_UNCHILL(csa, csd);
@@ -276,6 +307,7 @@ boolean_t wcs_flu(uint4 options)
 		if (jb->last_eof_written)
 		{
 			assert(jb->fsync_dskaddr == jb->freeaddr);
+			assert(jb->rsrv_freeaddr == 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(cnl, reg);
@@ -311,7 +343,7 @@ boolean_t wcs_flu(uint4 options)
 	{
 		assert(SS_NORMAL == jnl_status);
 		cnl->doing_epoch = sync_epoch || write_epoch;
-		epoch_already_current = (jb->post_epoch_freeaddr == jb->freeaddr);	/* crit held, so this stays valid */
+		epoch_already_current = (!force_epoch && (jb->post_epoch_freeaddr == jb->rsrv_freeaddr));
 		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, don't do heavyweight flush or fsync
@@ -321,7 +353,7 @@ boolean_t wcs_flu(uint4 options)
 			 * image journaling, we skip this portion of code and follow through to the rest of wcs_flu as if
 			 * WCSFLU_SPEEDUP_NOBEFORE was not specified.
 			 */
-			assert(!jgbl.mur_extract); /* Dont know of a case where journal extract calls us with skip_db_flush set */
+			assert(!jgbl.mur_extract); /* Don't know of a case where journal extract calls us with skip_db_flush set */
 			assert(write_epoch);
 			assert(flush_hdr);
 			/* For Recovery/Rollback logic (even in case of NOBEFORE image journaling) to work correctly, the TN values
@@ -335,14 +367,15 @@ boolean_t wcs_flu(uint4 options)
 			if (!jgbl.mur_extract && !epoch_already_current)
 			{
 				if (0 == jpc->pini_addr)
-					jnl_put_jrt_pini(csa);
+					jnl_write_pini(csa);
 				JNL_WRITE_EPOCH_REC(csa, cnl, clean_dbsync);
-			}
+			} else if (epoch_already_current)
+				jb->next_epoch_time = MAXUINT4;
 		}
 		fsync_dskaddr = jb->fsync_dskaddr;	/* take a local copy as it could change concurrently */
-		if (fsync_dskaddr != jb->freeaddr)
+		if (fsync_dskaddr != jb->rsrv_freeaddr)
 		{
-			assert(fsync_dskaddr <= jb->dskaddr);
+			assert((fsync_dskaddr <= jb->dskaddr) || WBTEST_ENABLED(WBTEST_JNL_FILE_LOST_DSKADDR));
 			if (SS_NORMAL != (jnl_status = jnl_flush(reg)))
 			{
 				assert(NOJNL == jpc->channel); /* jnl file lost */
@@ -351,7 +384,13 @@ boolean_t wcs_flu(uint4 options)
 					RTS_ERROR_TEXT("Error with journal flush during wcs_flu1"), jnl_status);
 				return FALSE;
 			}
-			assert(jb->freeaddr == jb->dskaddr);
+#			ifdef DEBUG
+			if (!gtm_white_box_test_case_enabled || (WBTEST_JNL_FILE_LOST_DSKADDR != gtm_white_box_test_case_number))
+			{
+				assert(jb->rsrv_freeaddr == jb->dskaddr);
+				assert(jb->rsrv_freeaddr == jb->freeaddr);
+			}
+#			endif
 			jnl_fsync(reg, jb->dskaddr);
 			assert(jb->fsync_dskaddr == jb->dskaddr);
 		}
@@ -391,10 +430,12 @@ boolean_t wcs_flu(uint4 options)
 		 */
 		asyncio = csd->asyncio;
 		assert(!in_mu_rndwn_file || (0 == cnl->wcs_phase2_commit_pidcnt));
+		/* We already did "wcs_phase2_commit_wait" for !was_crit && !in_commit case. Assert that below. */
+		assert(was_crit || in_commit || !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));
+					|| (WBTEST_WCS_FLU_FAIL == gtm_white_box_test_case_number));
 			REL_CRIT_BEFORE_RETURN(cnl, reg);
 			return FALSE;	/* We expect the caller to trigger cache-recovery which will fix this counter */
 		}
@@ -405,9 +446,6 @@ boolean_t wcs_flu(uint4 options)
 		 * "wcs_wtstart" again down below.
 		 */
 		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
@@ -439,11 +477,11 @@ boolean_t wcs_flu(uint4 options)
 		 *		(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.
+		 * All above exceptions except (b) can be accurately characterized. As for (b), we tried capturing "writers_active"
+		 *	just before the wcs_wtstart above but it is possible that when we noted "writes_active", there were
+		 *	no concurrent writers but one started soon afterwards and before we did our "wcs_wtstart".
+		 *	Because of this, we do not assert anything below for any of the above 4 exceptions.
 		 */
-		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)
@@ -557,17 +595,17 @@ boolean_t wcs_flu(uint4 options)
 						cnl->wcsflu_pid = 0;
 						return FALSE;
 					}
-					assert(!jnl_enabled || jb->fsync_dskaddr == jb->freeaddr);
+					assert(!jnl_enabled || jb->fsync_dskaddr == jb->rsrv_freeaddr);
 					assert(0 == wtstart_or_wtfini_errno);
 					wcs_recover(reg);
 					if (jnl_enabled)
 					{
 						fsync_dskaddr = jb->fsync_dskaddr;
 							/* take a local copy as it could change concurrently */
-						if (fsync_dskaddr != jb->freeaddr)
+						if (fsync_dskaddr != jb->rsrv_freeaddr)
 						{	/* an INCTN record should have been written above */
 							assert(fsync_dskaddr <= jb->dskaddr);
-							assert((jb->freeaddr - fsync_dskaddr) >= INCTN_RECLEN);
+							assert((jb->rsrv_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(reg)))
@@ -581,6 +619,7 @@ boolean_t wcs_flu(uint4 options)
 								return FALSE;
 							}
 							assert(jb->freeaddr == jb->dskaddr);
+							assert(jb->freeaddr == jb->rsrv_freeaddr);
 							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
@@ -629,12 +668,18 @@ boolean_t wcs_flu(uint4 options)
 		 * The next call to jnl_qio_start will do the fsync of the db before doing any jnl qio.
 		 * The basic requirement is that we shouldn't write the epoch out until we have synced the database.
 		 */
-		assert(jb->fsync_dskaddr == jb->freeaddr);
+#		ifdef DEBUG
+		if (!gtm_white_box_test_case_enabled || (WBTEST_JNL_FILE_LOST_DSKADDR != gtm_white_box_test_case_number))
+		{
+			assert(jb->rsrv_freeaddr == jb->fsync_dskaddr);
+			assert(jb->rsrv_freeaddr == jb->freeaddr);
+		}
+#		endif
 		/* If jb->need_db_fsync is TRUE at this point of time, it means we already have a db_fsync waiting
 		 * to happen. This means the epoch due to the earlier need_db_fsync hasn't yet been written out to
 		 * the journal file. But that means we haven't yet flushed the journal buffer which leads to a
 		 * contradiction. (since we have called jnl_flush earlier in this routine and also assert to the
-		 * effect jb->fsync_dskaddr == jb->freeaddr a few lines above).
+		 * effect jb->fsync_dskaddr == jb->rsrv_freeaddr a few lines above).
 		 */
 		assert(!jb->need_db_fsync);
 		for (lcnt = 1; FALSE == (GET_SWAPLOCK(&jb->io_in_prog_latch)); lcnt++)
@@ -648,7 +693,17 @@ boolean_t wcs_flu(uint4 options)
 			}
 			wcs_sleep(SLEEP_JNLQIOLOCKWAIT);	/* since it is a short lock, sleep the minimum */
 			if ((MAXJNLQIOLOCKWAIT / 2 == lcnt) || (MAXJNLQIOLOCKWAIT == lcnt))
-				performCASLatchCheck(&jb->io_in_prog_latch, TRUE);
+			{
+				latch_salvaged = performCASLatchCheck(&jb->io_in_prog_latch, TRUE);
+				if (latch_salvaged)
+				{	/* jb->dskaddr & jb->dsk are updated while holding the io_in_prog_latch.
+					 * Since the latch was salvaged, the holder pid could have been killed
+					 * after jb->dskaddr has been updated but before jb->dsk has been updated
+					 * (in "jnl_sub_qio_start"). Fix the discrepancy if any.
+					 */
+					jb->dsk = (jb->dskaddr % jb->size);
+				}
+			}
 		}
 		if (csd->jnl_before_image && !epoch_already_current)
 			jb->need_db_fsync = TRUE;	/* for comments on need_db_fsync, see jnl_output_sp.c */
@@ -662,9 +717,10 @@ boolean_t wcs_flu(uint4 options)
 		if (!jgbl.mur_extract && !epoch_already_current)
 		{
 			if (0 == jpc->pini_addr)
-				jnl_put_jrt_pini(csa);
+				jnl_write_pini(csa);
 			JNL_WRITE_EPOCH_REC(csa, cnl, clean_dbsync);
-		}
+		} else if (epoch_already_current)
+			jb->next_epoch_time = MAXUINT4;
 	}
 	cnl->last_wcsflu_tn = csa->ti->curr_tn;	/* record when last successful wcs_flu occurred */
 	REL_CRIT_BEFORE_RETURN(cnl, reg);
diff --git a/sr_unix/wcs_wterror.c b/sr_unix/wcs_wterror.c
index 182e84b..44051f8 100644
--- a/sr_unix/wcs_wterror.c
+++ b/sr_unix/wcs_wterror.c
@@ -1,6 +1,6 @@
 /****************************************************************
  *								*
- * Copyright (c) 2016 Fidelity National Information		*
+ * Copyright (c) 2016-2017 Fidelity National Information	*
  * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
@@ -133,7 +133,7 @@ void	wcs_wterror(gd_region *reg, int4 save_errno)
 			} 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,
+						ERR_SYSCALL, 5, LEN_AND_STR(aio_shim_errstr), CALLFROM,
 						save_errno);
 				aio_shim_errstr = NULL;
 			}
diff --git a/sr_unix/wcs_wtfini.c b/sr_unix/wcs_wtfini.c
index 5dd070e..f4c9247 100644
--- a/sr_unix/wcs_wtfini.c
+++ b/sr_unix/wcs_wtfini.c
@@ -206,9 +206,10 @@ int	wcs_wtfini(gd_region *reg, boolean_t do_is_proc_alive_check, cache_rec_ptr_t
 			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.
+		 * fl and bl fields set to 0. REMQHI would have already set them to 0. Assert that.
 		 */
-		csr->state_que.fl = csr->state_que.bl = 0;
+		assert(0 == csr->state_que.fl);
+		assert(0 == csr->state_que.bl);
 		if (csr == start_csr)
 		{
 			status = INSQHI((que_ent_ptr_t)csr, (que_head_ptr_t)whead);
@@ -306,6 +307,8 @@ int	wcs_wtfini(gd_region *reg, boolean_t do_is_proc_alive_check, cache_rec_ptr_t
 			if (0 < aio_retval)
 			{	/* async IO completed successfully with no errors */
 				assert(0 == aio_errno);
+				/* Mark this block as written */
+				csr->needs_first_write = FALSE;
 				/* 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
diff --git a/sr_unix/wcs_wtstart.c b/sr_unix/wcs_wtstart.c
index e7f9e90..6c95120 100644
--- a/sr_unix/wcs_wtstart.c
+++ b/sr_unix/wcs_wtstart.c
@@ -536,7 +536,11 @@ int4	wcs_wtstart(gd_region *region, int4 writes, wtstart_cr_list_t *cr_list_ptr,
 				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);
+			{	/* See similiar logic in wcs_wtstart.c */
+				size = (int)ROUND_UP(size,
+						(FULL_DATABASE_WRITE == csa->do_fullblockwrites && csr->needs_first_write)
+						? csd->blk_size : csa->fullblockwrite_len);
+			}
 			assert(size <= csd->blk_size);
 			INCR_GVSTATS_COUNTER(csa, cnl, n_dsk_write, 1);
 			save_bp = bp;
@@ -643,7 +647,11 @@ int4	wcs_wtstart(gd_region *region, int4 writes, wtstart_cr_list_t *cr_list_ptr,
 			 * 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.
 			 */
+#			ifdef USE_NOAIO
+			do_asyncio = FALSE;
+#			else
 			do_asyncio = csd->asyncio && !multi_proc_in_use;
+#			endif
 			if (udi->fd_opened_with_o_direct)
 			{
 				size = ROUND_UP2(size, DIO_ALIGNSIZE(udi));
@@ -657,6 +665,7 @@ int4	wcs_wtstart(gd_region *region, int4 writes, wtstart_cr_list_t *cr_list_ptr,
 				if (!do_asyncio)
 				{
 					DB_LSEEKWRITE(csa, udi, udi->fn, udi->fd, offset, save_bp, size, save_errno);
+					csr->needs_first_write = FALSE;
 				} else
 				{
 					cr->wip_is_encr_buf = (save_bp != bp);
@@ -670,6 +679,7 @@ int4	wcs_wtstart(gd_region *region, int4 writes, wtstart_cr_list_t *cr_list_ptr,
 							BG_TRACE_PRO_ANY(csa, wcs_wtstart_eagain_incrit);
 							DB_LSEEKWRITE(csa, udi, udi->fn, udi->fd, offset,		\
 											save_bp, size, save_errno);
+							csr->needs_first_write = FALSE;
 						}
 						/* else: We do not hold crit so flushing this is not critical. */
 					} else if (0 == save_errno)
diff --git a/sr_unix/wcs_wtstart_fini.c b/sr_unix/wcs_wtstart_fini.c
index b7e5af8..3e10fe9 100644
--- a/sr_unix/wcs_wtstart_fini.c
+++ b/sr_unix/wcs_wtstart_fini.c
@@ -179,7 +179,11 @@ int wcs_wtstart_fini(gd_region *reg, int nbuffs, cache_rec_ptr_t cr2flush)
 			rel_crit(reg);
 		if (prewtfinifreedlevel == cnl->wcs_buffs_freed)
 		{
-			wcs_sleep(1); /* wtfini did not make any progress so wait a while */
+			wcs_sleep(1);	/* wtfini did not make any progress so wait a while.
+					 * Note: The sleep time of 1 msec here is factored into the calculation
+					 * of MAX_WTSTART_FINI_SLEEPS (it has a MAXSLPTIME multiplicative factor).
+					 * Any changes to the 1 parameter need corresponding changes in the macro.
+					 */
 			num_sleeps++;
 		} else
 			num_sleeps = 0; /* we are making progress so reset the clock */
diff --git a/sr_unix/zro_load.c b/sr_unix/zro_load.c
index c10258e..9c0fa68 100755
--- a/sr_unix/zro_load.c
+++ b/sr_unix/zro_load.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,7 +49,7 @@ error_def(ERR_ZROSYNTAX);
 void zro_load(mstr *str)
 {
 	unsigned		toktyp, status;
-	boolean_t		enable_autorelink;
+	boolean_t		arlink_thisdir_enable, arlink_enabled;
 	mstr			tok, transtr;
 	char			*lp, *top;
 	zro_ent			array[ZRO_MAX_ENTS], *op;
@@ -61,7 +61,7 @@ void zro_load(mstr *str)
 	DCL_THREADGBL_ACCESS;
 
 	SETUP_THREADGBL_ACCESS;
-	ARLINK_ONLY(TREF(arlink_enabled) = FALSE);	/* Set if any zro entry is enabled for autorelink */
+	arlink_enabled = FALSE;
 	memset(array, 0, SIZEOF(array));
 	lp = str->addr;
 	top = lp + str->len;
@@ -95,7 +95,7 @@ void zro_load(mstr *str)
 			 * of it indicating that it is supposed to (1) be a directory and not a shared library and (2) that the
 			 * user desires this directory to have auto-relink capability.
 			 */
-			enable_autorelink = FALSE;
+			arlink_thisdir_enable = FALSE;
 			/* All platforms allow the auto-relink indicator on object directories but only autorelink able platforms
 			 * (#ifdef AUTORELINK_SUPPORTED is set) do anything with it. Other platforms just ignore it. Specifying
 			 * "*" at end of non-object directories causes an error further downstream (FILEPARSE) when the "*" is
@@ -103,8 +103,7 @@ void zro_load(mstr *str)
 			 */
 			if (ZRO_ALF == *(tok.addr + tok.len - 1))
 			{	/* Auto-relink is indicated */
-				enable_autorelink = TRUE;
-				TREF(arlink_enabled) = TRUE;
+				arlink_thisdir_enable = TRUE;
 				--tok.len;		/* Remove indicator from name so we can use it */
 				assert(0 <= tok.len);
 			}
@@ -125,7 +124,7 @@ void zro_load(mstr *str)
 					      ERR_FILEPARSE, 2, tok.len, tok.addr, errno);
 			if (S_ISREG(outbuf.st_mode))
 			{	/* Regular file - a shared library file */
-				if (enable_autorelink)
+				if (arlink_thisdir_enable)
 					/* Auto-relink indicator on shared library not permitted */
 					rts_error_csa(CSA_ARG(NULL) VARLSTCNT(8) ERR_ZROSYNTAX, 2, str->len, str->addr,
 						      ERR_FILEPARSE, 2, tok.len, tok.addr);
@@ -146,12 +145,9 @@ void zro_load(mstr *str)
 					 * object directory specified in $zroutines as if * has been additionally specified.
 					 */
 					if (TREF(gtm_test_autorelink_always))
-					{
-						enable_autorelink = TRUE;
-						TREF(arlink_enabled) = TRUE;
-					}
+						arlink_thisdir_enable = TRUE;
 #					endif
-				if (enable_autorelink)
+				if (arlink_thisdir_enable)
 				{	/* Only setup autorelink struct if it is enabled */
 					if (!TREF(is_mu_rndwn_rlnkctl))
 					{
@@ -175,6 +171,7 @@ void zro_load(mstr *str)
 				}
 #				endif
 			}
+			arlink_enabled |= arlink_thisdir_enable;	/* Cumulative value of enabled dirs */
 			array[0].count++;
 			array[oi].str = tok;
 			toktyp = GETTOK;
@@ -313,5 +310,6 @@ void zro_load(mstr *str)
 			}
 		}
 	}
-	(TREF(set_zroutines_cycle))++;		/* Signal need to recompute zroutines histories for each linked routine */
+	ARLINK_ONLY(TREF(arlink_enabled) = arlink_enabled);	/* Set if any zro entry is enabled for autorelink */
+	(TREF(set_zroutines_cycle))++;			/* Signal need to recompute zroutines histories for each linked routine */
 }
diff --git a/sr_unix/zshow_devices.c b/sr_unix/zshow_devices.c
index 27dc05e..d5a2df8 100755
--- a/sr_unix/zshow_devices.c
+++ b/sr_unix/zshow_devices.c
@@ -172,7 +172,8 @@ void zshow_devices(zshow_out *output)
 		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 ((rm_ptr = (d_rm_struct*)l->iod->dev_sp) && rm == l->iod->type && rm_ptr->pipe && rm_ptr->stderr_parent)
+			if ((rm_ptr = (d_rm_struct*)l->iod->dev_sp) && (rm == l->iod->type)
+					&& rm_ptr->is_pipe && rm_ptr->stderr_parent)
 				continue;
 			if (l->iod->pair.in != l->iod->pair.out)
 			{
@@ -376,7 +377,7 @@ void zshow_devices(zshow_out *output)
 
 					if (rm_ptr->fifo)
 						ZS_STR_OUT(&v,fifo_text);
-					else if (!rm_ptr->pipe)
+					else if (!rm_ptr->is_pipe)
 					{
 						ZS_STR_OUT(&v,rmsfile_text);
 						if (rm_ptr->follow)
diff --git a/sr_unix_cm/gtcm_exit.c b/sr_unix_cm/gtcm_exit.c
index 9fd3d7c..7602417 100755
--- a/sr_unix_cm/gtcm_exit.c
+++ b/sr_unix_cm/gtcm_exit.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	*
@@ -40,7 +40,6 @@ GBLREF int4	 gtcm_exi_condition;
 
 void gtcm_exit()
 {
-	op_lkinit();
 	op_unlock();
 	SET_PROCESS_EXITING_TRUE;
 	gv_rundown();
diff --git a/sr_unix_cm/gtcm_init.c b/sr_unix_cm/gtcm_init.c
old mode 100755
new mode 100644
index c0e78b9..2eaa59f
--- a/sr_unix_cm/gtcm_init.c
+++ b/sr_unix_cm/gtcm_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	*
@@ -52,7 +52,6 @@
 #include "buddy_list.h"
 #include "hashtab_int4.h"
 #include "tp.h"
-#include "init_secshr_addrs.h"
 #include "fork_init.h"
 #include "gtmio.h"
 #include "have_crit.h"
@@ -172,7 +171,6 @@ void gtcm_init(int argc, char_ptr_t argv[])
 	rts_stringpool = stringpool;
 	curr_pattern = pattern_list = &mumps_pattern;
 	pattern_typemask = mumps_pattern.typemask;
-	INVOKE_INIT_SECSHR_ADDRS;
 	initialize_pattern_table();
 	/* Preallocate some timer blocks. */
 	prealloc_gt_timers();
diff --git a/sr_unix_gnp/gtcm_gnp_server.c b/sr_unix_gnp/gtcm_gnp_server.c
index 03fbb95..b81f4a3 100644
--- a/sr_unix_gnp/gtcm_gnp_server.c
+++ b/sr_unix_gnp/gtcm_gnp_server.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	*
@@ -47,7 +47,6 @@
 #include "buddy_list.h"
 #include "hashtab_int4.h"
 #include "tp.h"
-#include "init_secshr_addrs.h"
 #include "cli.h"
 #include "cli_parse.h"
 #include "iosp.h"
@@ -471,7 +470,6 @@ int main(int argc, char **argv, char **envp)
 		EXIT(status);
 	}
 	atexit(gtcm_exi_handler);
-	INVOKE_INIT_SECSHR_ADDRS;
 	initialize_pattern_table();
 	/* Pre-allocate some timer blocks. */
 	prealloc_gt_timers();
diff --git a/sr_unix_nsb/ttt.txt b/sr_unix_nsb/ttt.txt
index c6b4fe2..2301f27 100755
--- a/sr_unix_nsb/ttt.txt
+++ b/sr_unix_nsb/ttt.txt
@@ -631,7 +631,7 @@ OC_JMPTSET-WORD:	blbc	r10,#3
 			brw	jmp.1
 OC_JOB:		jsb 	xfer.xf_restartpc
 		irepab	val.7
-		pushl	val.6
+		pushab	val.6
 		pushab	val.5
 		pushab	val.4
 		pushl	val.3
@@ -648,9 +648,9 @@ OC_LABADDR:	pushl	val.2
 		pushab	val.3
 		calls	#3,xfer.xf_labaddr
 		movl	r0,addr.0
-OC_LCKDECR:	pushl	val.1
+OC_LCKDECR:	pushab	val.1
 		calls	#1,xfer.xf_lckdecr
-OC_LCKINCR:	pushl	val.1
+OC_LCKINCR:	pushab	val.1
 		calls	#1,xfer.xf_lckincr
 OC_LDADDR-BYTE:	movab	jmp.1,addr.0
 OC_LDADDR-LONG:	movab	jmp.1,addr.0
@@ -668,7 +668,7 @@ OC_LKNAME:	irepab	val.4
 		pushab	val.3
 		pushl	val.2
 		calls	val.1,xfer.xf_lkname
-OC_LOCK:	pushl	val.1
+OC_LOCK:	pushab	val.1
 		calls	#1,xfer.xf_lock
 OC_LVPATWRITE:	jsb 	xfer.xf_restartpc
 		irepab	val.3
@@ -701,7 +701,7 @@ OC_NUMCMP:	movab	val.1,r0
 		jsb	xfer.xf_numcmp
 OC_OPEN:	jsb 	xfer.xf_restartpc
 		pushab	val.4
-		pushl	val.3
+		pushab	val.3
 		pushab	val.2
 		pushab	val.1
 		calls	#4,xfer.xf_open
@@ -720,15 +720,15 @@ OC_PUTINDX:	irepab	val.2
 		calls	val.1,xfer.xf_putindx
 		movl	r0,addr.0
 OC_RDONE:	jsb 	xfer.xf_restartpc
-		pushl	val.1
+		pushab	val.1
 		pushab	val.0
 		calls	#2,xfer.xf_rdone
 OC_READ:	jsb 	xfer.xf_restartpc
-		pushl	val.1
+		pushab	val.1
 		pushab	val.0
 		calls	#2,xfer.xf_read
 OC_READFL:	jsb 	xfer.xf_restartpc
-		pushl	val.2
+		pushab	val.2
 		pushl	val.1
 		pushab	val.0
 		calls	#3,xfer.xf_readfl
@@ -874,7 +874,7 @@ OC_XKILL:	irepab	val.2
 OC_XNEW:	irepab	val.2
 		pushl	val.1
 		jsb	xfer.xf_xnew
-OC_ZALLOCATE:	pushl	val.1
+OC_ZALLOCATE:	pushab	val.1
 		calls	#1,xfer.xf_zallocate
 OC_ZATTACH:	jsb 	xfer.xf_restartpc
 		pushab	val.1
@@ -883,7 +883,7 @@ OC_ZCOMPILE:	pushl	val.2
 		pushab	val.1
 		calls	#2,xfer.xf_zcompile
 OC_ZCONT:	jsb	xfer.xf_zcont
-OC_ZDEALLOCATE:	pushl	val.1
+OC_ZDEALLOCATE:	pushab	val.1
 		calls	#1,xfer.xf_zdeallocate
 OC_ZEDIT:	jsb 	xfer.xf_restartpc
 		pushab	val.2
diff --git a/sr_x86_64/GDEINITSZ.m b/sr_x86_64/GDEINITSZ.m
deleted file mode 100644
index 109130c..0000000
--- a/sr_x86_64/GDEINITSZ.m
+++ /dev/null
@@ -1,24 +0,0 @@
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
-;
-; 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 36ae27b..5335a01 100644
--- a/sr_x86_64/GTMDefinedTypesInitDebug.m
+++ b/sr_x86_64/GTMDefinedTypesInitDebug.m
@@ -11,14 +11,14 @@
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
 ;
-; 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
+; Generated by scantypedefs.m at 16:03:08 on 2017-08-16
+; Build done with GT.M version: GT.M V6.3-001A 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
+;   $gtm_dist: /usr/library/V63001A/dbg
+;   $gtm_exe: /usr/library/V63002/dbg
+;   $gtm_src: /usr/library/V63002/src
+;   $gtm_inc: /usr/library/V63002/inc
 ;
 ; Note this file should not be manually invoked
 ;
@@ -1085,11 +1085,11 @@ Init
 	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,"name")="cache_que_heads.cache_array[0].needs_first_write"
 	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 gtmtypfldindx("cache_que_heads","cache_array[0].needs_first_write")=52
 	;
 	Set gtmtypes("cache_rec")="struct"
 	Set gtmtypes("cache_rec",0)=38
@@ -1279,11 +1279,11 @@ Init
 	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,"name")="cache_rec.needs_first_write"
 	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 gtmtypfldindx("cache_rec","needs_first_write")=38
 	;
 	Set gtmtypes("cache_state_rec")="struct"
 	Set gtmtypes("cache_state_rec",0)=35
@@ -1458,11 +1458,11 @@ Init
 	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,"name")="cache_state_rec.needs_first_write"
 	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 gtmtypfldindx("cache_state_rec","needs_first_write")=35
 	;
 	Set gtmtypes("callin_entry_list")="struct"
 	Set gtmtypes("callin_entry_list",0)=14
@@ -2764,11 +2764,11 @@ Init
 	Set gtmtypes("d_rm_struct",5,"len")=4
 	Set gtmtypes("d_rm_struct",5,"type")="boolean_t"
 	Set gtmtypfldindx("d_rm_struct","fifo")=5
-	Set gtmtypes("d_rm_struct",6,"name")="d_rm_struct.gtm_pipe1"
+	Set gtmtypes("d_rm_struct",6,"name")="d_rm_struct.is_pipe"
 	Set gtmtypes("d_rm_struct",6,"off")=20
 	Set gtmtypes("d_rm_struct",6,"len")=4
 	Set gtmtypes("d_rm_struct",6,"type")="boolean_t"
-	Set gtmtypfldindx("d_rm_struct","gtm_pipe1")=6
+	Set gtmtypfldindx("d_rm_struct","is_pipe")=6
 	Set gtmtypes("d_rm_struct",7,"name")="d_rm_struct.independent"
 	Set gtmtypes("d_rm_struct",7,"off")=24
 	Set gtmtypes("d_rm_struct",7,"len")=4
@@ -6959,11 +6959,11 @@ Init
 	Set gtmtypes("gtmsource_local_struct",53,"len")=4
 	Set gtmtypes("gtmsource_local_struct",53,"type")="int"
 	Set gtmtypfldindx("gtmsource_local_struct","num_renegotiations")=53
-	Set gtmtypes("gtmsource_local_struct",54,"name")="gtmsource_local_struct.padding"
+	Set gtmtypes("gtmsource_local_struct",54,"name")="gtmsource_local_struct.filler_8byte_align"
 	Set gtmtypes("gtmsource_local_struct",54,"off")=1540
 	Set gtmtypes("gtmsource_local_struct",54,"len")=4
 	Set gtmtypes("gtmsource_local_struct",54,"type")="int"
-	Set gtmtypfldindx("gtmsource_local_struct","padding")=54
+	Set gtmtypfldindx("gtmsource_local_struct","filler_8byte_align")=54
 	;
 	Set gtmtypes("gtmsource_options_t")="struct"
 	Set gtmtypes("gtmsource_options_t",0)=34
@@ -9682,6 +9682,99 @@ Init
 	Set gtmtypes("ipcs_mesg",7,"type")="char"
 	Set gtmtypfldindx("ipcs_mesg","fn")=7
 	;
+	Set gtmtypes("jbuf_phase2_in_prog_t")="struct"
+	Set gtmtypes("jbuf_phase2_in_prog_t",0)=12
+	Set gtmtypes("jbuf_phase2_in_prog_t","len")=48
+	Set gtmtypes("jbuf_phase2_in_prog_t",1,"name")="jbuf_phase2_in_prog_t.curr_tn"
+	Set gtmtypes("jbuf_phase2_in_prog_t",1,"off")=0
+	Set gtmtypes("jbuf_phase2_in_prog_t",1,"len")=8
+	Set gtmtypes("jbuf_phase2_in_prog_t",1,"type")="uint64_t"
+	Set gtmtypfldindx("jbuf_phase2_in_prog_t","curr_tn")=1
+	Set gtmtypes("jbuf_phase2_in_prog_t",2,"name")="jbuf_phase2_in_prog_t.jnl_seqno"
+	Set gtmtypes("jbuf_phase2_in_prog_t",2,"off")=8
+	Set gtmtypes("jbuf_phase2_in_prog_t",2,"len")=8
+	Set gtmtypes("jbuf_phase2_in_prog_t",2,"type")="uint64_t"
+	Set gtmtypfldindx("jbuf_phase2_in_prog_t","jnl_seqno")=2
+	Set gtmtypes("jbuf_phase2_in_prog_t",3,"name")="jbuf_phase2_in_prog_t.strm_seqno"
+	Set gtmtypes("jbuf_phase2_in_prog_t",3,"off")=16
+	Set gtmtypes("jbuf_phase2_in_prog_t",3,"len")=8
+	Set gtmtypes("jbuf_phase2_in_prog_t",3,"type")="uint64_t"
+	Set gtmtypfldindx("jbuf_phase2_in_prog_t","strm_seqno")=3
+	Set gtmtypes("jbuf_phase2_in_prog_t",4,"name")="jbuf_phase2_in_prog_t.process_id"
+	Set gtmtypes("jbuf_phase2_in_prog_t",4,"off")=24
+	Set gtmtypes("jbuf_phase2_in_prog_t",4,"len")=4
+	Set gtmtypes("jbuf_phase2_in_prog_t",4,"type")="unsigned-int"
+	Set gtmtypfldindx("jbuf_phase2_in_prog_t","process_id")=4
+	Set gtmtypes("jbuf_phase2_in_prog_t",5,"name")="jbuf_phase2_in_prog_t.start_freeaddr"
+	Set gtmtypes("jbuf_phase2_in_prog_t",5,"off")=28
+	Set gtmtypes("jbuf_phase2_in_prog_t",5,"len")=4
+	Set gtmtypes("jbuf_phase2_in_prog_t",5,"type")="unsigned-int"
+	Set gtmtypfldindx("jbuf_phase2_in_prog_t","start_freeaddr")=5
+	Set gtmtypes("jbuf_phase2_in_prog_t",6,"name")="jbuf_phase2_in_prog_t.tot_jrec_len"
+	Set gtmtypes("jbuf_phase2_in_prog_t",6,"off")=32
+	Set gtmtypes("jbuf_phase2_in_prog_t",6,"len")=4
+	Set gtmtypes("jbuf_phase2_in_prog_t",6,"type")="unsigned-int"
+	Set gtmtypfldindx("jbuf_phase2_in_prog_t","tot_jrec_len")=6
+	Set gtmtypes("jbuf_phase2_in_prog_t",7,"name")="jbuf_phase2_in_prog_t.pini_addr"
+	Set gtmtypes("jbuf_phase2_in_prog_t",7,"off")=36
+	Set gtmtypes("jbuf_phase2_in_prog_t",7,"len")=4
+	Set gtmtypes("jbuf_phase2_in_prog_t",7,"type")="unsigned-int"
+	Set gtmtypfldindx("jbuf_phase2_in_prog_t","pini_addr")=7
+	Set gtmtypes("jbuf_phase2_in_prog_t",8,"name")="jbuf_phase2_in_prog_t.jrec_time"
+	Set gtmtypes("jbuf_phase2_in_prog_t",8,"off")=40
+	Set gtmtypes("jbuf_phase2_in_prog_t",8,"len")=4
+	Set gtmtypes("jbuf_phase2_in_prog_t",8,"type")="unsigned-int"
+	Set gtmtypfldindx("jbuf_phase2_in_prog_t","jrec_time")=8
+	Set gtmtypes("jbuf_phase2_in_prog_t",9,"name")="jbuf_phase2_in_prog_t.in_phase2"
+	Set gtmtypes("jbuf_phase2_in_prog_t",9,"off")=44
+	Set gtmtypes("jbuf_phase2_in_prog_t",9,"len")=1
+	Set gtmtypes("jbuf_phase2_in_prog_t",9,"type")="char"
+	Set gtmtypfldindx("jbuf_phase2_in_prog_t","in_phase2")=9
+	Set gtmtypes("jbuf_phase2_in_prog_t",10,"name")="jbuf_phase2_in_prog_t.replication"
+	Set gtmtypes("jbuf_phase2_in_prog_t",10,"off")=45
+	Set gtmtypes("jbuf_phase2_in_prog_t",10,"len")=1
+	Set gtmtypes("jbuf_phase2_in_prog_t",10,"type")="char"
+	Set gtmtypfldindx("jbuf_phase2_in_prog_t","replication")=10
+	Set gtmtypes("jbuf_phase2_in_prog_t",11,"name")="jbuf_phase2_in_prog_t.write_complete"
+	Set gtmtypes("jbuf_phase2_in_prog_t",11,"off")=46
+	Set gtmtypes("jbuf_phase2_in_prog_t",11,"len")=1
+	Set gtmtypes("jbuf_phase2_in_prog_t",11,"type")="char"
+	Set gtmtypfldindx("jbuf_phase2_in_prog_t","write_complete")=11
+	Set gtmtypes("jbuf_phase2_in_prog_t",12,"name")="jbuf_phase2_in_prog_t.filler_8byte_align"
+	Set gtmtypes("jbuf_phase2_in_prog_t",12,"off")=47
+	Set gtmtypes("jbuf_phase2_in_prog_t",12,"len")=1
+	Set gtmtypes("jbuf_phase2_in_prog_t",12,"type")="char"
+	Set gtmtypfldindx("jbuf_phase2_in_prog_t","filler_8byte_align")=12
+	;
+	Set gtmtypes("jbuf_rsrv_struct_t")="struct"
+	Set gtmtypes("jbuf_rsrv_struct_t",0)=5
+	Set gtmtypes("jbuf_rsrv_struct_t","len")=24
+	Set gtmtypes("jbuf_rsrv_struct_t",1,"name")="jbuf_rsrv_struct_t.alloclen"
+	Set gtmtypes("jbuf_rsrv_struct_t",1,"off")=0
+	Set gtmtypes("jbuf_rsrv_struct_t",1,"len")=4
+	Set gtmtypes("jbuf_rsrv_struct_t",1,"type")="unsigned-int"
+	Set gtmtypfldindx("jbuf_rsrv_struct_t","alloclen")=1
+	Set gtmtypes("jbuf_rsrv_struct_t",2,"name")="jbuf_rsrv_struct_t.usedlen"
+	Set gtmtypes("jbuf_rsrv_struct_t",2,"off")=4
+	Set gtmtypes("jbuf_rsrv_struct_t",2,"len")=4
+	Set gtmtypes("jbuf_rsrv_struct_t",2,"type")="unsigned-int"
+	Set gtmtypfldindx("jbuf_rsrv_struct_t","usedlen")=2
+	Set gtmtypes("jbuf_rsrv_struct_t",3,"name")="jbuf_rsrv_struct_t.tot_jrec_len"
+	Set gtmtypes("jbuf_rsrv_struct_t",3,"off")=8
+	Set gtmtypes("jbuf_rsrv_struct_t",3,"len")=4
+	Set gtmtypes("jbuf_rsrv_struct_t",3,"type")="unsigned-int"
+	Set gtmtypfldindx("jbuf_rsrv_struct_t","tot_jrec_len")=3
+	Set gtmtypes("jbuf_rsrv_struct_t",4,"name")="jbuf_rsrv_struct_t.phase2_commit_index"
+	Set gtmtypes("jbuf_rsrv_struct_t",4,"off")=12
+	Set gtmtypes("jbuf_rsrv_struct_t",4,"len")=4
+	Set gtmtypes("jbuf_rsrv_struct_t",4,"type")="unsigned-int"
+	Set gtmtypfldindx("jbuf_rsrv_struct_t","phase2_commit_index")=4
+	Set gtmtypes("jbuf_rsrv_struct_t",5,"name")="jbuf_rsrv_struct_t.jrs_array"
+	Set gtmtypes("jbuf_rsrv_struct_t",5,"off")=16
+	Set gtmtypes("jbuf_rsrv_struct_t",5,"len")=8
+	Set gtmtypes("jbuf_rsrv_struct_t",5,"type")="addr"
+	Set gtmtypfldindx("jbuf_rsrv_struct_t","jrs_array")=5
+	;
 	Set gtmtypes("jext_heap_elem_t")="struct"
 	Set gtmtypes("jext_heap_elem_t",0)=2
 	Set gtmtypes("jext_heap_elem_t","len")=16
@@ -9711,8 +9804,8 @@ Init
 	Set gtmtypfldindx("jnl_action","nodeflags")=2
 	;
 	Set gtmtypes("jnl_buffer")="struct"
-	Set gtmtypes("jnl_buffer",0)=60
-	Set gtmtypes("jnl_buffer","len")=648
+	Set gtmtypes("jnl_buffer",0)=85
+	Set gtmtypes("jnl_buffer","len")=197360
 	Set gtmtypes("jnl_buffer",1,"name")="jnl_buffer.eov_tn"
 	Set gtmtypes("jnl_buffer",1,"off")=0
 	Set gtmtypes("jnl_buffer",1,"len")=8
@@ -9769,252 +9862,379 @@ Init
 	Set gtmtypes("jnl_buffer",11,"len")=4
 	Set gtmtypes("jnl_buffer",11,"type")="int"
 	Set gtmtypfldindx("jnl_buffer","gtm_free")=11
-	Set gtmtypes("jnl_buffer",12,"name")="jnl_buffer.freeaddr"
+	Set gtmtypes("jnl_buffer",12,"name")="jnl_buffer.rsrv_free"
 	Set gtmtypes("jnl_buffer",12,"off")=188
 	Set gtmtypes("jnl_buffer",12,"len")=4
-	Set gtmtypes("jnl_buffer",12,"type")="unsigned-int"
-	Set gtmtypfldindx("jnl_buffer","freeaddr")=12
-	Set gtmtypes("jnl_buffer",13,"name")="jnl_buffer.end_of_data"
+	Set gtmtypes("jnl_buffer",12,"type")="int"
+	Set gtmtypfldindx("jnl_buffer","rsrv_free")=12
+	Set gtmtypes("jnl_buffer",13,"name")="jnl_buffer.freeaddr"
 	Set gtmtypes("jnl_buffer",13,"off")=192
 	Set gtmtypes("jnl_buffer",13,"len")=4
 	Set gtmtypes("jnl_buffer",13,"type")="unsigned-int"
-	Set gtmtypfldindx("jnl_buffer","end_of_data")=13
-	Set gtmtypes("jnl_buffer",14,"name")="jnl_buffer.filesize"
+	Set gtmtypfldindx("jnl_buffer","freeaddr")=13
+	Set gtmtypes("jnl_buffer",14,"name")="jnl_buffer.rsrv_freeaddr"
 	Set gtmtypes("jnl_buffer",14,"off")=196
 	Set gtmtypes("jnl_buffer",14,"len")=4
 	Set gtmtypes("jnl_buffer",14,"type")="unsigned-int"
-	Set gtmtypfldindx("jnl_buffer","filesize")=14
-	Set gtmtypes("jnl_buffer",15,"name")="jnl_buffer.blocked"
+	Set gtmtypfldindx("jnl_buffer","rsrv_freeaddr")=14
+	Set gtmtypes("jnl_buffer",15,"name")="jnl_buffer.next_align_addr"
 	Set gtmtypes("jnl_buffer",15,"off")=200
 	Set gtmtypes("jnl_buffer",15,"len")=4
-	Set gtmtypes("jnl_buffer",15,"type")="int"
-	Set gtmtypfldindx("jnl_buffer","blocked")=15
-	Set gtmtypes("jnl_buffer",16,"name")="jnl_buffer.fsync_dskaddr"
+	Set gtmtypes("jnl_buffer",15,"type")="unsigned-int"
+	Set gtmtypfldindx("jnl_buffer","next_align_addr")=15
+	Set gtmtypes("jnl_buffer",16,"name")="jnl_buffer.end_of_data"
 	Set gtmtypes("jnl_buffer",16,"off")=204
 	Set gtmtypes("jnl_buffer",16,"len")=4
 	Set gtmtypes("jnl_buffer",16,"type")="unsigned-int"
-	Set gtmtypfldindx("jnl_buffer","fsync_dskaddr")=16
-	Set gtmtypes("jnl_buffer",17,"name")="jnl_buffer.dsk"
+	Set gtmtypfldindx("jnl_buffer","end_of_data")=16
+	Set gtmtypes("jnl_buffer",17,"name")="jnl_buffer.filesize"
 	Set gtmtypes("jnl_buffer",17,"off")=208
 	Set gtmtypes("jnl_buffer",17,"len")=4
-	Set gtmtypes("jnl_buffer",17,"type")="int"
-	Set gtmtypfldindx("jnl_buffer","dsk")=17
-	Set gtmtypes("jnl_buffer",18,"name")="jnl_buffer.wrtsize"
+	Set gtmtypes("jnl_buffer",17,"type")="unsigned-int"
+	Set gtmtypfldindx("jnl_buffer","filesize")=17
+	Set gtmtypes("jnl_buffer",18,"name")="jnl_buffer.phase2_commit_index1"
 	Set gtmtypes("jnl_buffer",18,"off")=212
 	Set gtmtypes("jnl_buffer",18,"len")=4
-	Set gtmtypes("jnl_buffer",18,"type")="int"
-	Set gtmtypfldindx("jnl_buffer","wrtsize")=18
-	Set gtmtypes("jnl_buffer",19,"name")="jnl_buffer.dskaddr"
+	Set gtmtypes("jnl_buffer",18,"type")="unsigned-int"
+	Set gtmtypfldindx("jnl_buffer","phase2_commit_index1")=18
+	Set gtmtypes("jnl_buffer",19,"name")="jnl_buffer.phase2_commit_index2"
 	Set gtmtypes("jnl_buffer",19,"off")=216
 	Set gtmtypes("jnl_buffer",19,"len")=4
 	Set gtmtypes("jnl_buffer",19,"type")="unsigned-int"
-	Set gtmtypfldindx("jnl_buffer","dskaddr")=19
-	Set gtmtypes("jnl_buffer",20,"name")="jnl_buffer.now_writer"
-	Set gtmtypes("jnl_buffer",20,"off")=220
-	Set gtmtypes("jnl_buffer",20,"len")=4
-	Set gtmtypes("jnl_buffer",20,"type")="unsigned-int"
-	Set gtmtypfldindx("jnl_buffer","now_writer")=20
-	Set gtmtypes("jnl_buffer",21,"name")="jnl_buffer.image_count"
+	Set gtmtypfldindx("jnl_buffer","phase2_commit_index2")=19
+	Set gtmtypes("jnl_buffer",20,"name")="jnl_buffer.phase2_commit_array"
+	Set gtmtypes("jnl_buffer",20,"off")=224
+	Set gtmtypes("jnl_buffer",20,"len")=196608
+	Set gtmtypes("jnl_buffer",20,"type")="jbuf_phase2_in_prog_t"
+	Set gtmtypfldindx("jnl_buffer","phase2_commit_array")=20
+	Set gtmtypes("jnl_buffer",20,"dim")=4096
+	Set gtmtypes("jnl_buffer",21,"name")="jnl_buffer.phase2_commit_array[0].curr_tn"
 	Set gtmtypes("jnl_buffer",21,"off")=224
-	Set gtmtypes("jnl_buffer",21,"len")=4
-	Set gtmtypes("jnl_buffer",21,"type")="unsigned-int"
-	Set gtmtypfldindx("jnl_buffer","image_count")=21
-	Set gtmtypes("jnl_buffer",22,"name")="jnl_buffer.iosb"
-	Set gtmtypes("jnl_buffer",22,"off")=228
+	Set gtmtypes("jnl_buffer",21,"len")=8
+	Set gtmtypes("jnl_buffer",21,"type")="uint64_t"
+	Set gtmtypfldindx("jnl_buffer","phase2_commit_array[0].curr_tn")=21
+	Set gtmtypes("jnl_buffer",22,"name")="jnl_buffer.phase2_commit_array[0].jnl_seqno"
+	Set gtmtypes("jnl_buffer",22,"off")=232
 	Set gtmtypes("jnl_buffer",22,"len")=8
-	Set gtmtypes("jnl_buffer",22,"type")="struct"
-	Set gtmtypfldindx("jnl_buffer","iosb")=22
-	Set gtmtypes("jnl_buffer",23,"name")="jnl_buffer.iosb.cond"
-	Set gtmtypes("jnl_buffer",23,"off")=228
-	Set gtmtypes("jnl_buffer",23,"len")=2
-	Set gtmtypes("jnl_buffer",23,"type")="short"
-	Set gtmtypfldindx("jnl_buffer","iosb.cond")=23
-	Set gtmtypes("jnl_buffer",24,"name")="jnl_buffer.iosb.length"
-	Set gtmtypes("jnl_buffer",24,"off")=230
-	Set gtmtypes("jnl_buffer",24,"len")=2
-	Set gtmtypes("jnl_buffer",24,"type")="unsigned-short"
-	Set gtmtypfldindx("jnl_buffer","iosb.length")=24
-	Set gtmtypes("jnl_buffer",25,"name")="jnl_buffer.iosb.dev_specific"
-	Set gtmtypes("jnl_buffer",25,"off")=232
+	Set gtmtypes("jnl_buffer",22,"type")="uint64_t"
+	Set gtmtypfldindx("jnl_buffer","phase2_commit_array[0].jnl_seqno")=22
+	Set gtmtypes("jnl_buffer",23,"name")="jnl_buffer.phase2_commit_array[0].strm_seqno"
+	Set gtmtypes("jnl_buffer",23,"off")=240
+	Set gtmtypes("jnl_buffer",23,"len")=8
+	Set gtmtypes("jnl_buffer",23,"type")="uint64_t"
+	Set gtmtypfldindx("jnl_buffer","phase2_commit_array[0].strm_seqno")=23
+	Set gtmtypes("jnl_buffer",24,"name")="jnl_buffer.phase2_commit_array[0].process_id"
+	Set gtmtypes("jnl_buffer",24,"off")=248
+	Set gtmtypes("jnl_buffer",24,"len")=4
+	Set gtmtypes("jnl_buffer",24,"type")="unsigned-int"
+	Set gtmtypfldindx("jnl_buffer","phase2_commit_array[0].process_id")=24
+	Set gtmtypes("jnl_buffer",25,"name")="jnl_buffer.phase2_commit_array[0].start_freeaddr"
+	Set gtmtypes("jnl_buffer",25,"off")=252
 	Set gtmtypes("jnl_buffer",25,"len")=4
-	Set gtmtypes("jnl_buffer",25,"type")="int"
-	Set gtmtypfldindx("jnl_buffer","iosb.dev_specific")=25
-	Set gtmtypes("jnl_buffer",26,"name")="jnl_buffer.log2_of_alignsize"
-	Set gtmtypes("jnl_buffer",26,"off")=236
+	Set gtmtypes("jnl_buffer",25,"type")="unsigned-int"
+	Set gtmtypfldindx("jnl_buffer","phase2_commit_array[0].start_freeaddr")=25
+	Set gtmtypes("jnl_buffer",26,"name")="jnl_buffer.phase2_commit_array[0].tot_jrec_len"
+	Set gtmtypes("jnl_buffer",26,"off")=256
 	Set gtmtypes("jnl_buffer",26,"len")=4
 	Set gtmtypes("jnl_buffer",26,"type")="unsigned-int"
-	Set gtmtypfldindx("jnl_buffer","log2_of_alignsize")=26
-	Set gtmtypes("jnl_buffer",27,"name")="jnl_buffer.eov_timestamp"
-	Set gtmtypes("jnl_buffer",27,"off")=240
+	Set gtmtypfldindx("jnl_buffer","phase2_commit_array[0].tot_jrec_len")=26
+	Set gtmtypes("jnl_buffer",27,"name")="jnl_buffer.phase2_commit_array[0].pini_addr"
+	Set gtmtypes("jnl_buffer",27,"off")=260
 	Set gtmtypes("jnl_buffer",27,"len")=4
 	Set gtmtypes("jnl_buffer",27,"type")="unsigned-int"
-	Set gtmtypfldindx("jnl_buffer","eov_timestamp")=27
-	Set gtmtypes("jnl_buffer",28,"name")="jnl_buffer.cycle"
-	Set gtmtypes("jnl_buffer",28,"off")=244
+	Set gtmtypfldindx("jnl_buffer","phase2_commit_array[0].pini_addr")=27
+	Set gtmtypes("jnl_buffer",28,"name")="jnl_buffer.phase2_commit_array[0].jrec_time"
+	Set gtmtypes("jnl_buffer",28,"off")=264
 	Set gtmtypes("jnl_buffer",28,"len")=4
 	Set gtmtypes("jnl_buffer",28,"type")="unsigned-int"
-	Set gtmtypfldindx("jnl_buffer","cycle")=28
-	Set gtmtypes("jnl_buffer",29,"name")="jnl_buffer.qiocnt"
-	Set gtmtypes("jnl_buffer",29,"off")=248
-	Set gtmtypes("jnl_buffer",29,"len")=4
-	Set gtmtypes("jnl_buffer",29,"type")="int"
-	Set gtmtypfldindx("jnl_buffer","qiocnt")=29
-	Set gtmtypes("jnl_buffer",30,"name")="jnl_buffer.bytcnt"
-	Set gtmtypes("jnl_buffer",30,"off")=252
-	Set gtmtypes("jnl_buffer",30,"len")=4
-	Set gtmtypes("jnl_buffer",30,"type")="int"
-	Set gtmtypfldindx("jnl_buffer","bytcnt")=30
-	Set gtmtypes("jnl_buffer",31,"name")="jnl_buffer.errcnt"
-	Set gtmtypes("jnl_buffer",31,"off")=256
-	Set gtmtypes("jnl_buffer",31,"len")=4
-	Set gtmtypes("jnl_buffer",31,"type")="int"
-	Set gtmtypfldindx("jnl_buffer","errcnt")=31
-	Set gtmtypes("jnl_buffer",32,"name")="jnl_buffer.reccnt"
-	Set gtmtypes("jnl_buffer",32,"off")=260
-	Set gtmtypes("jnl_buffer",32,"len")=144
-	Set gtmtypes("jnl_buffer",32,"type")="int"
-	Set gtmtypfldindx("jnl_buffer","reccnt")=32
-	Set gtmtypes("jnl_buffer",32,"dim")=36
-	Set gtmtypes("jnl_buffer",33,"name")="jnl_buffer.filler_align"
-	Set gtmtypes("jnl_buffer",33,"off")=404
+	Set gtmtypfldindx("jnl_buffer","phase2_commit_array[0].jrec_time")=28
+	Set gtmtypes("jnl_buffer",29,"name")="jnl_buffer.phase2_commit_array[0].in_phase2"
+	Set gtmtypes("jnl_buffer",29,"off")=268
+	Set gtmtypes("jnl_buffer",29,"len")=1
+	Set gtmtypes("jnl_buffer",29,"type")="char"
+	Set gtmtypfldindx("jnl_buffer","phase2_commit_array[0].in_phase2")=29
+	Set gtmtypes("jnl_buffer",30,"name")="jnl_buffer.phase2_commit_array[0].replication"
+	Set gtmtypes("jnl_buffer",30,"off")=269
+	Set gtmtypes("jnl_buffer",30,"len")=1
+	Set gtmtypes("jnl_buffer",30,"type")="char"
+	Set gtmtypfldindx("jnl_buffer","phase2_commit_array[0].replication")=30
+	Set gtmtypes("jnl_buffer",31,"name")="jnl_buffer.phase2_commit_array[0].write_complete"
+	Set gtmtypes("jnl_buffer",31,"off")=270
+	Set gtmtypes("jnl_buffer",31,"len")=1
+	Set gtmtypes("jnl_buffer",31,"type")="char"
+	Set gtmtypfldindx("jnl_buffer","phase2_commit_array[0].write_complete")=31
+	Set gtmtypes("jnl_buffer",32,"name")="jnl_buffer.phase2_commit_array[0].filler_8byte_align"
+	Set gtmtypes("jnl_buffer",32,"off")=271
+	Set gtmtypes("jnl_buffer",32,"len")=1
+	Set gtmtypes("jnl_buffer",32,"type")="char"
+	Set gtmtypfldindx("jnl_buffer","phase2_commit_array[0].filler_8byte_align")=32
+	Set gtmtypes("jnl_buffer",33,"name")="jnl_buffer.blocked"
+	Set gtmtypes("jnl_buffer",33,"off")=196832
 	Set gtmtypes("jnl_buffer",33,"len")=4
 	Set gtmtypes("jnl_buffer",33,"type")="int"
-	Set gtmtypfldindx("jnl_buffer","filler_align")=33
-	Set gtmtypes("jnl_buffer",34,"name")="jnl_buffer.prev_jrec_time"
-	Set gtmtypes("jnl_buffer",34,"off")=408
+	Set gtmtypfldindx("jnl_buffer","blocked")=33
+	Set gtmtypes("jnl_buffer",34,"name")="jnl_buffer.fsync_dskaddr"
+	Set gtmtypes("jnl_buffer",34,"off")=196836
 	Set gtmtypes("jnl_buffer",34,"len")=4
 	Set gtmtypes("jnl_buffer",34,"type")="unsigned-int"
-	Set gtmtypfldindx("jnl_buffer","prev_jrec_time")=34
-	Set gtmtypes("jnl_buffer",35,"name")="jnl_buffer.free_update_pid"
-	Set gtmtypes("jnl_buffer",35,"off")=412
+	Set gtmtypfldindx("jnl_buffer","fsync_dskaddr")=34
+	Set gtmtypes("jnl_buffer",35,"name")="jnl_buffer.dsk"
+	Set gtmtypes("jnl_buffer",35,"off")=196840
 	Set gtmtypes("jnl_buffer",35,"len")=4
 	Set gtmtypes("jnl_buffer",35,"type")="int"
-	Set gtmtypfldindx("jnl_buffer","free_update_pid")=35
-	Set gtmtypes("jnl_buffer",36,"name")="jnl_buffer.next_epoch_time"
-	Set gtmtypes("jnl_buffer",36,"off")=416
+	Set gtmtypfldindx("jnl_buffer","dsk")=35
+	Set gtmtypes("jnl_buffer",36,"name")="jnl_buffer.wrtsize"
+	Set gtmtypes("jnl_buffer",36,"off")=196844
 	Set gtmtypes("jnl_buffer",36,"len")=4
-	Set gtmtypes("jnl_buffer",36,"type")="unsigned-int"
-	Set gtmtypfldindx("jnl_buffer","next_epoch_time")=36
-	Set gtmtypes("jnl_buffer",37,"name")="jnl_buffer.need_db_fsync"
-	Set gtmtypes("jnl_buffer",37,"off")=420
+	Set gtmtypes("jnl_buffer",36,"type")="int"
+	Set gtmtypfldindx("jnl_buffer","wrtsize")=36
+	Set gtmtypes("jnl_buffer",37,"name")="jnl_buffer.dskaddr"
+	Set gtmtypes("jnl_buffer",37,"off")=196848
 	Set gtmtypes("jnl_buffer",37,"len")=4
-	Set gtmtypes("jnl_buffer",37,"type")="boolean_t"
-	Set gtmtypfldindx("jnl_buffer","need_db_fsync")=37
-	Set gtmtypes("jnl_buffer",38,"name")="jnl_buffer.io_in_prog"
-	Set gtmtypes("jnl_buffer",38,"off")=424
+	Set gtmtypes("jnl_buffer",37,"type")="unsigned-int"
+	Set gtmtypfldindx("jnl_buffer","dskaddr")=37
+	Set gtmtypes("jnl_buffer",38,"name")="jnl_buffer.now_writer"
+	Set gtmtypes("jnl_buffer",38,"off")=196852
 	Set gtmtypes("jnl_buffer",38,"len")=4
-	Set gtmtypes("jnl_buffer",38,"type")="int"
-	Set gtmtypfldindx("jnl_buffer","io_in_prog")=38
-	Set gtmtypes("jnl_buffer",39,"name")="jnl_buffer.enospc_errcnt"
-	Set gtmtypes("jnl_buffer",39,"off")=428
+	Set gtmtypes("jnl_buffer",38,"type")="unsigned-int"
+	Set gtmtypfldindx("jnl_buffer","now_writer")=38
+	Set gtmtypes("jnl_buffer",39,"name")="jnl_buffer.image_count"
+	Set gtmtypes("jnl_buffer",39,"off")=196856
 	Set gtmtypes("jnl_buffer",39,"len")=4
 	Set gtmtypes("jnl_buffer",39,"type")="unsigned-int"
-	Set gtmtypfldindx("jnl_buffer","enospc_errcnt")=39
-	Set gtmtypes("jnl_buffer",40,"name")="jnl_buffer.max_jrec_len"
-	Set gtmtypes("jnl_buffer",40,"off")=432
-	Set gtmtypes("jnl_buffer",40,"len")=4
-	Set gtmtypes("jnl_buffer",40,"type")="unsigned-int"
-	Set gtmtypfldindx("jnl_buffer","max_jrec_len")=40
-	Set gtmtypes("jnl_buffer",41,"name")="jnl_buffer.fs_block_size"
-	Set gtmtypes("jnl_buffer",41,"off")=436
-	Set gtmtypes("jnl_buffer",41,"len")=4
-	Set gtmtypes("jnl_buffer",41,"type")="unsigned-int"
-	Set gtmtypfldindx("jnl_buffer","fs_block_size")=41
-	Set gtmtypes("jnl_buffer",42,"name")="jnl_buffer.post_epoch_freeaddr"
-	Set gtmtypes("jnl_buffer",42,"off")=440
-	Set gtmtypes("jnl_buffer",42,"len")=4
-	Set gtmtypes("jnl_buffer",42,"type")="unsigned-int"
-	Set gtmtypfldindx("jnl_buffer","post_epoch_freeaddr")=42
-	Set gtmtypes("jnl_buffer",43,"name")="jnl_buffer.last_eof_written"
-	Set gtmtypes("jnl_buffer",43,"off")=444
+	Set gtmtypfldindx("jnl_buffer","image_count")=39
+	Set gtmtypes("jnl_buffer",40,"name")="jnl_buffer.iosb"
+	Set gtmtypes("jnl_buffer",40,"off")=196860
+	Set gtmtypes("jnl_buffer",40,"len")=8
+	Set gtmtypes("jnl_buffer",40,"type")="struct"
+	Set gtmtypfldindx("jnl_buffer","iosb")=40
+	Set gtmtypes("jnl_buffer",41,"name")="jnl_buffer.iosb.cond"
+	Set gtmtypes("jnl_buffer",41,"off")=196860
+	Set gtmtypes("jnl_buffer",41,"len")=2
+	Set gtmtypes("jnl_buffer",41,"type")="short"
+	Set gtmtypfldindx("jnl_buffer","iosb.cond")=41
+	Set gtmtypes("jnl_buffer",42,"name")="jnl_buffer.iosb.length"
+	Set gtmtypes("jnl_buffer",42,"off")=196862
+	Set gtmtypes("jnl_buffer",42,"len")=2
+	Set gtmtypes("jnl_buffer",42,"type")="unsigned-short"
+	Set gtmtypfldindx("jnl_buffer","iosb.length")=42
+	Set gtmtypes("jnl_buffer",43,"name")="jnl_buffer.iosb.dev_specific"
+	Set gtmtypes("jnl_buffer",43,"off")=196864
 	Set gtmtypes("jnl_buffer",43,"len")=4
-	Set gtmtypes("jnl_buffer",43,"type")="boolean_t"
-	Set gtmtypfldindx("jnl_buffer","last_eof_written")=43
-	Set gtmtypes("jnl_buffer",44,"name")="jnl_buffer.end_of_data_at_open"
-	Set gtmtypes("jnl_buffer",44,"off")=448
+	Set gtmtypes("jnl_buffer",43,"type")="int"
+	Set gtmtypfldindx("jnl_buffer","iosb.dev_specific")=43
+	Set gtmtypes("jnl_buffer",44,"name")="jnl_buffer.alignsize"
+	Set gtmtypes("jnl_buffer",44,"off")=196868
 	Set gtmtypes("jnl_buffer",44,"len")=4
 	Set gtmtypes("jnl_buffer",44,"type")="unsigned-int"
-	Set gtmtypfldindx("jnl_buffer","end_of_data_at_open")=44
-	Set gtmtypes("jnl_buffer",45,"name")="jnl_buffer.fill_cacheline0"
-	Set gtmtypes("jnl_buffer",45,"off")=452
-	Set gtmtypes("jnl_buffer",45,"len")=56
-	Set gtmtypes("jnl_buffer",45,"type")="char"
-	Set gtmtypfldindx("jnl_buffer","fill_cacheline0")=45
-	Set gtmtypes("jnl_buffer",46,"name")="jnl_buffer.io_in_prog_latch"
-	Set gtmtypes("jnl_buffer",46,"off")=512
-	Set gtmtypes("jnl_buffer",46,"len")=8
-	Set gtmtypes("jnl_buffer",46,"type")="global_latch_t"
-	Set gtmtypfldindx("jnl_buffer","io_in_prog_latch")=46
-	Set gtmtypes("jnl_buffer",47,"name")="jnl_buffer.io_in_prog_latch.u"
-	Set gtmtypes("jnl_buffer",47,"off")=512
-	Set gtmtypes("jnl_buffer",47,"len")=8
-	Set gtmtypes("jnl_buffer",47,"type")="union"
-	Set gtmtypfldindx("jnl_buffer","io_in_prog_latch.u")=47
-	Set gtmtypes("jnl_buffer",48,"name")="jnl_buffer.io_in_prog_latch.u.pid_imgcnt"
-	Set gtmtypes("jnl_buffer",48,"off")=512
-	Set gtmtypes("jnl_buffer",48,"len")=8
-	Set gtmtypes("jnl_buffer",48,"type")="uint64_t"
-	Set gtmtypfldindx("jnl_buffer","io_in_prog_latch.u.pid_imgcnt")=48
-	Set gtmtypes("jnl_buffer",49,"name")="jnl_buffer.io_in_prog_latch.u.parts"
-	Set gtmtypes("jnl_buffer",49,"off")=512
-	Set gtmtypes("jnl_buffer",49,"len")=8
-	Set gtmtypes("jnl_buffer",49,"type")="struct"
-	Set gtmtypfldindx("jnl_buffer","io_in_prog_latch.u.parts")=49
-	Set gtmtypes("jnl_buffer",50,"name")="jnl_buffer.io_in_prog_latch.u.parts.latch_pid"
-	Set gtmtypes("jnl_buffer",50,"off")=512
-	Set gtmtypes("jnl_buffer",50,"len")=4
+	Set gtmtypfldindx("jnl_buffer","alignsize")=44
+	Set gtmtypes("jnl_buffer",45,"name")="jnl_buffer.eov_timestamp"
+	Set gtmtypes("jnl_buffer",45,"off")=196872
+	Set gtmtypes("jnl_buffer",45,"len")=4
+	Set gtmtypes("jnl_buffer",45,"type")="unsigned-int"
+	Set gtmtypfldindx("jnl_buffer","eov_timestamp")=45
+	Set gtmtypes("jnl_buffer",46,"name")="jnl_buffer.cycle"
+	Set gtmtypes("jnl_buffer",46,"off")=196876
+	Set gtmtypes("jnl_buffer",46,"len")=4
+	Set gtmtypes("jnl_buffer",46,"type")="unsigned-int"
+	Set gtmtypfldindx("jnl_buffer","cycle")=46
+	Set gtmtypes("jnl_buffer",47,"name")="jnl_buffer.qiocnt"
+	Set gtmtypes("jnl_buffer",47,"off")=196880
+	Set gtmtypes("jnl_buffer",47,"len")=4
+	Set gtmtypes("jnl_buffer",47,"type")="int"
+	Set gtmtypfldindx("jnl_buffer","qiocnt")=47
+	Set gtmtypes("jnl_buffer",48,"name")="jnl_buffer.bytcnt"
+	Set gtmtypes("jnl_buffer",48,"off")=196884
+	Set gtmtypes("jnl_buffer",48,"len")=4
+	Set gtmtypes("jnl_buffer",48,"type")="int"
+	Set gtmtypfldindx("jnl_buffer","bytcnt")=48
+	Set gtmtypes("jnl_buffer",49,"name")="jnl_buffer.errcnt"
+	Set gtmtypes("jnl_buffer",49,"off")=196888
+	Set gtmtypes("jnl_buffer",49,"len")=4
+	Set gtmtypes("jnl_buffer",49,"type")="int"
+	Set gtmtypfldindx("jnl_buffer","errcnt")=49
+	Set gtmtypes("jnl_buffer",50,"name")="jnl_buffer.reccnt"
+	Set gtmtypes("jnl_buffer",50,"off")=196892
+	Set gtmtypes("jnl_buffer",50,"len")=144
 	Set gtmtypes("jnl_buffer",50,"type")="int"
-	Set gtmtypfldindx("jnl_buffer","io_in_prog_latch.u.parts.latch_pid")=50
-	Set gtmtypes("jnl_buffer",51,"name")="jnl_buffer.io_in_prog_latch.u.parts.latch_word"
-	Set gtmtypes("jnl_buffer",51,"off")=516
-	Set gtmtypes("jnl_buffer",51,"len")=4
+	Set gtmtypfldindx("jnl_buffer","reccnt")=50
+	Set gtmtypes("jnl_buffer",50,"dim")=36
+	Set gtmtypes("jnl_buffer",51,"name")="jnl_buffer.filler_align"
+	Set gtmtypes("jnl_buffer",51,"off")=197036
+	Set gtmtypes("jnl_buffer",51,"len")=24
 	Set gtmtypes("jnl_buffer",51,"type")="int"
-	Set gtmtypfldindx("jnl_buffer","io_in_prog_latch.u.parts.latch_word")=51
-	Set gtmtypes("jnl_buffer",52,"name")="jnl_buffer.fill_cacheline1"
-	Set gtmtypes("jnl_buffer",52,"off")=520
-	Set gtmtypes("jnl_buffer",52,"len")=56
-	Set gtmtypes("jnl_buffer",52,"type")="char"
-	Set gtmtypfldindx("jnl_buffer","fill_cacheline1")=52
-	Set gtmtypes("jnl_buffer",53,"name")="jnl_buffer.fsync_in_prog_latch"
-	Set gtmtypes("jnl_buffer",53,"off")=576
-	Set gtmtypes("jnl_buffer",53,"len")=8
-	Set gtmtypes("jnl_buffer",53,"type")="global_latch_t"
-	Set gtmtypfldindx("jnl_buffer","fsync_in_prog_latch")=53
-	Set gtmtypes("jnl_buffer",54,"name")="jnl_buffer.fsync_in_prog_latch.u"
-	Set gtmtypes("jnl_buffer",54,"off")=576
-	Set gtmtypes("jnl_buffer",54,"len")=8
-	Set gtmtypes("jnl_buffer",54,"type")="union"
-	Set gtmtypfldindx("jnl_buffer","fsync_in_prog_latch.u")=54
-	Set gtmtypes("jnl_buffer",55,"name")="jnl_buffer.fsync_in_prog_latch.u.pid_imgcnt"
-	Set gtmtypes("jnl_buffer",55,"off")=576
-	Set gtmtypes("jnl_buffer",55,"len")=8
-	Set gtmtypes("jnl_buffer",55,"type")="uint64_t"
-	Set gtmtypfldindx("jnl_buffer","fsync_in_prog_latch.u.pid_imgcnt")=55
-	Set gtmtypes("jnl_buffer",56,"name")="jnl_buffer.fsync_in_prog_latch.u.parts"
-	Set gtmtypes("jnl_buffer",56,"off")=576
-	Set gtmtypes("jnl_buffer",56,"len")=8
-	Set gtmtypes("jnl_buffer",56,"type")="struct"
-	Set gtmtypfldindx("jnl_buffer","fsync_in_prog_latch.u.parts")=56
-	Set gtmtypes("jnl_buffer",57,"name")="jnl_buffer.fsync_in_prog_latch.u.parts.latch_pid"
-	Set gtmtypes("jnl_buffer",57,"off")=576
+	Set gtmtypfldindx("jnl_buffer","filler_align")=51
+	Set gtmtypes("jnl_buffer",51,"dim")=6
+	Set gtmtypes("jnl_buffer",52,"name")="jnl_buffer.prev_jrec_time"
+	Set gtmtypes("jnl_buffer",52,"off")=197060
+	Set gtmtypes("jnl_buffer",52,"len")=4
+	Set gtmtypes("jnl_buffer",52,"type")="unsigned-int"
+	Set gtmtypfldindx("jnl_buffer","prev_jrec_time")=52
+	Set gtmtypes("jnl_buffer",53,"name")="jnl_buffer.next_epoch_time"
+	Set gtmtypes("jnl_buffer",53,"off")=197064
+	Set gtmtypes("jnl_buffer",53,"len")=4
+	Set gtmtypes("jnl_buffer",53,"type")="unsigned-int"
+	Set gtmtypfldindx("jnl_buffer","next_epoch_time")=53
+	Set gtmtypes("jnl_buffer",54,"name")="jnl_buffer.need_db_fsync"
+	Set gtmtypes("jnl_buffer",54,"off")=197068
+	Set gtmtypes("jnl_buffer",54,"len")=4
+	Set gtmtypes("jnl_buffer",54,"type")="boolean_t"
+	Set gtmtypfldindx("jnl_buffer","need_db_fsync")=54
+	Set gtmtypes("jnl_buffer",55,"name")="jnl_buffer.io_in_prog"
+	Set gtmtypes("jnl_buffer",55,"off")=197072
+	Set gtmtypes("jnl_buffer",55,"len")=4
+	Set gtmtypes("jnl_buffer",55,"type")="int"
+	Set gtmtypfldindx("jnl_buffer","io_in_prog")=55
+	Set gtmtypes("jnl_buffer",56,"name")="jnl_buffer.enospc_errcnt"
+	Set gtmtypes("jnl_buffer",56,"off")=197076
+	Set gtmtypes("jnl_buffer",56,"len")=4
+	Set gtmtypes("jnl_buffer",56,"type")="unsigned-int"
+	Set gtmtypfldindx("jnl_buffer","enospc_errcnt")=56
+	Set gtmtypes("jnl_buffer",57,"name")="jnl_buffer.max_jrec_len"
+	Set gtmtypes("jnl_buffer",57,"off")=197080
 	Set gtmtypes("jnl_buffer",57,"len")=4
-	Set gtmtypes("jnl_buffer",57,"type")="int"
-	Set gtmtypfldindx("jnl_buffer","fsync_in_prog_latch.u.parts.latch_pid")=57
-	Set gtmtypes("jnl_buffer",58,"name")="jnl_buffer.fsync_in_prog_latch.u.parts.latch_word"
-	Set gtmtypes("jnl_buffer",58,"off")=580
+	Set gtmtypes("jnl_buffer",57,"type")="unsigned-int"
+	Set gtmtypfldindx("jnl_buffer","max_jrec_len")=57
+	Set gtmtypes("jnl_buffer",58,"name")="jnl_buffer.fs_block_size"
+	Set gtmtypes("jnl_buffer",58,"off")=197084
 	Set gtmtypes("jnl_buffer",58,"len")=4
-	Set gtmtypes("jnl_buffer",58,"type")="int"
-	Set gtmtypfldindx("jnl_buffer","fsync_in_prog_latch.u.parts.latch_word")=58
-	Set gtmtypes("jnl_buffer",59,"name")="jnl_buffer.fill_cacheline2"
-	Set gtmtypes("jnl_buffer",59,"off")=584
-	Set gtmtypes("jnl_buffer",59,"len")=56
-	Set gtmtypes("jnl_buffer",59,"type")="char"
-	Set gtmtypfldindx("jnl_buffer","fill_cacheline2")=59
-	Set gtmtypes("jnl_buffer",60,"name")="jnl_buffer.buff"
-	Set gtmtypes("jnl_buffer",60,"off")=640
-	Set gtmtypes("jnl_buffer",60,"len")=1
-	Set gtmtypes("jnl_buffer",60,"type")="unsigned-char"
-	Set gtmtypfldindx("jnl_buffer","buff")=60
+	Set gtmtypes("jnl_buffer",58,"type")="unsigned-int"
+	Set gtmtypfldindx("jnl_buffer","fs_block_size")=58
+	Set gtmtypes("jnl_buffer",59,"name")="jnl_buffer.post_epoch_freeaddr"
+	Set gtmtypes("jnl_buffer",59,"off")=197088
+	Set gtmtypes("jnl_buffer",59,"len")=4
+	Set gtmtypes("jnl_buffer",59,"type")="unsigned-int"
+	Set gtmtypfldindx("jnl_buffer","post_epoch_freeaddr")=59
+	Set gtmtypes("jnl_buffer",60,"name")="jnl_buffer.last_eof_written"
+	Set gtmtypes("jnl_buffer",60,"off")=197092
+	Set gtmtypes("jnl_buffer",60,"len")=4
+	Set gtmtypes("jnl_buffer",60,"type")="boolean_t"
+	Set gtmtypfldindx("jnl_buffer","last_eof_written")=60
+	Set gtmtypes("jnl_buffer",61,"name")="jnl_buffer.end_of_data_at_open"
+	Set gtmtypes("jnl_buffer",61,"off")=197096
+	Set gtmtypes("jnl_buffer",61,"len")=4
+	Set gtmtypes("jnl_buffer",61,"type")="unsigned-int"
+	Set gtmtypfldindx("jnl_buffer","end_of_data_at_open")=61
+	Set gtmtypes("jnl_buffer",62,"name")="jnl_buffer.re_read_dskaddr"
+	Set gtmtypes("jnl_buffer",62,"off")=197100
+	Set gtmtypes("jnl_buffer",62,"len")=4
+	Set gtmtypes("jnl_buffer",62,"type")="unsigned-int"
+	Set gtmtypfldindx("jnl_buffer","re_read_dskaddr")=62
+	Set gtmtypes("jnl_buffer",63,"name")="jnl_buffer.fill_cacheline0"
+	Set gtmtypes("jnl_buffer",63,"off")=197104
+	Set gtmtypes("jnl_buffer",63,"len")=56
+	Set gtmtypes("jnl_buffer",63,"type")="char"
+	Set gtmtypfldindx("jnl_buffer","fill_cacheline0")=63
+	Set gtmtypes("jnl_buffer",64,"name")="jnl_buffer.io_in_prog_latch"
+	Set gtmtypes("jnl_buffer",64,"off")=197160
+	Set gtmtypes("jnl_buffer",64,"len")=8
+	Set gtmtypes("jnl_buffer",64,"type")="global_latch_t"
+	Set gtmtypfldindx("jnl_buffer","io_in_prog_latch")=64
+	Set gtmtypes("jnl_buffer",65,"name")="jnl_buffer.io_in_prog_latch.u"
+	Set gtmtypes("jnl_buffer",65,"off")=197160
+	Set gtmtypes("jnl_buffer",65,"len")=8
+	Set gtmtypes("jnl_buffer",65,"type")="union"
+	Set gtmtypfldindx("jnl_buffer","io_in_prog_latch.u")=65
+	Set gtmtypes("jnl_buffer",66,"name")="jnl_buffer.io_in_prog_latch.u.pid_imgcnt"
+	Set gtmtypes("jnl_buffer",66,"off")=197160
+	Set gtmtypes("jnl_buffer",66,"len")=8
+	Set gtmtypes("jnl_buffer",66,"type")="uint64_t"
+	Set gtmtypfldindx("jnl_buffer","io_in_prog_latch.u.pid_imgcnt")=66
+	Set gtmtypes("jnl_buffer",67,"name")="jnl_buffer.io_in_prog_latch.u.parts"
+	Set gtmtypes("jnl_buffer",67,"off")=197160
+	Set gtmtypes("jnl_buffer",67,"len")=8
+	Set gtmtypes("jnl_buffer",67,"type")="struct"
+	Set gtmtypfldindx("jnl_buffer","io_in_prog_latch.u.parts")=67
+	Set gtmtypes("jnl_buffer",68,"name")="jnl_buffer.io_in_prog_latch.u.parts.latch_pid"
+	Set gtmtypes("jnl_buffer",68,"off")=197160
+	Set gtmtypes("jnl_buffer",68,"len")=4
+	Set gtmtypes("jnl_buffer",68,"type")="int"
+	Set gtmtypfldindx("jnl_buffer","io_in_prog_latch.u.parts.latch_pid")=68
+	Set gtmtypes("jnl_buffer",69,"name")="jnl_buffer.io_in_prog_latch.u.parts.latch_word"
+	Set gtmtypes("jnl_buffer",69,"off")=197164
+	Set gtmtypes("jnl_buffer",69,"len")=4
+	Set gtmtypes("jnl_buffer",69,"type")="int"
+	Set gtmtypfldindx("jnl_buffer","io_in_prog_latch.u.parts.latch_word")=69
+	Set gtmtypes("jnl_buffer",70,"name")="jnl_buffer.fill_cacheline1"
+	Set gtmtypes("jnl_buffer",70,"off")=197168
+	Set gtmtypes("jnl_buffer",70,"len")=56
+	Set gtmtypes("jnl_buffer",70,"type")="char"
+	Set gtmtypfldindx("jnl_buffer","fill_cacheline1")=70
+	Set gtmtypes("jnl_buffer",71,"name")="jnl_buffer.fsync_in_prog_latch"
+	Set gtmtypes("jnl_buffer",71,"off")=197224
+	Set gtmtypes("jnl_buffer",71,"len")=8
+	Set gtmtypes("jnl_buffer",71,"type")="global_latch_t"
+	Set gtmtypfldindx("jnl_buffer","fsync_in_prog_latch")=71
+	Set gtmtypes("jnl_buffer",72,"name")="jnl_buffer.fsync_in_prog_latch.u"
+	Set gtmtypes("jnl_buffer",72,"off")=197224
+	Set gtmtypes("jnl_buffer",72,"len")=8
+	Set gtmtypes("jnl_buffer",72,"type")="union"
+	Set gtmtypfldindx("jnl_buffer","fsync_in_prog_latch.u")=72
+	Set gtmtypes("jnl_buffer",73,"name")="jnl_buffer.fsync_in_prog_latch.u.pid_imgcnt"
+	Set gtmtypes("jnl_buffer",73,"off")=197224
+	Set gtmtypes("jnl_buffer",73,"len")=8
+	Set gtmtypes("jnl_buffer",73,"type")="uint64_t"
+	Set gtmtypfldindx("jnl_buffer","fsync_in_prog_latch.u.pid_imgcnt")=73
+	Set gtmtypes("jnl_buffer",74,"name")="jnl_buffer.fsync_in_prog_latch.u.parts"
+	Set gtmtypes("jnl_buffer",74,"off")=197224
+	Set gtmtypes("jnl_buffer",74,"len")=8
+	Set gtmtypes("jnl_buffer",74,"type")="struct"
+	Set gtmtypfldindx("jnl_buffer","fsync_in_prog_latch.u.parts")=74
+	Set gtmtypes("jnl_buffer",75,"name")="jnl_buffer.fsync_in_prog_latch.u.parts.latch_pid"
+	Set gtmtypes("jnl_buffer",75,"off")=197224
+	Set gtmtypes("jnl_buffer",75,"len")=4
+	Set gtmtypes("jnl_buffer",75,"type")="int"
+	Set gtmtypfldindx("jnl_buffer","fsync_in_prog_latch.u.parts.latch_pid")=75
+	Set gtmtypes("jnl_buffer",76,"name")="jnl_buffer.fsync_in_prog_latch.u.parts.latch_word"
+	Set gtmtypes("jnl_buffer",76,"off")=197228
+	Set gtmtypes("jnl_buffer",76,"len")=4
+	Set gtmtypes("jnl_buffer",76,"type")="int"
+	Set gtmtypfldindx("jnl_buffer","fsync_in_prog_latch.u.parts.latch_word")=76
+	Set gtmtypes("jnl_buffer",77,"name")="jnl_buffer.fill_cacheline2"
+	Set gtmtypes("jnl_buffer",77,"off")=197232
+	Set gtmtypes("jnl_buffer",77,"len")=56
+	Set gtmtypes("jnl_buffer",77,"type")="char"
+	Set gtmtypfldindx("jnl_buffer","fill_cacheline2")=77
+	Set gtmtypes("jnl_buffer",78,"name")="jnl_buffer.phase2_commit_latch"
+	Set gtmtypes("jnl_buffer",78,"off")=197288
+	Set gtmtypes("jnl_buffer",78,"len")=8
+	Set gtmtypes("jnl_buffer",78,"type")="global_latch_t"
+	Set gtmtypfldindx("jnl_buffer","phase2_commit_latch")=78
+	Set gtmtypes("jnl_buffer",79,"name")="jnl_buffer.phase2_commit_latch.u"
+	Set gtmtypes("jnl_buffer",79,"off")=197288
+	Set gtmtypes("jnl_buffer",79,"len")=8
+	Set gtmtypes("jnl_buffer",79,"type")="union"
+	Set gtmtypfldindx("jnl_buffer","phase2_commit_latch.u")=79
+	Set gtmtypes("jnl_buffer",80,"name")="jnl_buffer.phase2_commit_latch.u.pid_imgcnt"
+	Set gtmtypes("jnl_buffer",80,"off")=197288
+	Set gtmtypes("jnl_buffer",80,"len")=8
+	Set gtmtypes("jnl_buffer",80,"type")="uint64_t"
+	Set gtmtypfldindx("jnl_buffer","phase2_commit_latch.u.pid_imgcnt")=80
+	Set gtmtypes("jnl_buffer",81,"name")="jnl_buffer.phase2_commit_latch.u.parts"
+	Set gtmtypes("jnl_buffer",81,"off")=197288
+	Set gtmtypes("jnl_buffer",81,"len")=8
+	Set gtmtypes("jnl_buffer",81,"type")="struct"
+	Set gtmtypfldindx("jnl_buffer","phase2_commit_latch.u.parts")=81
+	Set gtmtypes("jnl_buffer",82,"name")="jnl_buffer.phase2_commit_latch.u.parts.latch_pid"
+	Set gtmtypes("jnl_buffer",82,"off")=197288
+	Set gtmtypes("jnl_buffer",82,"len")=4
+	Set gtmtypes("jnl_buffer",82,"type")="int"
+	Set gtmtypfldindx("jnl_buffer","phase2_commit_latch.u.parts.latch_pid")=82
+	Set gtmtypes("jnl_buffer",83,"name")="jnl_buffer.phase2_commit_latch.u.parts.latch_word"
+	Set gtmtypes("jnl_buffer",83,"off")=197292
+	Set gtmtypes("jnl_buffer",83,"len")=4
+	Set gtmtypes("jnl_buffer",83,"type")="int"
+	Set gtmtypfldindx("jnl_buffer","phase2_commit_latch.u.parts.latch_word")=83
+	Set gtmtypes("jnl_buffer",84,"name")="jnl_buffer.fill_cacheline3"
+	Set gtmtypes("jnl_buffer",84,"off")=197296
+	Set gtmtypes("jnl_buffer",84,"len")=56
+	Set gtmtypes("jnl_buffer",84,"type")="char"
+	Set gtmtypfldindx("jnl_buffer","fill_cacheline3")=84
+	Set gtmtypes("jnl_buffer",85,"name")="jnl_buffer.buff"
+	Set gtmtypes("jnl_buffer",85,"off")=197352
+	Set gtmtypes("jnl_buffer",85,"len")=1
+	Set gtmtypes("jnl_buffer",85,"type")="unsigned-char"
+	Set gtmtypfldindx("jnl_buffer","buff")=85
 	;
 	Set gtmtypes("jnl_create_info")="struct"
 	Set gtmtypes("jnl_create_info",0)=35
@@ -10436,7 +10656,7 @@ Init
 	Set gtmtypfldindx("jnl_ctl_list","turn_around_fullyupgraded")=47
 	;
 	Set gtmtypes("jnl_fence_control")="struct"
-	Set gtmtypes("jnl_fence_control",0)=4
+	Set gtmtypes("jnl_fence_control",0)=5
 	Set gtmtypes("jnl_fence_control","len")=32
 	Set gtmtypes("jnl_fence_control",1,"name")="jnl_fence_control.fence_list"
 	Set gtmtypes("jnl_fence_control",1,"off")=0
@@ -10448,16 +10668,21 @@ Init
 	Set gtmtypes("jnl_fence_control",2,"len")=4
 	Set gtmtypes("jnl_fence_control",2,"type")="int"
 	Set gtmtypfldindx("jnl_fence_control","level")=2
-	Set gtmtypes("jnl_fence_control",3,"name")="jnl_fence_control.token"
-	Set gtmtypes("jnl_fence_control",3,"off")=16
-	Set gtmtypes("jnl_fence_control",3,"len")=8
-	Set gtmtypes("jnl_fence_control",3,"type")="uint64_t"
-	Set gtmtypfldindx("jnl_fence_control","token")=3
-	Set gtmtypes("jnl_fence_control",4,"name")="jnl_fence_control.strm_seqno"
-	Set gtmtypes("jnl_fence_control",4,"off")=24
+	Set gtmtypes("jnl_fence_control",3,"name")="jnl_fence_control.replication"
+	Set gtmtypes("jnl_fence_control",3,"off")=12
+	Set gtmtypes("jnl_fence_control",3,"len")=4
+	Set gtmtypes("jnl_fence_control",3,"type")="boolean_t"
+	Set gtmtypfldindx("jnl_fence_control","replication")=3
+	Set gtmtypes("jnl_fence_control",4,"name")="jnl_fence_control.token"
+	Set gtmtypes("jnl_fence_control",4,"off")=16
 	Set gtmtypes("jnl_fence_control",4,"len")=8
 	Set gtmtypes("jnl_fence_control",4,"type")="uint64_t"
-	Set gtmtypfldindx("jnl_fence_control","strm_seqno")=4
+	Set gtmtypfldindx("jnl_fence_control","token")=4
+	Set gtmtypes("jnl_fence_control",5,"name")="jnl_fence_control.strm_seqno"
+	Set gtmtypes("jnl_fence_control",5,"off")=24
+	Set gtmtypes("jnl_fence_control",5,"len")=8
+	Set gtmtypes("jnl_fence_control",5,"type")="uint64_t"
+	Set gtmtypfldindx("jnl_fence_control","strm_seqno")=5
 	;
 	Set gtmtypes("jnl_file_header")="struct"
 	Set gtmtypes("jnl_file_header",0)=67
@@ -11014,8 +11239,8 @@ Init
 	Set gtmtypfldindx("jnl_gbls_t","mur_update")=27
 	;
 	Set gtmtypes("jnl_private_control")="struct"
-	Set gtmtypes("jnl_private_control",0)=24
-	Set gtmtypes("jnl_private_control","len")=128
+	Set gtmtypes("jnl_private_control",0)=22
+	Set gtmtypes("jnl_private_control","len")=112
 	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
@@ -11056,86 +11281,76 @@ Init
 	Set gtmtypes("jnl_private_control",8,"len")=4
 	Set gtmtypes("jnl_private_control",8,"type")="unsigned-int"
 	Set gtmtypfldindx("jnl_private_control","fileid.st_gen")=8
-	Set gtmtypes("jnl_private_control",9,"name")="jnl_private_control.jnllsb"
+	Set gtmtypes("jnl_private_control",9,"name")="jnl_private_control.pini_addr"
 	Set gtmtypes("jnl_private_control",9,"off")=48
-	Set gtmtypes("jnl_private_control",9,"len")=8
-	Set gtmtypes("jnl_private_control",9,"type")="addr"
-	Set gtmtypfldindx("jnl_private_control","jnllsb")=9
-	Set gtmtypes("jnl_private_control",10,"name")="jnl_private_control.pini_addr"
-	Set gtmtypes("jnl_private_control",10,"off")=56
+	Set gtmtypes("jnl_private_control",9,"len")=4
+	Set gtmtypes("jnl_private_control",9,"type")="unsigned-int"
+	Set gtmtypfldindx("jnl_private_control","pini_addr")=9
+	Set gtmtypes("jnl_private_control",10,"name")="jnl_private_control.new_freeaddr"
+	Set gtmtypes("jnl_private_control",10,"off")=52
 	Set gtmtypes("jnl_private_control",10,"len")=4
 	Set gtmtypes("jnl_private_control",10,"type")="unsigned-int"
-	Set gtmtypfldindx("jnl_private_control","pini_addr")=10
-	Set gtmtypes("jnl_private_control",11,"name")="jnl_private_control.new_freeaddr"
-	Set gtmtypes("jnl_private_control",11,"off")=60
+	Set gtmtypfldindx("jnl_private_control","new_freeaddr")=10
+	Set gtmtypes("jnl_private_control",11,"name")="jnl_private_control.phase2_freeaddr"
+	Set gtmtypes("jnl_private_control",11,"off")=56
 	Set gtmtypes("jnl_private_control",11,"len")=4
 	Set gtmtypes("jnl_private_control",11,"type")="unsigned-int"
-	Set gtmtypfldindx("jnl_private_control","new_freeaddr")=11
-	Set gtmtypes("jnl_private_control",12,"name")="jnl_private_control.temp_free"
-	Set gtmtypes("jnl_private_control",12,"off")=64
+	Set gtmtypfldindx("jnl_private_control","phase2_freeaddr")=11
+	Set gtmtypes("jnl_private_control",12,"name")="jnl_private_control.phase2_free"
+	Set gtmtypes("jnl_private_control",12,"off")=60
 	Set gtmtypes("jnl_private_control",12,"len")=4
-	Set gtmtypes("jnl_private_control",12,"type")="int"
-	Set gtmtypfldindx("jnl_private_control","temp_free")=12
-	Set gtmtypes("jnl_private_control",13,"name")="jnl_private_control.filler_q0"
-	Set gtmtypes("jnl_private_control",13,"off")=72
-	Set gtmtypes("jnl_private_control",13,"len")=8
-	Set gtmtypes("jnl_private_control",13,"type")="double"
-	Set gtmtypfldindx("jnl_private_control","filler_q0")=13
-	Set gtmtypes("jnl_private_control",14,"name")="jnl_private_control.new_dsk"
-	Set gtmtypes("jnl_private_control",14,"off")=80
+	Set gtmtypes("jnl_private_control",12,"type")="unsigned-int"
+	Set gtmtypfldindx("jnl_private_control","phase2_free")=12
+	Set gtmtypes("jnl_private_control",13,"name")="jnl_private_control.in_jnl_phase2_salvage"
+	Set gtmtypes("jnl_private_control",13,"off")=64
+	Set gtmtypes("jnl_private_control",13,"len")=4
+	Set gtmtypes("jnl_private_control",13,"type")="boolean_t"
+	Set gtmtypfldindx("jnl_private_control","in_jnl_phase2_salvage")=13
+	Set gtmtypes("jnl_private_control",14,"name")="jnl_private_control.status"
+	Set gtmtypes("jnl_private_control",14,"off")=68
 	Set gtmtypes("jnl_private_control",14,"len")=4
 	Set gtmtypes("jnl_private_control",14,"type")="int"
-	Set gtmtypfldindx("jnl_private_control","new_dsk")=14
-	Set gtmtypes("jnl_private_control",15,"name")="jnl_private_control.new_dskaddr"
-	Set gtmtypes("jnl_private_control",15,"off")=84
+	Set gtmtypfldindx("jnl_private_control","status")=14
+	Set gtmtypes("jnl_private_control",15,"name")="jnl_private_control.qio_active"
+	Set gtmtypes("jnl_private_control",15,"off")=72
 	Set gtmtypes("jnl_private_control",15,"len")=4
-	Set gtmtypes("jnl_private_control",15,"type")="unsigned-int"
-	Set gtmtypfldindx("jnl_private_control","new_dskaddr")=15
-	Set gtmtypes("jnl_private_control",16,"name")="jnl_private_control.status"
-	Set gtmtypes("jnl_private_control",16,"off")=88
+	Set gtmtypes("jnl_private_control",15,"type")="boolean_t"
+	Set gtmtypfldindx("jnl_private_control","qio_active")=15
+	Set gtmtypes("jnl_private_control",16,"name")="jnl_private_control.fd_mismatch"
+	Set gtmtypes("jnl_private_control",16,"off")=76
 	Set gtmtypes("jnl_private_control",16,"len")=4
-	Set gtmtypes("jnl_private_control",16,"type")="int"
-	Set gtmtypfldindx("jnl_private_control","status")=16
-	Set gtmtypes("jnl_private_control",17,"name")="jnl_private_control.dsk_update_inprog"
-	Set gtmtypes("jnl_private_control",17,"off")=92
+	Set gtmtypes("jnl_private_control",16,"type")="boolean_t"
+	Set gtmtypfldindx("jnl_private_control","fd_mismatch")=16
+	Set gtmtypes("jnl_private_control",17,"name")="jnl_private_control.sync_io"
+	Set gtmtypes("jnl_private_control",17,"off")=80
 	Set gtmtypes("jnl_private_control",17,"len")=4
 	Set gtmtypes("jnl_private_control",17,"type")="boolean_t"
-	Set gtmtypfldindx("jnl_private_control","dsk_update_inprog")=17
-	Set gtmtypes("jnl_private_control",18,"name")="jnl_private_control.qio_active"
-	Set gtmtypes("jnl_private_control",18,"off")=96
+	Set gtmtypfldindx("jnl_private_control","sync_io")=17
+	Set gtmtypes("jnl_private_control",18,"name")="jnl_private_control.error_reported"
+	Set gtmtypes("jnl_private_control",18,"off")=84
 	Set gtmtypes("jnl_private_control",18,"len")=4
 	Set gtmtypes("jnl_private_control",18,"type")="boolean_t"
-	Set gtmtypfldindx("jnl_private_control","qio_active")=18
-	Set gtmtypes("jnl_private_control",19,"name")="jnl_private_control.fd_mismatch"
-	Set gtmtypes("jnl_private_control",19,"off")=100
+	Set gtmtypfldindx("jnl_private_control","error_reported")=18
+	Set gtmtypes("jnl_private_control",19,"name")="jnl_private_control.status2"
+	Set gtmtypes("jnl_private_control",19,"off")=88
 	Set gtmtypes("jnl_private_control",19,"len")=4
-	Set gtmtypes("jnl_private_control",19,"type")="boolean_t"
-	Set gtmtypfldindx("jnl_private_control","fd_mismatch")=19
-	Set gtmtypes("jnl_private_control",20,"name")="jnl_private_control.sync_io"
-	Set gtmtypes("jnl_private_control",20,"off")=104
+	Set gtmtypes("jnl_private_control",19,"type")="unsigned-int"
+	Set gtmtypfldindx("jnl_private_control","status2")=19
+	Set gtmtypes("jnl_private_control",20,"name")="jnl_private_control.cycle"
+	Set gtmtypes("jnl_private_control",20,"off")=92
 	Set gtmtypes("jnl_private_control",20,"len")=4
-	Set gtmtypes("jnl_private_control",20,"type")="boolean_t"
-	Set gtmtypfldindx("jnl_private_control","sync_io")=20
-	Set gtmtypes("jnl_private_control",21,"name")="jnl_private_control.error_reported"
-	Set gtmtypes("jnl_private_control",21,"off")=108
-	Set gtmtypes("jnl_private_control",21,"len")=4
-	Set gtmtypes("jnl_private_control",21,"type")="boolean_t"
-	Set gtmtypfldindx("jnl_private_control","error_reported")=21
-	Set gtmtypes("jnl_private_control",22,"name")="jnl_private_control.status2"
-	Set gtmtypes("jnl_private_control",22,"off")=112
-	Set gtmtypes("jnl_private_control",22,"len")=4
-	Set gtmtypes("jnl_private_control",22,"type")="unsigned-int"
-	Set gtmtypfldindx("jnl_private_control","status2")=22
-	Set gtmtypes("jnl_private_control",23,"name")="jnl_private_control.cycle"
-	Set gtmtypes("jnl_private_control",23,"off")=116
-	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_private_control",20,"type")="unsigned-int"
+	Set gtmtypfldindx("jnl_private_control","cycle")=20
+	Set gtmtypes("jnl_private_control",21,"name")="jnl_private_control.err_str"
+	Set gtmtypes("jnl_private_control",21,"off")=96
+	Set gtmtypes("jnl_private_control",21,"len")=8
+	Set gtmtypes("jnl_private_control",21,"type")="addr"
+	Set gtmtypfldindx("jnl_private_control","err_str")=21
+	Set gtmtypes("jnl_private_control",22,"name")="jnl_private_control.curr_tn"
+	Set gtmtypes("jnl_private_control",22,"off")=104
+	Set gtmtypes("jnl_private_control",22,"len")=8
+	Set gtmtypes("jnl_private_control",22,"type")="uint64_t"
+	Set gtmtypfldindx("jnl_private_control","curr_tn")=22
 	;
 	Set gtmtypes("jnl_process_vector")="struct"
 	Set gtmtypes("jnl_process_vector",0)=10
@@ -11411,19 +11626,19 @@ Init
 	Set gtmtypfldindx("jnl_record","jrec_aimg.blk_contents")=43
 	Set gtmtypes("jnl_record",44,"name")="jnl_record.jrec_align"
 	Set gtmtypes("jnl_record",44,"off")=0
-	Set gtmtypes("jnl_record",44,"len")=32
+	Set gtmtypes("jnl_record",44,"len")=12
 	Set gtmtypes("jnl_record",44,"type")="struct_jrec_align"
 	Set gtmtypfldindx("jnl_record","jrec_align")=44
-	Set gtmtypes("jnl_record",45,"name")="jnl_record.jrec_align.prefix"
-	Set gtmtypes("jnl_record",45,"off")=0
-	Set gtmtypes("jnl_record",45,"len")=24
-	Set gtmtypes("jnl_record",45,"type")="jrec_prefix"
-	Set gtmtypfldindx("jnl_record","jrec_align.prefix")=45
-	Set gtmtypes("jnl_record",46,"name")="jnl_record.jrec_align.align_str"
-	Set gtmtypes("jnl_record",46,"off")=24
-	Set gtmtypes("jnl_record",46,"len")=8
-	Set gtmtypes("jnl_record",46,"type")="jnl_string"
-	Set gtmtypfldindx("jnl_record","jrec_align.align_str")=46
+	Set gtmtypes("jnl_record",45,"name")="jnl_record.jrec_align.checksum"
+	Set gtmtypes("jnl_record",45,"off")=4
+	Set gtmtypes("jnl_record",45,"len")=4
+	Set gtmtypes("jnl_record",45,"type")="unsigned-int"
+	Set gtmtypfldindx("jnl_record","jrec_align.checksum")=45
+	Set gtmtypes("jnl_record",46,"name")="jnl_record.jrec_align.time"
+	Set gtmtypes("jnl_record",46,"off")=8
+	Set gtmtypes("jnl_record",46,"len")=4
+	Set gtmtypes("jnl_record",46,"type")="unsigned-int"
+	Set gtmtypfldindx("jnl_record","jrec_align.time")=46
 	Set gtmtypes("jnl_record",47,"name")="jnl_record.jrec_tcom"
 	Set gtmtypes("jnl_record",47,"off")=0
 	Set gtmtypes("jnl_record",47,"len")=56
@@ -11760,8 +11975,8 @@ Init
 	Set gtmtypfldindx("jnlext_multi_t","size")=7
 	;
 	Set gtmtypes("jnlpool_addrs")="struct"
-	Set gtmtypes("jnlpool_addrs",0)=7
-	Set gtmtypes("jnlpool_addrs","len")=56
+	Set gtmtypes("jnlpool_addrs",0)=16
+	Set gtmtypes("jnlpool_addrs","len")=96
 	Set gtmtypes("jnlpool_addrs",1,"name")="jnlpool_addrs.jnlpool_ctl"
 	Set gtmtypes("jnlpool_addrs",1,"off")=0
 	Set gtmtypes("jnlpool_addrs",1,"len")=8
@@ -11797,10 +12012,55 @@ Init
 	Set gtmtypes("jnlpool_addrs",7,"len")=8
 	Set gtmtypes("jnlpool_addrs",7,"type")="addr"
 	Set gtmtypfldindx("jnlpool_addrs","jnldata_base")=7
+	Set gtmtypes("jnlpool_addrs",8,"name")="jnlpool_addrs.jrs"
+	Set gtmtypes("jnlpool_addrs",8,"off")=56
+	Set gtmtypes("jnlpool_addrs",8,"len")=40
+	Set gtmtypes("jnlpool_addrs",8,"type")="jpl_rsrv_struct_t"
+	Set gtmtypfldindx("jnlpool_addrs","jrs")=8
+	Set gtmtypes("jnlpool_addrs",9,"name")="jnlpool_addrs.jrs.start_write_addr"
+	Set gtmtypes("jnlpool_addrs",9,"off")=56
+	Set gtmtypes("jnlpool_addrs",9,"len")=8
+	Set gtmtypes("jnlpool_addrs",9,"type")="uint64_t"
+	Set gtmtypfldindx("jnlpool_addrs","jrs.start_write_addr")=9
+	Set gtmtypes("jnlpool_addrs",10,"name")="jnlpool_addrs.jrs.cur_write_addr"
+	Set gtmtypes("jnlpool_addrs",10,"off")=64
+	Set gtmtypes("jnlpool_addrs",10,"len")=8
+	Set gtmtypes("jnlpool_addrs",10,"type")="uint64_t"
+	Set gtmtypfldindx("jnlpool_addrs","jrs.cur_write_addr")=10
+	Set gtmtypes("jnlpool_addrs",11,"name")="jnlpool_addrs.jrs.tot_jrec_len"
+	Set gtmtypes("jnlpool_addrs",11,"off")=72
+	Set gtmtypes("jnlpool_addrs",11,"len")=4
+	Set gtmtypes("jnlpool_addrs",11,"type")="unsigned-int"
+	Set gtmtypfldindx("jnlpool_addrs","jrs.tot_jrec_len")=11
+	Set gtmtypes("jnlpool_addrs",12,"name")="jnlpool_addrs.jrs.write_total"
+	Set gtmtypes("jnlpool_addrs",12,"off")=76
+	Set gtmtypes("jnlpool_addrs",12,"len")=4
+	Set gtmtypes("jnlpool_addrs",12,"type")="unsigned-int"
+	Set gtmtypfldindx("jnlpool_addrs","jrs.write_total")=12
+	Set gtmtypes("jnlpool_addrs",13,"name")="jnlpool_addrs.jrs.memcpy_skipped"
+	Set gtmtypes("jnlpool_addrs",13,"off")=80
+	Set gtmtypes("jnlpool_addrs",13,"len")=4
+	Set gtmtypes("jnlpool_addrs",13,"type")="boolean_t"
+	Set gtmtypfldindx("jnlpool_addrs","jrs.memcpy_skipped")=13
+	Set gtmtypes("jnlpool_addrs",14,"name")="jnlpool_addrs.jrs.phase2_commit_index"
+	Set gtmtypes("jnlpool_addrs",14,"off")=84
+	Set gtmtypes("jnlpool_addrs",14,"len")=4
+	Set gtmtypes("jnlpool_addrs",14,"type")="unsigned-int"
+	Set gtmtypfldindx("jnlpool_addrs","jrs.phase2_commit_index")=14
+	Set gtmtypes("jnlpool_addrs",15,"name")="jnlpool_addrs.jrs.num_tcoms"
+	Set gtmtypes("jnlpool_addrs",15,"off")=88
+	Set gtmtypes("jnlpool_addrs",15,"len")=4
+	Set gtmtypes("jnlpool_addrs",15,"type")="unsigned-int"
+	Set gtmtypfldindx("jnlpool_addrs","jrs.num_tcoms")=15
+	Set gtmtypes("jnlpool_addrs",16,"name")="jnlpool_addrs.jrs.filler_8byte_align"
+	Set gtmtypes("jnlpool_addrs",16,"off")=92
+	Set gtmtypes("jnlpool_addrs",16,"len")=4
+	Set gtmtypes("jnlpool_addrs",16,"type")="char"
+	Set gtmtypfldindx("jnlpool_addrs","jrs.filler_8byte_align")=16
 	;
 	Set gtmtypes("jnlpool_ctl_struct")="struct"
-	Set gtmtypes("jnlpool_ctl_struct",0)=48
-	Set gtmtypes("jnlpool_ctl_struct","len")=3728
+	Set gtmtypes("jnlpool_ctl_struct",0)=72
+	Set gtmtypes("jnlpool_ctl_struct","len")=659200
 	Set gtmtypes("jnlpool_ctl_struct",1,"name")="jnlpool_ctl_struct.jnlpool_id"
 	Set gtmtypes("jnlpool_ctl_struct",1,"off")=0
 	Set gtmtypes("jnlpool_ctl_struct",1,"len")=312
@@ -11881,181 +12141,288 @@ Init
 	Set gtmtypes("jnlpool_ctl_struct",16,"len")=8
 	Set gtmtypes("jnlpool_ctl_struct",16,"type")="uint64_t"
 	Set gtmtypfldindx("jnlpool_ctl_struct","max_zqgblmod_seqno")=16
-	Set gtmtypes("jnlpool_ctl_struct",17,"name")="jnlpool_ctl_struct.early_write_addr"
+	Set gtmtypes("jnlpool_ctl_struct",17,"name")="jnlpool_ctl_struct.strm_seqno"
 	Set gtmtypes("jnlpool_ctl_struct",17,"off")=384
-	Set gtmtypes("jnlpool_ctl_struct",17,"len")=8
+	Set gtmtypes("jnlpool_ctl_struct",17,"len")=128
 	Set gtmtypes("jnlpool_ctl_struct",17,"type")="uint64_t"
-	Set gtmtypfldindx("jnlpool_ctl_struct","early_write_addr")=17
-	Set gtmtypes("jnlpool_ctl_struct",18,"name")="jnlpool_ctl_struct.write_addr"
-	Set gtmtypes("jnlpool_ctl_struct",18,"off")=392
-	Set gtmtypes("jnlpool_ctl_struct",18,"len")=8
-	Set gtmtypes("jnlpool_ctl_struct",18,"type")="uint64_t"
-	Set gtmtypfldindx("jnlpool_ctl_struct","write_addr")=18
-	Set gtmtypes("jnlpool_ctl_struct",19,"name")="jnlpool_ctl_struct.write"
-	Set gtmtypes("jnlpool_ctl_struct",19,"off")=400
+	Set gtmtypfldindx("jnlpool_ctl_struct","strm_seqno")=17
+	Set gtmtypes("jnlpool_ctl_struct",17,"dim")=16
+	Set gtmtypes("jnlpool_ctl_struct",18,"name")="jnlpool_ctl_struct.this_side"
+	Set gtmtypes("jnlpool_ctl_struct",18,"off")=512
+	Set gtmtypes("jnlpool_ctl_struct",18,"len")=48
+	Set gtmtypes("jnlpool_ctl_struct",18,"type")="repl_conn_info_t"
+	Set gtmtypfldindx("jnlpool_ctl_struct","this_side")=18
+	Set gtmtypes("jnlpool_ctl_struct",19,"name")="jnlpool_ctl_struct.this_side.proto_ver"
+	Set gtmtypes("jnlpool_ctl_struct",19,"off")=512
 	Set gtmtypes("jnlpool_ctl_struct",19,"len")=4
-	Set gtmtypes("jnlpool_ctl_struct",19,"type")="unsigned-int"
-	Set gtmtypfldindx("jnlpool_ctl_struct","write")=19
-	Set gtmtypes("jnlpool_ctl_struct",20,"name")="jnlpool_ctl_struct.upd_disabled"
-	Set gtmtypes("jnlpool_ctl_struct",20,"off")=404
+	Set gtmtypes("jnlpool_ctl_struct",19,"type")="int"
+	Set gtmtypfldindx("jnlpool_ctl_struct","this_side.proto_ver")=19
+	Set gtmtypes("jnlpool_ctl_struct",20,"name")="jnlpool_ctl_struct.this_side.jnl_ver"
+	Set gtmtypes("jnlpool_ctl_struct",20,"off")=516
 	Set gtmtypes("jnlpool_ctl_struct",20,"len")=4
-	Set gtmtypes("jnlpool_ctl_struct",20,"type")="boolean_t"
-	Set gtmtypfldindx("jnlpool_ctl_struct","upd_disabled")=20
-	Set gtmtypes("jnlpool_ctl_struct",21,"name")="jnlpool_ctl_struct.lastwrite_len"
-	Set gtmtypes("jnlpool_ctl_struct",21,"off")=408
+	Set gtmtypes("jnlpool_ctl_struct",20,"type")="unsigned-int"
+	Set gtmtypfldindx("jnlpool_ctl_struct","this_side.jnl_ver")=20
+	Set gtmtypes("jnlpool_ctl_struct",21,"name")="jnlpool_ctl_struct.this_side.is_std_null_coll"
+	Set gtmtypes("jnlpool_ctl_struct",21,"off")=520
 	Set gtmtypes("jnlpool_ctl_struct",21,"len")=4
-	Set gtmtypes("jnlpool_ctl_struct",21,"type")="unsigned-int"
-	Set gtmtypfldindx("jnlpool_ctl_struct","lastwrite_len")=21
-	Set gtmtypes("jnlpool_ctl_struct",22,"name")="jnlpool_ctl_struct.send_losttn_complete"
-	Set gtmtypes("jnlpool_ctl_struct",22,"off")=412
+	Set gtmtypes("jnlpool_ctl_struct",21,"type")="boolean_t"
+	Set gtmtypfldindx("jnlpool_ctl_struct","this_side.is_std_null_coll")=21
+	Set gtmtypes("jnlpool_ctl_struct",22,"name")="jnlpool_ctl_struct.this_side.trigger_supported"
+	Set gtmtypes("jnlpool_ctl_struct",22,"off")=524
 	Set gtmtypes("jnlpool_ctl_struct",22,"len")=4
 	Set gtmtypes("jnlpool_ctl_struct",22,"type")="boolean_t"
-	Set gtmtypfldindx("jnlpool_ctl_struct","send_losttn_complete")=22
-	Set gtmtypes("jnlpool_ctl_struct",23,"name")="jnlpool_ctl_struct.primary_instname"
-	Set gtmtypes("jnlpool_ctl_struct",23,"off")=416
-	Set gtmtypes("jnlpool_ctl_struct",23,"len")=16
-	Set gtmtypes("jnlpool_ctl_struct",23,"type")="unsigned-char"
-	Set gtmtypfldindx("jnlpool_ctl_struct","primary_instname")=23
-	Set gtmtypes("jnlpool_ctl_struct",24,"name")="jnlpool_ctl_struct.gtmrecv_pid"
-	Set gtmtypes("jnlpool_ctl_struct",24,"off")=432
+	Set gtmtypfldindx("jnlpool_ctl_struct","this_side.trigger_supported")=22
+	Set gtmtypes("jnlpool_ctl_struct",23,"name")="jnlpool_ctl_struct.this_side.cross_endian"
+	Set gtmtypes("jnlpool_ctl_struct",23,"off")=528
+	Set gtmtypes("jnlpool_ctl_struct",23,"len")=4
+	Set gtmtypes("jnlpool_ctl_struct",23,"type")="boolean_t"
+	Set gtmtypfldindx("jnlpool_ctl_struct","this_side.cross_endian")=23
+	Set gtmtypes("jnlpool_ctl_struct",24,"name")="jnlpool_ctl_struct.this_side.endianness_known"
+	Set gtmtypes("jnlpool_ctl_struct",24,"off")=532
 	Set gtmtypes("jnlpool_ctl_struct",24,"len")=4
-	Set gtmtypes("jnlpool_ctl_struct",24,"type")="unsigned-int"
-	Set gtmtypfldindx("jnlpool_ctl_struct","gtmrecv_pid")=24
-	Set gtmtypes("jnlpool_ctl_struct",25,"name")="jnlpool_ctl_struct.prev_jnlseqno_time"
-	Set gtmtypes("jnlpool_ctl_struct",25,"off")=436
+	Set gtmtypes("jnlpool_ctl_struct",24,"type")="boolean_t"
+	Set gtmtypfldindx("jnlpool_ctl_struct","this_side.endianness_known")=24
+	Set gtmtypes("jnlpool_ctl_struct",25,"name")="jnlpool_ctl_struct.this_side.null_subs_xform"
+	Set gtmtypes("jnlpool_ctl_struct",25,"off")=536
 	Set gtmtypes("jnlpool_ctl_struct",25,"len")=4
-	Set gtmtypes("jnlpool_ctl_struct",25,"type")="unsigned-int"
-	Set gtmtypfldindx("jnlpool_ctl_struct","prev_jnlseqno_time")=25
-	Set gtmtypes("jnlpool_ctl_struct",26,"name")="jnlpool_ctl_struct.pool_initialized"
-	Set gtmtypes("jnlpool_ctl_struct",26,"off")=440
+	Set gtmtypes("jnlpool_ctl_struct",25,"type")="boolean_t"
+	Set gtmtypfldindx("jnlpool_ctl_struct","this_side.null_subs_xform")=25
+	Set gtmtypes("jnlpool_ctl_struct",26,"name")="jnlpool_ctl_struct.this_side.is_supplementary"
+	Set gtmtypes("jnlpool_ctl_struct",26,"off")=540
 	Set gtmtypes("jnlpool_ctl_struct",26,"len")=4
 	Set gtmtypes("jnlpool_ctl_struct",26,"type")="boolean_t"
-	Set gtmtypfldindx("jnlpool_ctl_struct","pool_initialized")=26
-	Set gtmtypes("jnlpool_ctl_struct",27,"name")="jnlpool_ctl_struct.jnlpool_creator_pid"
-	Set gtmtypes("jnlpool_ctl_struct",27,"off")=444
+	Set gtmtypfldindx("jnlpool_ctl_struct","this_side.is_supplementary")=26
+	Set gtmtypes("jnlpool_ctl_struct",27,"name")="jnlpool_ctl_struct.this_side.tls_requested"
+	Set gtmtypes("jnlpool_ctl_struct",27,"off")=544
 	Set gtmtypes("jnlpool_ctl_struct",27,"len")=4
-	Set gtmtypes("jnlpool_ctl_struct",27,"type")="unsigned-int"
-	Set gtmtypfldindx("jnlpool_ctl_struct","jnlpool_creator_pid")=27
-	Set gtmtypes("jnlpool_ctl_struct",28,"name")="jnlpool_ctl_struct.this_side"
-	Set gtmtypes("jnlpool_ctl_struct",28,"off")=448
-	Set gtmtypes("jnlpool_ctl_struct",28,"len")=48
-	Set gtmtypes("jnlpool_ctl_struct",28,"type")="repl_conn_info_t"
-	Set gtmtypfldindx("jnlpool_ctl_struct","this_side")=28
-	Set gtmtypes("jnlpool_ctl_struct",29,"name")="jnlpool_ctl_struct.this_side.proto_ver"
-	Set gtmtypes("jnlpool_ctl_struct",29,"off")=448
-	Set gtmtypes("jnlpool_ctl_struct",29,"len")=4
-	Set gtmtypes("jnlpool_ctl_struct",29,"type")="int"
-	Set gtmtypfldindx("jnlpool_ctl_struct","this_side.proto_ver")=29
-	Set gtmtypes("jnlpool_ctl_struct",30,"name")="jnlpool_ctl_struct.this_side.jnl_ver"
-	Set gtmtypes("jnlpool_ctl_struct",30,"off")=452
-	Set gtmtypes("jnlpool_ctl_struct",30,"len")=4
-	Set gtmtypes("jnlpool_ctl_struct",30,"type")="unsigned-int"
-	Set gtmtypfldindx("jnlpool_ctl_struct","this_side.jnl_ver")=30
-	Set gtmtypes("jnlpool_ctl_struct",31,"name")="jnlpool_ctl_struct.this_side.is_std_null_coll"
-	Set gtmtypes("jnlpool_ctl_struct",31,"off")=456
+	Set gtmtypes("jnlpool_ctl_struct",27,"type")="boolean_t"
+	Set gtmtypfldindx("jnlpool_ctl_struct","this_side.tls_requested")=27
+	Set gtmtypes("jnlpool_ctl_struct",28,"name")="jnlpool_ctl_struct.this_side.filler_16"
+	Set gtmtypes("jnlpool_ctl_struct",28,"off")=548
+	Set gtmtypes("jnlpool_ctl_struct",28,"len")=12
+	Set gtmtypes("jnlpool_ctl_struct",28,"type")="char"
+	Set gtmtypfldindx("jnlpool_ctl_struct","this_side.filler_16")=28
+	Set gtmtypes("jnlpool_ctl_struct",29,"name")="jnlpool_ctl_struct.write_addr"
+	Set gtmtypes("jnlpool_ctl_struct",29,"off")=560
+	Set gtmtypes("jnlpool_ctl_struct",29,"len")=8
+	Set gtmtypes("jnlpool_ctl_struct",29,"type")="uint64_t"
+	Set gtmtypfldindx("jnlpool_ctl_struct","write_addr")=29
+	Set gtmtypes("jnlpool_ctl_struct",30,"name")="jnlpool_ctl_struct.rsrv_write_addr"
+	Set gtmtypes("jnlpool_ctl_struct",30,"off")=568
+	Set gtmtypes("jnlpool_ctl_struct",30,"len")=8
+	Set gtmtypes("jnlpool_ctl_struct",30,"type")="uint64_t"
+	Set gtmtypfldindx("jnlpool_ctl_struct","rsrv_write_addr")=30
+	Set gtmtypes("jnlpool_ctl_struct",31,"name")="jnlpool_ctl_struct.upd_disabled"
+	Set gtmtypes("jnlpool_ctl_struct",31,"off")=576
 	Set gtmtypes("jnlpool_ctl_struct",31,"len")=4
 	Set gtmtypes("jnlpool_ctl_struct",31,"type")="boolean_t"
-	Set gtmtypfldindx("jnlpool_ctl_struct","this_side.is_std_null_coll")=31
-	Set gtmtypes("jnlpool_ctl_struct",32,"name")="jnlpool_ctl_struct.this_side.trigger_supported"
-	Set gtmtypes("jnlpool_ctl_struct",32,"off")=460
+	Set gtmtypfldindx("jnlpool_ctl_struct","upd_disabled")=31
+	Set gtmtypes("jnlpool_ctl_struct",32,"name")="jnlpool_ctl_struct.lastwrite_len"
+	Set gtmtypes("jnlpool_ctl_struct",32,"off")=580
 	Set gtmtypes("jnlpool_ctl_struct",32,"len")=4
-	Set gtmtypes("jnlpool_ctl_struct",32,"type")="boolean_t"
-	Set gtmtypfldindx("jnlpool_ctl_struct","this_side.trigger_supported")=32
-	Set gtmtypes("jnlpool_ctl_struct",33,"name")="jnlpool_ctl_struct.this_side.cross_endian"
-	Set gtmtypes("jnlpool_ctl_struct",33,"off")=464
+	Set gtmtypes("jnlpool_ctl_struct",32,"type")="unsigned-int"
+	Set gtmtypfldindx("jnlpool_ctl_struct","lastwrite_len")=32
+	Set gtmtypes("jnlpool_ctl_struct",33,"name")="jnlpool_ctl_struct.send_losttn_complete"
+	Set gtmtypes("jnlpool_ctl_struct",33,"off")=584
 	Set gtmtypes("jnlpool_ctl_struct",33,"len")=4
 	Set gtmtypes("jnlpool_ctl_struct",33,"type")="boolean_t"
-	Set gtmtypfldindx("jnlpool_ctl_struct","this_side.cross_endian")=33
-	Set gtmtypes("jnlpool_ctl_struct",34,"name")="jnlpool_ctl_struct.this_side.endianness_known"
-	Set gtmtypes("jnlpool_ctl_struct",34,"off")=468
-	Set gtmtypes("jnlpool_ctl_struct",34,"len")=4
-	Set gtmtypes("jnlpool_ctl_struct",34,"type")="boolean_t"
-	Set gtmtypfldindx("jnlpool_ctl_struct","this_side.endianness_known")=34
-	Set gtmtypes("jnlpool_ctl_struct",35,"name")="jnlpool_ctl_struct.this_side.null_subs_xform"
-	Set gtmtypes("jnlpool_ctl_struct",35,"off")=472
+	Set gtmtypfldindx("jnlpool_ctl_struct","send_losttn_complete")=33
+	Set gtmtypes("jnlpool_ctl_struct",34,"name")="jnlpool_ctl_struct.primary_instname"
+	Set gtmtypes("jnlpool_ctl_struct",34,"off")=588
+	Set gtmtypes("jnlpool_ctl_struct",34,"len")=16
+	Set gtmtypes("jnlpool_ctl_struct",34,"type")="unsigned-char"
+	Set gtmtypfldindx("jnlpool_ctl_struct","primary_instname")=34
+	Set gtmtypes("jnlpool_ctl_struct",35,"name")="jnlpool_ctl_struct.gtmrecv_pid"
+	Set gtmtypes("jnlpool_ctl_struct",35,"off")=604
 	Set gtmtypes("jnlpool_ctl_struct",35,"len")=4
-	Set gtmtypes("jnlpool_ctl_struct",35,"type")="boolean_t"
-	Set gtmtypfldindx("jnlpool_ctl_struct","this_side.null_subs_xform")=35
-	Set gtmtypes("jnlpool_ctl_struct",36,"name")="jnlpool_ctl_struct.this_side.is_supplementary"
-	Set gtmtypes("jnlpool_ctl_struct",36,"off")=476
+	Set gtmtypes("jnlpool_ctl_struct",35,"type")="unsigned-int"
+	Set gtmtypfldindx("jnlpool_ctl_struct","gtmrecv_pid")=35
+	Set gtmtypes("jnlpool_ctl_struct",36,"name")="jnlpool_ctl_struct.prev_jnlseqno_time"
+	Set gtmtypes("jnlpool_ctl_struct",36,"off")=608
 	Set gtmtypes("jnlpool_ctl_struct",36,"len")=4
-	Set gtmtypes("jnlpool_ctl_struct",36,"type")="boolean_t"
-	Set gtmtypfldindx("jnlpool_ctl_struct","this_side.is_supplementary")=36
-	Set gtmtypes("jnlpool_ctl_struct",37,"name")="jnlpool_ctl_struct.this_side.tls_requested"
-	Set gtmtypes("jnlpool_ctl_struct",37,"off")=480
+	Set gtmtypes("jnlpool_ctl_struct",36,"type")="unsigned-int"
+	Set gtmtypfldindx("jnlpool_ctl_struct","prev_jnlseqno_time")=36
+	Set gtmtypes("jnlpool_ctl_struct",37,"name")="jnlpool_ctl_struct.pool_initialized"
+	Set gtmtypes("jnlpool_ctl_struct",37,"off")=612
 	Set gtmtypes("jnlpool_ctl_struct",37,"len")=4
 	Set gtmtypes("jnlpool_ctl_struct",37,"type")="boolean_t"
-	Set gtmtypfldindx("jnlpool_ctl_struct","this_side.tls_requested")=37
-	Set gtmtypes("jnlpool_ctl_struct",38,"name")="jnlpool_ctl_struct.this_side.filler_16"
-	Set gtmtypes("jnlpool_ctl_struct",38,"off")=484
-	Set gtmtypes("jnlpool_ctl_struct",38,"len")=12
-	Set gtmtypes("jnlpool_ctl_struct",38,"type")="char"
-	Set gtmtypfldindx("jnlpool_ctl_struct","this_side.filler_16")=38
-	Set gtmtypes("jnlpool_ctl_struct",39,"name")="jnlpool_ctl_struct.strm_seqno"
-	Set gtmtypes("jnlpool_ctl_struct",39,"off")=496
-	Set gtmtypes("jnlpool_ctl_struct",39,"len")=128
-	Set gtmtypes("jnlpool_ctl_struct",39,"type")="uint64_t"
-	Set gtmtypfldindx("jnlpool_ctl_struct","strm_seqno")=39
-	Set gtmtypes("jnlpool_ctl_struct",39,"dim")=16
-	Set gtmtypes("jnlpool_ctl_struct",40,"name")="jnlpool_ctl_struct.onln_rlbk_pid"
+	Set gtmtypfldindx("jnlpool_ctl_struct","pool_initialized")=37
+	Set gtmtypes("jnlpool_ctl_struct",38,"name")="jnlpool_ctl_struct.jnlpool_creator_pid"
+	Set gtmtypes("jnlpool_ctl_struct",38,"off")=616
+	Set gtmtypes("jnlpool_ctl_struct",38,"len")=4
+	Set gtmtypes("jnlpool_ctl_struct",38,"type")="unsigned-int"
+	Set gtmtypfldindx("jnlpool_ctl_struct","jnlpool_creator_pid")=38
+	Set gtmtypes("jnlpool_ctl_struct",39,"name")="jnlpool_ctl_struct.onln_rlbk_pid"
+	Set gtmtypes("jnlpool_ctl_struct",39,"off")=620
+	Set gtmtypes("jnlpool_ctl_struct",39,"len")=4
+	Set gtmtypes("jnlpool_ctl_struct",39,"type")="unsigned-int"
+	Set gtmtypfldindx("jnlpool_ctl_struct","onln_rlbk_pid")=39
+	Set gtmtypes("jnlpool_ctl_struct",40,"name")="jnlpool_ctl_struct.onln_rlbk_cycle"
 	Set gtmtypes("jnlpool_ctl_struct",40,"off")=624
 	Set gtmtypes("jnlpool_ctl_struct",40,"len")=4
 	Set gtmtypes("jnlpool_ctl_struct",40,"type")="unsigned-int"
-	Set gtmtypfldindx("jnlpool_ctl_struct","onln_rlbk_pid")=40
-	Set gtmtypes("jnlpool_ctl_struct",41,"name")="jnlpool_ctl_struct.onln_rlbk_cycle"
+	Set gtmtypfldindx("jnlpool_ctl_struct","onln_rlbk_cycle")=40
+	Set gtmtypes("jnlpool_ctl_struct",41,"name")="jnlpool_ctl_struct.freeze"
 	Set gtmtypes("jnlpool_ctl_struct",41,"off")=628
 	Set gtmtypes("jnlpool_ctl_struct",41,"len")=4
-	Set gtmtypes("jnlpool_ctl_struct",41,"type")="unsigned-int"
-	Set gtmtypfldindx("jnlpool_ctl_struct","onln_rlbk_cycle")=41
-	Set gtmtypes("jnlpool_ctl_struct",42,"name")="jnlpool_ctl_struct.freeze"
+	Set gtmtypes("jnlpool_ctl_struct",41,"type")="boolean_t"
+	Set gtmtypfldindx("jnlpool_ctl_struct","freeze")=41
+	Set gtmtypes("jnlpool_ctl_struct",42,"name")="jnlpool_ctl_struct.freeze_comment"
 	Set gtmtypes("jnlpool_ctl_struct",42,"off")=632
-	Set gtmtypes("jnlpool_ctl_struct",42,"len")=4
-	Set gtmtypes("jnlpool_ctl_struct",42,"type")="boolean_t"
-	Set gtmtypfldindx("jnlpool_ctl_struct","freeze")=42
-	Set gtmtypes("jnlpool_ctl_struct",43,"name")="jnlpool_ctl_struct.freeze_comment"
-	Set gtmtypes("jnlpool_ctl_struct",43,"off")=636
-	Set gtmtypes("jnlpool_ctl_struct",43,"len")=1024
-	Set gtmtypes("jnlpool_ctl_struct",43,"type")="char"
-	Set gtmtypfldindx("jnlpool_ctl_struct","freeze_comment")=43
-	Set gtmtypes("jnlpool_ctl_struct",44,"name")="jnlpool_ctl_struct.instfreeze_environ_inited"
+	Set gtmtypes("jnlpool_ctl_struct",42,"len")=1024
+	Set gtmtypes("jnlpool_ctl_struct",42,"type")="char"
+	Set gtmtypfldindx("jnlpool_ctl_struct","freeze_comment")=42
+	Set gtmtypes("jnlpool_ctl_struct",43,"name")="jnlpool_ctl_struct.instfreeze_environ_inited"
+	Set gtmtypes("jnlpool_ctl_struct",43,"off")=1656
+	Set gtmtypes("jnlpool_ctl_struct",43,"len")=4
+	Set gtmtypes("jnlpool_ctl_struct",43,"type")="boolean_t"
+	Set gtmtypfldindx("jnlpool_ctl_struct","instfreeze_environ_inited")=43
+	Set gtmtypes("jnlpool_ctl_struct",44,"name")="jnlpool_ctl_struct.merrors_array"
 	Set gtmtypes("jnlpool_ctl_struct",44,"off")=1660
-	Set gtmtypes("jnlpool_ctl_struct",44,"len")=4
-	Set gtmtypes("jnlpool_ctl_struct",44,"type")="boolean_t"
-	Set gtmtypfldindx("jnlpool_ctl_struct","instfreeze_environ_inited")=44
-	Set gtmtypes("jnlpool_ctl_struct",45,"name")="jnlpool_ctl_struct.merrors_array"
-	Set gtmtypes("jnlpool_ctl_struct",45,"off")=1664
-	Set gtmtypes("jnlpool_ctl_struct",45,"len")=2048
-	Set gtmtypes("jnlpool_ctl_struct",45,"type")="unsigned-char"
-	Set gtmtypfldindx("jnlpool_ctl_struct","merrors_array")=45
-	Set gtmtypes("jnlpool_ctl_struct",46,"name")="jnlpool_ctl_struct.outofsync_core_generated"
+	Set gtmtypes("jnlpool_ctl_struct",44,"len")=2048
+	Set gtmtypes("jnlpool_ctl_struct",44,"type")="unsigned-char"
+	Set gtmtypfldindx("jnlpool_ctl_struct","merrors_array")=44
+	Set gtmtypes("jnlpool_ctl_struct",45,"name")="jnlpool_ctl_struct.ftok_counter_halted"
+	Set gtmtypes("jnlpool_ctl_struct",45,"off")=3708
+	Set gtmtypes("jnlpool_ctl_struct",45,"len")=4
+	Set gtmtypes("jnlpool_ctl_struct",45,"type")="boolean_t"
+	Set gtmtypfldindx("jnlpool_ctl_struct","ftok_counter_halted")=45
+	Set gtmtypes("jnlpool_ctl_struct",46,"name")="jnlpool_ctl_struct.phase2_commit_index1"
 	Set gtmtypes("jnlpool_ctl_struct",46,"off")=3712
 	Set gtmtypes("jnlpool_ctl_struct",46,"len")=4
-	Set gtmtypes("jnlpool_ctl_struct",46,"type")="boolean_t"
-	Set gtmtypfldindx("jnlpool_ctl_struct","outofsync_core_generated")=46
-	Set gtmtypes("jnlpool_ctl_struct",47,"name")="jnlpool_ctl_struct.ftok_counter_halted"
+	Set gtmtypes("jnlpool_ctl_struct",46,"type")="unsigned-int"
+	Set gtmtypfldindx("jnlpool_ctl_struct","phase2_commit_index1")=46
+	Set gtmtypes("jnlpool_ctl_struct",47,"name")="jnlpool_ctl_struct.phase2_commit_index2"
 	Set gtmtypes("jnlpool_ctl_struct",47,"off")=3716
 	Set gtmtypes("jnlpool_ctl_struct",47,"len")=4
-	Set gtmtypes("jnlpool_ctl_struct",47,"type")="boolean_t"
-	Set gtmtypfldindx("jnlpool_ctl_struct","ftok_counter_halted")=47
-	Set gtmtypes("jnlpool_ctl_struct",48,"name")="jnlpool_ctl_struct.filler_16bytealign"
+	Set gtmtypes("jnlpool_ctl_struct",47,"type")="unsigned-int"
+	Set gtmtypfldindx("jnlpool_ctl_struct","phase2_commit_index2")=47
+	Set gtmtypes("jnlpool_ctl_struct",48,"name")="jnlpool_ctl_struct.filler_16bytealign1"
 	Set gtmtypes("jnlpool_ctl_struct",48,"off")=3720
 	Set gtmtypes("jnlpool_ctl_struct",48,"len")=8
 	Set gtmtypes("jnlpool_ctl_struct",48,"type")="char"
-	Set gtmtypfldindx("jnlpool_ctl_struct","filler_16bytealign")=48
-	;
-	Set gtmtypes("jnlpool_write_ctx_t")="struct"
-	Set gtmtypes("jnlpool_write_ctx_t",0)=2
-	Set gtmtypes("jnlpool_write_ctx_t","len")=8
-	Set gtmtypes("jnlpool_write_ctx_t",1,"name")="jnlpool_write_ctx_t.write"
-	Set gtmtypes("jnlpool_write_ctx_t",1,"off")=0
-	Set gtmtypes("jnlpool_write_ctx_t",1,"len")=4
-	Set gtmtypes("jnlpool_write_ctx_t",1,"type")="unsigned-int"
-	Set gtmtypfldindx("jnlpool_write_ctx_t","write")=1
-	Set gtmtypes("jnlpool_write_ctx_t",2,"name")="jnlpool_write_ctx_t.write_total"
-	Set gtmtypes("jnlpool_write_ctx_t",2,"off")=4
-	Set gtmtypes("jnlpool_write_ctx_t",2,"len")=4
-	Set gtmtypes("jnlpool_write_ctx_t",2,"type")="unsigned-int"
-	Set gtmtypfldindx("jnlpool_write_ctx_t","write_total")=2
+	Set gtmtypfldindx("jnlpool_ctl_struct","filler_16bytealign1")=48
+	Set gtmtypes("jnlpool_ctl_struct",49,"name")="jnlpool_ctl_struct.jnl_pool_write_sleep"
+	Set gtmtypes("jnlpool_ctl_struct",49,"off")=3728
+	Set gtmtypes("jnlpool_ctl_struct",49,"len")=16
+	Set gtmtypes("jnlpool_ctl_struct",49,"type")="jpl_trc_rec_t"
+	Set gtmtypfldindx("jnlpool_ctl_struct","jnl_pool_write_sleep")=49
+	Set gtmtypes("jnlpool_ctl_struct",50,"name")="jnlpool_ctl_struct.jnl_pool_write_sleep.cntr"
+	Set gtmtypes("jnlpool_ctl_struct",50,"off")=3728
+	Set gtmtypes("jnlpool_ctl_struct",50,"len")=8
+	Set gtmtypes("jnlpool_ctl_struct",50,"type")="uint64_t"
+	Set gtmtypfldindx("jnlpool_ctl_struct","jnl_pool_write_sleep.cntr")=50
+	Set gtmtypes("jnlpool_ctl_struct",51,"name")="jnlpool_ctl_struct.jnl_pool_write_sleep.seqno"
+	Set gtmtypes("jnlpool_ctl_struct",51,"off")=3736
+	Set gtmtypes("jnlpool_ctl_struct",51,"len")=8
+	Set gtmtypes("jnlpool_ctl_struct",51,"type")="uint64_t"
+	Set gtmtypfldindx("jnlpool_ctl_struct","jnl_pool_write_sleep.seqno")=51
+	Set gtmtypes("jnlpool_ctl_struct",52,"name")="jnlpool_ctl_struct.repl_phs2cmt_arrayfull_sleep"
+	Set gtmtypes("jnlpool_ctl_struct",52,"off")=3744
+	Set gtmtypes("jnlpool_ctl_struct",52,"len")=16
+	Set gtmtypes("jnlpool_ctl_struct",52,"type")="jpl_trc_rec_t"
+	Set gtmtypfldindx("jnlpool_ctl_struct","repl_phs2cmt_arrayfull_sleep")=52
+	Set gtmtypes("jnlpool_ctl_struct",53,"name")="jnlpool_ctl_struct.repl_phs2cmt_arrayfull_sleep.cntr"
+	Set gtmtypes("jnlpool_ctl_struct",53,"off")=3744
+	Set gtmtypes("jnlpool_ctl_struct",53,"len")=8
+	Set gtmtypes("jnlpool_ctl_struct",53,"type")="uint64_t"
+	Set gtmtypfldindx("jnlpool_ctl_struct","repl_phs2cmt_arrayfull_sleep.cntr")=53
+	Set gtmtypes("jnlpool_ctl_struct",54,"name")="jnlpool_ctl_struct.repl_phs2cmt_arrayfull_sleep.seqno"
+	Set gtmtypes("jnlpool_ctl_struct",54,"off")=3752
+	Set gtmtypes("jnlpool_ctl_struct",54,"len")=8
+	Set gtmtypes("jnlpool_ctl_struct",54,"type")="uint64_t"
+	Set gtmtypfldindx("jnlpool_ctl_struct","repl_phs2cmt_arrayfull_sleep.seqno")=54
+	Set gtmtypes("jnlpool_ctl_struct",55,"name")="jnlpool_ctl_struct.repl_phase2_cleanup_isprcalv"
+	Set gtmtypes("jnlpool_ctl_struct",55,"off")=3760
+	Set gtmtypes("jnlpool_ctl_struct",55,"len")=16
+	Set gtmtypes("jnlpool_ctl_struct",55,"type")="jpl_trc_rec_t"
+	Set gtmtypfldindx("jnlpool_ctl_struct","repl_phase2_cleanup_isprcalv")=55
+	Set gtmtypes("jnlpool_ctl_struct",56,"name")="jnlpool_ctl_struct.repl_phase2_cleanup_isprcalv.cntr"
+	Set gtmtypes("jnlpool_ctl_struct",56,"off")=3760
+	Set gtmtypes("jnlpool_ctl_struct",56,"len")=8
+	Set gtmtypes("jnlpool_ctl_struct",56,"type")="uint64_t"
+	Set gtmtypfldindx("jnlpool_ctl_struct","repl_phase2_cleanup_isprcalv.cntr")=56
+	Set gtmtypes("jnlpool_ctl_struct",57,"name")="jnlpool_ctl_struct.repl_phase2_cleanup_isprcalv.seqno"
+	Set gtmtypes("jnlpool_ctl_struct",57,"off")=3768
+	Set gtmtypes("jnlpool_ctl_struct",57,"len")=8
+	Set gtmtypes("jnlpool_ctl_struct",57,"type")="uint64_t"
+	Set gtmtypfldindx("jnlpool_ctl_struct","repl_phase2_cleanup_isprcalv.seqno")=57
+	Set gtmtypes("jnlpool_ctl_struct",58,"name")="jnlpool_ctl_struct.phase2_commit_array"
+	Set gtmtypes("jnlpool_ctl_struct",58,"off")=3776
+	Set gtmtypes("jnlpool_ctl_struct",58,"len")=655360
+	Set gtmtypes("jnlpool_ctl_struct",58,"type")="jpl_phase2_in_prog_t"
+	Set gtmtypfldindx("jnlpool_ctl_struct","phase2_commit_array")=58
+	Set gtmtypes("jnlpool_ctl_struct",58,"dim")=16384
+	Set gtmtypes("jnlpool_ctl_struct",59,"name")="jnlpool_ctl_struct.phase2_commit_array[0].jnl_seqno"
+	Set gtmtypes("jnlpool_ctl_struct",59,"off")=3776
+	Set gtmtypes("jnlpool_ctl_struct",59,"len")=8
+	Set gtmtypes("jnlpool_ctl_struct",59,"type")="uint64_t"
+	Set gtmtypfldindx("jnlpool_ctl_struct","phase2_commit_array[0].jnl_seqno")=59
+	Set gtmtypes("jnlpool_ctl_struct",60,"name")="jnlpool_ctl_struct.phase2_commit_array[0].strm_seqno"
+	Set gtmtypes("jnlpool_ctl_struct",60,"off")=3784
+	Set gtmtypes("jnlpool_ctl_struct",60,"len")=8
+	Set gtmtypes("jnlpool_ctl_struct",60,"type")="uint64_t"
+	Set gtmtypfldindx("jnlpool_ctl_struct","phase2_commit_array[0].strm_seqno")=60
+	Set gtmtypes("jnlpool_ctl_struct",61,"name")="jnlpool_ctl_struct.phase2_commit_array[0].start_write_addr"
+	Set gtmtypes("jnlpool_ctl_struct",61,"off")=3792
+	Set gtmtypes("jnlpool_ctl_struct",61,"len")=8
+	Set gtmtypes("jnlpool_ctl_struct",61,"type")="uint64_t"
+	Set gtmtypfldindx("jnlpool_ctl_struct","phase2_commit_array[0].start_write_addr")=61
+	Set gtmtypes("jnlpool_ctl_struct",62,"name")="jnlpool_ctl_struct.phase2_commit_array[0].process_id"
+	Set gtmtypes("jnlpool_ctl_struct",62,"off")=3800
+	Set gtmtypes("jnlpool_ctl_struct",62,"len")=4
+	Set gtmtypes("jnlpool_ctl_struct",62,"type")="unsigned-int"
+	Set gtmtypfldindx("jnlpool_ctl_struct","phase2_commit_array[0].process_id")=62
+	Set gtmtypes("jnlpool_ctl_struct",63,"name")="jnlpool_ctl_struct.phase2_commit_array[0].tot_jrec_len"
+	Set gtmtypes("jnlpool_ctl_struct",63,"off")=3804
+	Set gtmtypes("jnlpool_ctl_struct",63,"len")=4
+	Set gtmtypes("jnlpool_ctl_struct",63,"type")="unsigned-int"
+	Set gtmtypfldindx("jnlpool_ctl_struct","phase2_commit_array[0].tot_jrec_len")=63
+	Set gtmtypes("jnlpool_ctl_struct",64,"name")="jnlpool_ctl_struct.phase2_commit_array[0].prev_jrec_len"
+	Set gtmtypes("jnlpool_ctl_struct",64,"off")=3808
+	Set gtmtypes("jnlpool_ctl_struct",64,"len")=4
+	Set gtmtypes("jnlpool_ctl_struct",64,"type")="unsigned-int"
+	Set gtmtypfldindx("jnlpool_ctl_struct","phase2_commit_array[0].prev_jrec_len")=64
+	Set gtmtypes("jnlpool_ctl_struct",65,"name")="jnlpool_ctl_struct.phase2_commit_array[0].write_complete"
+	Set gtmtypes("jnlpool_ctl_struct",65,"off")=3812
+	Set gtmtypes("jnlpool_ctl_struct",65,"len")=4
+	Set gtmtypes("jnlpool_ctl_struct",65,"type")="boolean_t"
+	Set gtmtypfldindx("jnlpool_ctl_struct","phase2_commit_array[0].write_complete")=65
+	Set gtmtypes("jnlpool_ctl_struct",66,"name")="jnlpool_ctl_struct.fill_cacheline0"
+	Set gtmtypes("jnlpool_ctl_struct",66,"off")=659136
+	Set gtmtypes("jnlpool_ctl_struct",66,"len")=56
+	Set gtmtypes("jnlpool_ctl_struct",66,"type")="char"
+	Set gtmtypfldindx("jnlpool_ctl_struct","fill_cacheline0")=66
+	Set gtmtypes("jnlpool_ctl_struct",67,"name")="jnlpool_ctl_struct.phase2_commit_latch"
+	Set gtmtypes("jnlpool_ctl_struct",67,"off")=659192
+	Set gtmtypes("jnlpool_ctl_struct",67,"len")=8
+	Set gtmtypes("jnlpool_ctl_struct",67,"type")="global_latch_t"
+	Set gtmtypfldindx("jnlpool_ctl_struct","phase2_commit_latch")=67
+	Set gtmtypes("jnlpool_ctl_struct",68,"name")="jnlpool_ctl_struct.phase2_commit_latch.u"
+	Set gtmtypes("jnlpool_ctl_struct",68,"off")=659192
+	Set gtmtypes("jnlpool_ctl_struct",68,"len")=8
+	Set gtmtypes("jnlpool_ctl_struct",68,"type")="union"
+	Set gtmtypfldindx("jnlpool_ctl_struct","phase2_commit_latch.u")=68
+	Set gtmtypes("jnlpool_ctl_struct",69,"name")="jnlpool_ctl_struct.phase2_commit_latch.u.pid_imgcnt"
+	Set gtmtypes("jnlpool_ctl_struct",69,"off")=659192
+	Set gtmtypes("jnlpool_ctl_struct",69,"len")=8
+	Set gtmtypes("jnlpool_ctl_struct",69,"type")="uint64_t"
+	Set gtmtypfldindx("jnlpool_ctl_struct","phase2_commit_latch.u.pid_imgcnt")=69
+	Set gtmtypes("jnlpool_ctl_struct",70,"name")="jnlpool_ctl_struct.phase2_commit_latch.u.parts"
+	Set gtmtypes("jnlpool_ctl_struct",70,"off")=659192
+	Set gtmtypes("jnlpool_ctl_struct",70,"len")=8
+	Set gtmtypes("jnlpool_ctl_struct",70,"type")="struct"
+	Set gtmtypfldindx("jnlpool_ctl_struct","phase2_commit_latch.u.parts")=70
+	Set gtmtypes("jnlpool_ctl_struct",71,"name")="jnlpool_ctl_struct.phase2_commit_latch.u.parts.latch_pid"
+	Set gtmtypes("jnlpool_ctl_struct",71,"off")=659192
+	Set gtmtypes("jnlpool_ctl_struct",71,"len")=4
+	Set gtmtypes("jnlpool_ctl_struct",71,"type")="int"
+	Set gtmtypfldindx("jnlpool_ctl_struct","phase2_commit_latch.u.parts.latch_pid")=71
+	Set gtmtypes("jnlpool_ctl_struct",72,"name")="jnlpool_ctl_struct.phase2_commit_latch.u.parts.latch_word"
+	Set gtmtypes("jnlpool_ctl_struct",72,"off")=659196
+	Set gtmtypes("jnlpool_ctl_struct",72,"len")=4
+	Set gtmtypes("jnlpool_ctl_struct",72,"type")="int"
+	Set gtmtypfldindx("jnlpool_ctl_struct","phase2_commit_latch.u.parts.latch_word")=72
 	;
 	Set gtmtypes("job_arg_msg")="struct"
 	Set gtmtypes("job_arg_msg",0)=2
@@ -12407,6 +12774,103 @@ Init
 	Set gtmtypes("joberr_msg",2,"type")="int"
 	Set gtmtypfldindx("joberr_msg","len")=2
 	;
+	Set gtmtypes("jpl_phase2_in_prog_t")="struct"
+	Set gtmtypes("jpl_phase2_in_prog_t",0)=7
+	Set gtmtypes("jpl_phase2_in_prog_t","len")=40
+	Set gtmtypes("jpl_phase2_in_prog_t",1,"name")="jpl_phase2_in_prog_t.jnl_seqno"
+	Set gtmtypes("jpl_phase2_in_prog_t",1,"off")=0
+	Set gtmtypes("jpl_phase2_in_prog_t",1,"len")=8
+	Set gtmtypes("jpl_phase2_in_prog_t",1,"type")="uint64_t"
+	Set gtmtypfldindx("jpl_phase2_in_prog_t","jnl_seqno")=1
+	Set gtmtypes("jpl_phase2_in_prog_t",2,"name")="jpl_phase2_in_prog_t.strm_seqno"
+	Set gtmtypes("jpl_phase2_in_prog_t",2,"off")=8
+	Set gtmtypes("jpl_phase2_in_prog_t",2,"len")=8
+	Set gtmtypes("jpl_phase2_in_prog_t",2,"type")="uint64_t"
+	Set gtmtypfldindx("jpl_phase2_in_prog_t","strm_seqno")=2
+	Set gtmtypes("jpl_phase2_in_prog_t",3,"name")="jpl_phase2_in_prog_t.start_write_addr"
+	Set gtmtypes("jpl_phase2_in_prog_t",3,"off")=16
+	Set gtmtypes("jpl_phase2_in_prog_t",3,"len")=8
+	Set gtmtypes("jpl_phase2_in_prog_t",3,"type")="uint64_t"
+	Set gtmtypfldindx("jpl_phase2_in_prog_t","start_write_addr")=3
+	Set gtmtypes("jpl_phase2_in_prog_t",4,"name")="jpl_phase2_in_prog_t.process_id"
+	Set gtmtypes("jpl_phase2_in_prog_t",4,"off")=24
+	Set gtmtypes("jpl_phase2_in_prog_t",4,"len")=4
+	Set gtmtypes("jpl_phase2_in_prog_t",4,"type")="unsigned-int"
+	Set gtmtypfldindx("jpl_phase2_in_prog_t","process_id")=4
+	Set gtmtypes("jpl_phase2_in_prog_t",5,"name")="jpl_phase2_in_prog_t.tot_jrec_len"
+	Set gtmtypes("jpl_phase2_in_prog_t",5,"off")=28
+	Set gtmtypes("jpl_phase2_in_prog_t",5,"len")=4
+	Set gtmtypes("jpl_phase2_in_prog_t",5,"type")="unsigned-int"
+	Set gtmtypfldindx("jpl_phase2_in_prog_t","tot_jrec_len")=5
+	Set gtmtypes("jpl_phase2_in_prog_t",6,"name")="jpl_phase2_in_prog_t.prev_jrec_len"
+	Set gtmtypes("jpl_phase2_in_prog_t",6,"off")=32
+	Set gtmtypes("jpl_phase2_in_prog_t",6,"len")=4
+	Set gtmtypes("jpl_phase2_in_prog_t",6,"type")="unsigned-int"
+	Set gtmtypfldindx("jpl_phase2_in_prog_t","prev_jrec_len")=6
+	Set gtmtypes("jpl_phase2_in_prog_t",7,"name")="jpl_phase2_in_prog_t.write_complete"
+	Set gtmtypes("jpl_phase2_in_prog_t",7,"off")=36
+	Set gtmtypes("jpl_phase2_in_prog_t",7,"len")=4
+	Set gtmtypes("jpl_phase2_in_prog_t",7,"type")="boolean_t"
+	Set gtmtypfldindx("jpl_phase2_in_prog_t","write_complete")=7
+	;
+	Set gtmtypes("jpl_rsrv_struct_t")="struct"
+	Set gtmtypes("jpl_rsrv_struct_t",0)=8
+	Set gtmtypes("jpl_rsrv_struct_t","len")=40
+	Set gtmtypes("jpl_rsrv_struct_t",1,"name")="jpl_rsrv_struct_t.start_write_addr"
+	Set gtmtypes("jpl_rsrv_struct_t",1,"off")=0
+	Set gtmtypes("jpl_rsrv_struct_t",1,"len")=8
+	Set gtmtypes("jpl_rsrv_struct_t",1,"type")="uint64_t"
+	Set gtmtypfldindx("jpl_rsrv_struct_t","start_write_addr")=1
+	Set gtmtypes("jpl_rsrv_struct_t",2,"name")="jpl_rsrv_struct_t.cur_write_addr"
+	Set gtmtypes("jpl_rsrv_struct_t",2,"off")=8
+	Set gtmtypes("jpl_rsrv_struct_t",2,"len")=8
+	Set gtmtypes("jpl_rsrv_struct_t",2,"type")="uint64_t"
+	Set gtmtypfldindx("jpl_rsrv_struct_t","cur_write_addr")=2
+	Set gtmtypes("jpl_rsrv_struct_t",3,"name")="jpl_rsrv_struct_t.tot_jrec_len"
+	Set gtmtypes("jpl_rsrv_struct_t",3,"off")=16
+	Set gtmtypes("jpl_rsrv_struct_t",3,"len")=4
+	Set gtmtypes("jpl_rsrv_struct_t",3,"type")="unsigned-int"
+	Set gtmtypfldindx("jpl_rsrv_struct_t","tot_jrec_len")=3
+	Set gtmtypes("jpl_rsrv_struct_t",4,"name")="jpl_rsrv_struct_t.write_total"
+	Set gtmtypes("jpl_rsrv_struct_t",4,"off")=20
+	Set gtmtypes("jpl_rsrv_struct_t",4,"len")=4
+	Set gtmtypes("jpl_rsrv_struct_t",4,"type")="unsigned-int"
+	Set gtmtypfldindx("jpl_rsrv_struct_t","write_total")=4
+	Set gtmtypes("jpl_rsrv_struct_t",5,"name")="jpl_rsrv_struct_t.memcpy_skipped"
+	Set gtmtypes("jpl_rsrv_struct_t",5,"off")=24
+	Set gtmtypes("jpl_rsrv_struct_t",5,"len")=4
+	Set gtmtypes("jpl_rsrv_struct_t",5,"type")="boolean_t"
+	Set gtmtypfldindx("jpl_rsrv_struct_t","memcpy_skipped")=5
+	Set gtmtypes("jpl_rsrv_struct_t",6,"name")="jpl_rsrv_struct_t.phase2_commit_index"
+	Set gtmtypes("jpl_rsrv_struct_t",6,"off")=28
+	Set gtmtypes("jpl_rsrv_struct_t",6,"len")=4
+	Set gtmtypes("jpl_rsrv_struct_t",6,"type")="unsigned-int"
+	Set gtmtypfldindx("jpl_rsrv_struct_t","phase2_commit_index")=6
+	Set gtmtypes("jpl_rsrv_struct_t",7,"name")="jpl_rsrv_struct_t.num_tcoms"
+	Set gtmtypes("jpl_rsrv_struct_t",7,"off")=32
+	Set gtmtypes("jpl_rsrv_struct_t",7,"len")=4
+	Set gtmtypes("jpl_rsrv_struct_t",7,"type")="unsigned-int"
+	Set gtmtypfldindx("jpl_rsrv_struct_t","num_tcoms")=7
+	Set gtmtypes("jpl_rsrv_struct_t",8,"name")="jpl_rsrv_struct_t.filler_8byte_align"
+	Set gtmtypes("jpl_rsrv_struct_t",8,"off")=36
+	Set gtmtypes("jpl_rsrv_struct_t",8,"len")=4
+	Set gtmtypes("jpl_rsrv_struct_t",8,"type")="char"
+	Set gtmtypfldindx("jpl_rsrv_struct_t","filler_8byte_align")=8
+	;
+	Set gtmtypes("jpl_trc_rec_t")="struct"
+	Set gtmtypes("jpl_trc_rec_t",0)=2
+	Set gtmtypes("jpl_trc_rec_t","len")=16
+	Set gtmtypes("jpl_trc_rec_t",1,"name")="jpl_trc_rec_t.cntr"
+	Set gtmtypes("jpl_trc_rec_t",1,"off")=0
+	Set gtmtypes("jpl_trc_rec_t",1,"len")=8
+	Set gtmtypes("jpl_trc_rec_t",1,"type")="uint64_t"
+	Set gtmtypfldindx("jpl_trc_rec_t","cntr")=1
+	Set gtmtypes("jpl_trc_rec_t",2,"name")="jpl_trc_rec_t.seqno"
+	Set gtmtypes("jpl_trc_rec_t",2,"off")=8
+	Set gtmtypes("jpl_trc_rec_t",2,"len")=8
+	Set gtmtypes("jpl_trc_rec_t",2,"type")="uint64_t"
+	Set gtmtypfldindx("jpl_trc_rec_t","seqno")=2
+	;
 	Set gtmtypes("jrec_prefix")="struct"
 	Set gtmtypes("jrec_prefix",0)=4
 	Set gtmtypes("jrec_prefix","len")=24
@@ -12431,6 +12895,25 @@ Init
 	Set gtmtypes("jrec_prefix",4,"type")="uint64_t"
 	Set gtmtypfldindx("jrec_prefix","tn")=4
 	;
+	Set gtmtypes("jrec_rsrv_elem_t")="struct"
+	Set gtmtypes("jrec_rsrv_elem_t",0)=3
+	Set gtmtypes("jrec_rsrv_elem_t","len")=16
+	Set gtmtypes("jrec_rsrv_elem_t",1,"name")="jrec_rsrv_elem_t.rectype"
+	Set gtmtypes("jrec_rsrv_elem_t",1,"off")=0
+	Set gtmtypes("jrec_rsrv_elem_t",1,"len")=4
+	Set gtmtypes("jrec_rsrv_elem_t",1,"type")="int"
+	Set gtmtypfldindx("jrec_rsrv_elem_t","rectype")=1
+	Set gtmtypes("jrec_rsrv_elem_t",2,"name")="jrec_rsrv_elem_t.reclen"
+	Set gtmtypes("jrec_rsrv_elem_t",2,"off")=4
+	Set gtmtypes("jrec_rsrv_elem_t",2,"len")=4
+	Set gtmtypes("jrec_rsrv_elem_t",2,"type")="unsigned-int"
+	Set gtmtypfldindx("jrec_rsrv_elem_t","reclen")=2
+	Set gtmtypes("jrec_rsrv_elem_t",3,"name")="jrec_rsrv_elem_t.param1"
+	Set gtmtypes("jrec_rsrv_elem_t",3,"off")=8
+	Set gtmtypes("jrec_rsrv_elem_t",3,"len")=8
+	Set gtmtypes("jrec_rsrv_elem_t",3,"type")="addr"
+	Set gtmtypfldindx("jrec_rsrv_elem_t","param1")=3
+	;
 	Set gtmtypes("key_cum_value")="struct"
 	Set gtmtypes("key_cum_value",0)=11
 	Set gtmtypes("key_cum_value","len")=1088
@@ -13208,6 +13691,362 @@ Init
 	Set gtmtypes("lv_xnew_var",6,"type")="addr"
 	Set gtmtypfldindx("lv_xnew_var","lvval")=6
 	;
+	Set gtmtypes("lvmon_value_ent")="struct"
+	Set gtmtypes("lvmon_value_ent",0)=31
+	Set gtmtypes("lvmon_value_ent","len")=104
+	Set gtmtypes("lvmon_value_ent",1,"name")="lvmon_value_ent.varlvval"
+	Set gtmtypes("lvmon_value_ent",1,"off")=0
+	Set gtmtypes("lvmon_value_ent",1,"len")=80
+	Set gtmtypes("lvmon_value_ent",1,"type")="lv_val"
+	Set gtmtypfldindx("lvmon_value_ent","varlvval")=1
+	Set gtmtypes("lvmon_value_ent",2,"name")="lvmon_value_ent.varlvval.v"
+	Set gtmtypes("lvmon_value_ent",2,"off")=0
+	Set gtmtypes("lvmon_value_ent",2,"len")=32
+	Set gtmtypes("lvmon_value_ent",2,"type")="mval"
+	Set gtmtypfldindx("lvmon_value_ent","varlvval.v")=2
+	Set gtmtypes("lvmon_value_ent",3,"name")="lvmon_value_ent.varlvval.v.mvtype"
+	Set gtmtypes("lvmon_value_ent",3,"off")=0
+	Set gtmtypes("lvmon_value_ent",3,"len")=2
+	Set gtmtypes("lvmon_value_ent",3,"type")="unsigned-short"
+	Set gtmtypfldindx("lvmon_value_ent","varlvval.v.mvtype")=3
+	Set gtmtypes("lvmon_value_ent",4,"name")="lvmon_value_ent.varlvval.v.fnpc_indx"
+	Set gtmtypes("lvmon_value_ent",4,"off")=3
+	Set gtmtypes("lvmon_value_ent",4,"len")=1
+	Set gtmtypes("lvmon_value_ent",4,"type")="unsigned-char"
+	Set gtmtypfldindx("lvmon_value_ent","varlvval.v.fnpc_indx")=4
+	Set gtmtypes("lvmon_value_ent",5,"name")="lvmon_value_ent.varlvval.v.utfcgr_indx"
+	Set gtmtypes("lvmon_value_ent",5,"off")=4
+	Set gtmtypes("lvmon_value_ent",5,"len")=4
+	Set gtmtypes("lvmon_value_ent",5,"type")="unsigned-int"
+	Set gtmtypfldindx("lvmon_value_ent","varlvval.v.utfcgr_indx")=5
+	Set gtmtypes("lvmon_value_ent",6,"name")="lvmon_value_ent.varlvval.v.m"
+	Set gtmtypes("lvmon_value_ent",6,"off")=8
+	Set gtmtypes("lvmon_value_ent",6,"len")=8
+	Set gtmtypes("lvmon_value_ent",6,"type")="int"
+	Set gtmtypfldindx("lvmon_value_ent","varlvval.v.m")=6
+	Set gtmtypes("lvmon_value_ent",6,"dim")=2
+	Set gtmtypes("lvmon_value_ent",7,"name")="lvmon_value_ent.varlvval.v.str"
+	Set gtmtypes("lvmon_value_ent",7,"off")=16
+	Set gtmtypes("lvmon_value_ent",7,"len")=16
+	Set gtmtypes("lvmon_value_ent",7,"type")="mstr"
+	Set gtmtypfldindx("lvmon_value_ent","varlvval.v.str")=7
+	Set gtmtypes("lvmon_value_ent",8,"name")="lvmon_value_ent.varlvval.ptrs"
+	Set gtmtypes("lvmon_value_ent",8,"off")=32
+	Set gtmtypes("lvmon_value_ent",8,"len")=16
+	Set gtmtypes("lvmon_value_ent",8,"type")="union"
+	Set gtmtypfldindx("lvmon_value_ent","varlvval.ptrs")=8
+	Set gtmtypes("lvmon_value_ent",9,"name")="lvmon_value_ent.varlvval.ptrs.val_ent"
+	Set gtmtypes("lvmon_value_ent",9,"off")=32
+	Set gtmtypes("lvmon_value_ent",9,"len")=16
+	Set gtmtypes("lvmon_value_ent",9,"type")="struct"
+	Set gtmtypfldindx("lvmon_value_ent","varlvval.ptrs.val_ent")=9
+	Set gtmtypes("lvmon_value_ent",10,"name")="lvmon_value_ent.varlvval.ptrs.val_ent.children"
+	Set gtmtypes("lvmon_value_ent",10,"off")=32
+	Set gtmtypes("lvmon_value_ent",10,"len")=8
+	Set gtmtypes("lvmon_value_ent",10,"type")="addr"
+	Set gtmtypfldindx("lvmon_value_ent","varlvval.ptrs.val_ent.children")=10
+	Set gtmtypes("lvmon_value_ent",11,"name")="lvmon_value_ent.varlvval.ptrs.val_ent.parent"
+	Set gtmtypes("lvmon_value_ent",11,"off")=40
+	Set gtmtypes("lvmon_value_ent",11,"len")=8
+	Set gtmtypes("lvmon_value_ent",11,"type")="union"
+	Set gtmtypfldindx("lvmon_value_ent","varlvval.ptrs.val_ent.parent")=11
+	Set gtmtypes("lvmon_value_ent",12,"name")="lvmon_value_ent.varlvval.ptrs.val_ent.parent.sym"
+	Set gtmtypes("lvmon_value_ent",12,"off")=40
+	Set gtmtypes("lvmon_value_ent",12,"len")=8
+	Set gtmtypes("lvmon_value_ent",12,"type")="addr"
+	Set gtmtypfldindx("lvmon_value_ent","varlvval.ptrs.val_ent.parent.sym")=12
+	Set gtmtypes("lvmon_value_ent",13,"name")="lvmon_value_ent.varlvval.ptrs.val_ent.parent.sbs_tree"
+	Set gtmtypes("lvmon_value_ent",13,"off")=40
+	Set gtmtypes("lvmon_value_ent",13,"len")=8
+	Set gtmtypes("lvmon_value_ent",13,"type")="addr"
+	Set gtmtypfldindx("lvmon_value_ent","varlvval.ptrs.val_ent.parent.sbs_tree")=13
+	Set gtmtypes("lvmon_value_ent",14,"name")="lvmon_value_ent.varlvval.ptrs.free_ent"
+	Set gtmtypes("lvmon_value_ent",14,"off")=32
+	Set gtmtypes("lvmon_value_ent",14,"len")=8
+	Set gtmtypes("lvmon_value_ent",14,"type")="struct"
+	Set gtmtypfldindx("lvmon_value_ent","varlvval.ptrs.free_ent")=14
+	Set gtmtypes("lvmon_value_ent",15,"name")="lvmon_value_ent.varlvval.ptrs.free_ent.next_free"
+	Set gtmtypes("lvmon_value_ent",15,"off")=32
+	Set gtmtypes("lvmon_value_ent",15,"len")=8
+	Set gtmtypes("lvmon_value_ent",15,"type")="addr"
+	Set gtmtypfldindx("lvmon_value_ent","varlvval.ptrs.free_ent.next_free")=15
+	Set gtmtypes("lvmon_value_ent",16,"name")="lvmon_value_ent.varlvval.ptrs.copy_loc"
+	Set gtmtypes("lvmon_value_ent",16,"off")=32
+	Set gtmtypes("lvmon_value_ent",16,"len")=8
+	Set gtmtypes("lvmon_value_ent",16,"type")="struct"
+	Set gtmtypfldindx("lvmon_value_ent","varlvval.ptrs.copy_loc")=16
+	Set gtmtypes("lvmon_value_ent",17,"name")="lvmon_value_ent.varlvval.ptrs.copy_loc.newtablv"
+	Set gtmtypes("lvmon_value_ent",17,"off")=32
+	Set gtmtypes("lvmon_value_ent",17,"len")=8
+	Set gtmtypes("lvmon_value_ent",17,"type")="addr"
+	Set gtmtypfldindx("lvmon_value_ent","varlvval.ptrs.copy_loc.newtablv")=17
+	Set gtmtypes("lvmon_value_ent",18,"name")="lvmon_value_ent.varlvval.stats"
+	Set gtmtypes("lvmon_value_ent",18,"off")=48
+	Set gtmtypes("lvmon_value_ent",18,"len")=16
+	Set gtmtypes("lvmon_value_ent",18,"type")="struct"
+	Set gtmtypfldindx("lvmon_value_ent","varlvval.stats")=18
+	Set gtmtypes("lvmon_value_ent",19,"name")="lvmon_value_ent.varlvval.stats.trefcnt"
+	Set gtmtypes("lvmon_value_ent",19,"off")=48
+	Set gtmtypes("lvmon_value_ent",19,"len")=4
+	Set gtmtypes("lvmon_value_ent",19,"type")="int"
+	Set gtmtypfldindx("lvmon_value_ent","varlvval.stats.trefcnt")=19
+	Set gtmtypes("lvmon_value_ent",20,"name")="lvmon_value_ent.varlvval.stats.crefcnt"
+	Set gtmtypes("lvmon_value_ent",20,"off")=52
+	Set gtmtypes("lvmon_value_ent",20,"len")=4
+	Set gtmtypes("lvmon_value_ent",20,"type")="int"
+	Set gtmtypfldindx("lvmon_value_ent","varlvval.stats.crefcnt")=20
+	Set gtmtypes("lvmon_value_ent",21,"name")="lvmon_value_ent.varlvval.stats.tstartcycle"
+	Set gtmtypes("lvmon_value_ent",21,"off")=56
+	Set gtmtypes("lvmon_value_ent",21,"len")=4
+	Set gtmtypes("lvmon_value_ent",21,"type")="unsigned-int"
+	Set gtmtypfldindx("lvmon_value_ent","varlvval.stats.tstartcycle")=21
+	Set gtmtypes("lvmon_value_ent",22,"name")="lvmon_value_ent.varlvval.stats.lvtaskcycle"
+	Set gtmtypes("lvmon_value_ent",22,"off")=60
+	Set gtmtypes("lvmon_value_ent",22,"len")=4
+	Set gtmtypes("lvmon_value_ent",22,"type")="unsigned-int"
+	Set gtmtypfldindx("lvmon_value_ent","varlvval.stats.lvtaskcycle")=22
+	Set gtmtypes("lvmon_value_ent",23,"name")="lvmon_value_ent.varlvval.has_aliascont"
+	Set gtmtypes("lvmon_value_ent",23,"off")=64
+	Set gtmtypes("lvmon_value_ent",23,"len")=4
+	Set gtmtypes("lvmon_value_ent",23,"type")="boolean_t"
+	Set gtmtypfldindx("lvmon_value_ent","varlvval.has_aliascont")=23
+	Set gtmtypes("lvmon_value_ent",24,"name")="lvmon_value_ent.varlvval.lvmon_mark"
+	Set gtmtypes("lvmon_value_ent",24,"off")=68
+	Set gtmtypes("lvmon_value_ent",24,"len")=4
+	Set gtmtypes("lvmon_value_ent",24,"type")="boolean_t"
+	Set gtmtypfldindx("lvmon_value_ent","varlvval.lvmon_mark")=24
+	Set gtmtypes("lvmon_value_ent",25,"name")="lvmon_value_ent.varlvval.tp_var"
+	Set gtmtypes("lvmon_value_ent",25,"off")=72
+	Set gtmtypes("lvmon_value_ent",25,"len")=8
+	Set gtmtypes("lvmon_value_ent",25,"type")="addr"
+	Set gtmtypfldindx("lvmon_value_ent","varlvval.tp_var")=25
+	Set gtmtypes("lvmon_value_ent",26,"name")="lvmon_value_ent.varvalue"
+	Set gtmtypes("lvmon_value_ent",26,"off")=80
+	Set gtmtypes("lvmon_value_ent",26,"len")=16
+	Set gtmtypes("lvmon_value_ent",26,"type")="mstr"
+	Set gtmtypfldindx("lvmon_value_ent","varvalue")=26
+	Set gtmtypes("lvmon_value_ent",27,"name")="lvmon_value_ent.varvalue.char_len"
+	Set gtmtypes("lvmon_value_ent",27,"off")=80
+	Set gtmtypes("lvmon_value_ent",27,"len")=4
+	Set gtmtypes("lvmon_value_ent",27,"type")="unsigned-int"
+	Set gtmtypfldindx("lvmon_value_ent","varvalue.char_len")=27
+	Set gtmtypes("lvmon_value_ent",28,"name")="lvmon_value_ent.varvalue.len"
+	Set gtmtypes("lvmon_value_ent",28,"off")=84
+	Set gtmtypes("lvmon_value_ent",28,"len")=4
+	Set gtmtypes("lvmon_value_ent",28,"type")="int"
+	Set gtmtypfldindx("lvmon_value_ent","varvalue.len")=28
+	Set gtmtypes("lvmon_value_ent",29,"name")="lvmon_value_ent.varvalue.addr"
+	Set gtmtypes("lvmon_value_ent",29,"off")=88
+	Set gtmtypes("lvmon_value_ent",29,"len")=8
+	Set gtmtypes("lvmon_value_ent",29,"type")="addr"
+	Set gtmtypfldindx("lvmon_value_ent","varvalue.addr")=29
+	Set gtmtypes("lvmon_value_ent",30,"name")="lvmon_value_ent.alloclen"
+	Set gtmtypes("lvmon_value_ent",30,"off")=96
+	Set gtmtypes("lvmon_value_ent",30,"len")=4
+	Set gtmtypes("lvmon_value_ent",30,"type")="unsigned-int"
+	Set gtmtypfldindx("lvmon_value_ent","alloclen")=30
+	Set gtmtypes("lvmon_value_ent",31,"name")="lvmon_value_ent.filler"
+	Set gtmtypes("lvmon_value_ent",31,"off")=100
+	Set gtmtypes("lvmon_value_ent",31,"len")=4
+	Set gtmtypes("lvmon_value_ent",31,"type")="int"
+	Set gtmtypfldindx("lvmon_value_ent","filler")=31
+	;
+	Set gtmtypes("lvmon_var")="struct"
+	Set gtmtypes("lvmon_var",0)=38
+	Set gtmtypes("lvmon_var","len")=248
+	Set gtmtypes("lvmon_var",1,"name")="lvmon_var.lvmv"
+	Set gtmtypes("lvmon_var",1,"off")=0
+	Set gtmtypes("lvmon_var",1,"len")=24
+	Set gtmtypes("lvmon_var",1,"type")="mname_entry"
+	Set gtmtypfldindx("lvmon_var","lvmv")=1
+	Set gtmtypes("lvmon_var",2,"name")="lvmon_var.lvmv.var_name"
+	Set gtmtypes("lvmon_var",2,"off")=0
+	Set gtmtypes("lvmon_var",2,"len")=16
+	Set gtmtypes("lvmon_var",2,"type")="mstr"
+	Set gtmtypfldindx("lvmon_var","lvmv.var_name")=2
+	Set gtmtypes("lvmon_var",3,"name")="lvmon_var.lvmv.hash_code"
+	Set gtmtypes("lvmon_var",3,"off")=16
+	Set gtmtypes("lvmon_var",3,"len")=4
+	Set gtmtypes("lvmon_var",3,"type")="unsigned-int"
+	Set gtmtypfldindx("lvmon_var","lvmv.hash_code")=3
+	Set gtmtypes("lvmon_var",4,"name")="lvmon_var.lvmv.marked"
+	Set gtmtypes("lvmon_var",4,"off")=20
+	Set gtmtypes("lvmon_var",4,"len")=4
+	Set gtmtypes("lvmon_var",4,"type")="boolean_t"
+	Set gtmtypfldindx("lvmon_var","lvmv.marked")=4
+	Set gtmtypes("lvmon_var",5,"name")="lvmon_var.varlvadr"
+	Set gtmtypes("lvmon_var",5,"off")=24
+	Set gtmtypes("lvmon_var",5,"len")=8
+	Set gtmtypes("lvmon_var",5,"type")="addr"
+	Set gtmtypfldindx("lvmon_var","varlvadr")=5
+	Set gtmtypes("lvmon_var",6,"name")="lvmon_var.curr_symval_cycle"
+	Set gtmtypes("lvmon_var",6,"off")=32
+	Set gtmtypes("lvmon_var",6,"len")=8
+	Set gtmtypes("lvmon_var",6,"type")="gtm_int8"
+	Set gtmtypfldindx("lvmon_var","curr_symval_cycle")=6
+	Set gtmtypes("lvmon_var",7,"name")="lvmon_var.values"
+	Set gtmtypes("lvmon_var",7,"off")=40
+	Set gtmtypes("lvmon_var",7,"len")=208
+	Set gtmtypes("lvmon_var",7,"type")="lvmon_value_ent"
+	Set gtmtypfldindx("lvmon_var","values")=7
+	Set gtmtypes("lvmon_var",7,"dim")=2
+	Set gtmtypes("lvmon_var",8,"name")="lvmon_var.values[0].varlvval"
+	Set gtmtypes("lvmon_var",8,"off")=40
+	Set gtmtypes("lvmon_var",8,"len")=80
+	Set gtmtypes("lvmon_var",8,"type")="lv_val"
+	Set gtmtypfldindx("lvmon_var","values[0].varlvval")=8
+	Set gtmtypes("lvmon_var",9,"name")="lvmon_var.values[0].varlvval.v"
+	Set gtmtypes("lvmon_var",9,"off")=40
+	Set gtmtypes("lvmon_var",9,"len")=32
+	Set gtmtypes("lvmon_var",9,"type")="mval"
+	Set gtmtypfldindx("lvmon_var","values[0].varlvval.v")=9
+	Set gtmtypes("lvmon_var",10,"name")="lvmon_var.values[0].varlvval.v.mvtype"
+	Set gtmtypes("lvmon_var",10,"off")=40
+	Set gtmtypes("lvmon_var",10,"len")=2
+	Set gtmtypes("lvmon_var",10,"type")="unsigned-short"
+	Set gtmtypfldindx("lvmon_var","values[0].varlvval.v.mvtype")=10
+	Set gtmtypes("lvmon_var",11,"name")="lvmon_var.values[0].varlvval.v.fnpc_indx"
+	Set gtmtypes("lvmon_var",11,"off")=43
+	Set gtmtypes("lvmon_var",11,"len")=1
+	Set gtmtypes("lvmon_var",11,"type")="unsigned-char"
+	Set gtmtypfldindx("lvmon_var","values[0].varlvval.v.fnpc_indx")=11
+	Set gtmtypes("lvmon_var",12,"name")="lvmon_var.values[0].varlvval.v.utfcgr_indx"
+	Set gtmtypes("lvmon_var",12,"off")=44
+	Set gtmtypes("lvmon_var",12,"len")=4
+	Set gtmtypes("lvmon_var",12,"type")="unsigned-int"
+	Set gtmtypfldindx("lvmon_var","values[0].varlvval.v.utfcgr_indx")=12
+	Set gtmtypes("lvmon_var",13,"name")="lvmon_var.values[0].varlvval.v.m"
+	Set gtmtypes("lvmon_var",13,"off")=48
+	Set gtmtypes("lvmon_var",13,"len")=8
+	Set gtmtypes("lvmon_var",13,"type")="int"
+	Set gtmtypfldindx("lvmon_var","values[0].varlvval.v.m")=13
+	Set gtmtypes("lvmon_var",13,"dim")=2
+	Set gtmtypes("lvmon_var",14,"name")="lvmon_var.values[0].varlvval.v.str"
+	Set gtmtypes("lvmon_var",14,"off")=56
+	Set gtmtypes("lvmon_var",14,"len")=16
+	Set gtmtypes("lvmon_var",14,"type")="mstr"
+	Set gtmtypfldindx("lvmon_var","values[0].varlvval.v.str")=14
+	Set gtmtypes("lvmon_var",15,"name")="lvmon_var.values[0].varlvval.ptrs"
+	Set gtmtypes("lvmon_var",15,"off")=72
+	Set gtmtypes("lvmon_var",15,"len")=16
+	Set gtmtypes("lvmon_var",15,"type")="union"
+	Set gtmtypfldindx("lvmon_var","values[0].varlvval.ptrs")=15
+	Set gtmtypes("lvmon_var",16,"name")="lvmon_var.values[0].varlvval.ptrs.val_ent"
+	Set gtmtypes("lvmon_var",16,"off")=72
+	Set gtmtypes("lvmon_var",16,"len")=16
+	Set gtmtypes("lvmon_var",16,"type")="struct"
+	Set gtmtypfldindx("lvmon_var","values[0].varlvval.ptrs.val_ent")=16
+	Set gtmtypes("lvmon_var",17,"name")="lvmon_var.values[0].varlvval.ptrs.val_ent.children"
+	Set gtmtypes("lvmon_var",17,"off")=72
+	Set gtmtypes("lvmon_var",17,"len")=8
+	Set gtmtypes("lvmon_var",17,"type")="addr"
+	Set gtmtypfldindx("lvmon_var","values[0].varlvval.ptrs.val_ent.children")=17
+	Set gtmtypes("lvmon_var",18,"name")="lvmon_var.values[0].varlvval.ptrs.val_ent.parent"
+	Set gtmtypes("lvmon_var",18,"off")=80
+	Set gtmtypes("lvmon_var",18,"len")=8
+	Set gtmtypes("lvmon_var",18,"type")="union"
+	Set gtmtypfldindx("lvmon_var","values[0].varlvval.ptrs.val_ent.parent")=18
+	Set gtmtypes("lvmon_var",19,"name")="lvmon_var.values[0].varlvval.ptrs.val_ent.parent.sym"
+	Set gtmtypes("lvmon_var",19,"off")=80
+	Set gtmtypes("lvmon_var",19,"len")=8
+	Set gtmtypes("lvmon_var",19,"type")="addr"
+	Set gtmtypfldindx("lvmon_var","values[0].varlvval.ptrs.val_ent.parent.sym")=19
+	Set gtmtypes("lvmon_var",20,"name")="lvmon_var.values[0].varlvval.ptrs.val_ent.parent.sbs_tree"
+	Set gtmtypes("lvmon_var",20,"off")=80
+	Set gtmtypes("lvmon_var",20,"len")=8
+	Set gtmtypes("lvmon_var",20,"type")="addr"
+	Set gtmtypfldindx("lvmon_var","values[0].varlvval.ptrs.val_ent.parent.sbs_tree")=20
+	Set gtmtypes("lvmon_var",21,"name")="lvmon_var.values[0].varlvval.ptrs.free_ent"
+	Set gtmtypes("lvmon_var",21,"off")=72
+	Set gtmtypes("lvmon_var",21,"len")=8
+	Set gtmtypes("lvmon_var",21,"type")="struct"
+	Set gtmtypfldindx("lvmon_var","values[0].varlvval.ptrs.free_ent")=21
+	Set gtmtypes("lvmon_var",22,"name")="lvmon_var.values[0].varlvval.ptrs.free_ent.next_free"
+	Set gtmtypes("lvmon_var",22,"off")=72
+	Set gtmtypes("lvmon_var",22,"len")=8
+	Set gtmtypes("lvmon_var",22,"type")="addr"
+	Set gtmtypfldindx("lvmon_var","values[0].varlvval.ptrs.free_ent.next_free")=22
+	Set gtmtypes("lvmon_var",23,"name")="lvmon_var.values[0].varlvval.ptrs.copy_loc"
+	Set gtmtypes("lvmon_var",23,"off")=72
+	Set gtmtypes("lvmon_var",23,"len")=8
+	Set gtmtypes("lvmon_var",23,"type")="struct"
+	Set gtmtypfldindx("lvmon_var","values[0].varlvval.ptrs.copy_loc")=23
+	Set gtmtypes("lvmon_var",24,"name")="lvmon_var.values[0].varlvval.ptrs.copy_loc.newtablv"
+	Set gtmtypes("lvmon_var",24,"off")=72
+	Set gtmtypes("lvmon_var",24,"len")=8
+	Set gtmtypes("lvmon_var",24,"type")="addr"
+	Set gtmtypfldindx("lvmon_var","values[0].varlvval.ptrs.copy_loc.newtablv")=24
+	Set gtmtypes("lvmon_var",25,"name")="lvmon_var.values[0].varlvval.stats"
+	Set gtmtypes("lvmon_var",25,"off")=88
+	Set gtmtypes("lvmon_var",25,"len")=16
+	Set gtmtypes("lvmon_var",25,"type")="struct"
+	Set gtmtypfldindx("lvmon_var","values[0].varlvval.stats")=25
+	Set gtmtypes("lvmon_var",26,"name")="lvmon_var.values[0].varlvval.stats.trefcnt"
+	Set gtmtypes("lvmon_var",26,"off")=88
+	Set gtmtypes("lvmon_var",26,"len")=4
+	Set gtmtypes("lvmon_var",26,"type")="int"
+	Set gtmtypfldindx("lvmon_var","values[0].varlvval.stats.trefcnt")=26
+	Set gtmtypes("lvmon_var",27,"name")="lvmon_var.values[0].varlvval.stats.crefcnt"
+	Set gtmtypes("lvmon_var",27,"off")=92
+	Set gtmtypes("lvmon_var",27,"len")=4
+	Set gtmtypes("lvmon_var",27,"type")="int"
+	Set gtmtypfldindx("lvmon_var","values[0].varlvval.stats.crefcnt")=27
+	Set gtmtypes("lvmon_var",28,"name")="lvmon_var.values[0].varlvval.stats.tstartcycle"
+	Set gtmtypes("lvmon_var",28,"off")=96
+	Set gtmtypes("lvmon_var",28,"len")=4
+	Set gtmtypes("lvmon_var",28,"type")="unsigned-int"
+	Set gtmtypfldindx("lvmon_var","values[0].varlvval.stats.tstartcycle")=28
+	Set gtmtypes("lvmon_var",29,"name")="lvmon_var.values[0].varlvval.stats.lvtaskcycle"
+	Set gtmtypes("lvmon_var",29,"off")=100
+	Set gtmtypes("lvmon_var",29,"len")=4
+	Set gtmtypes("lvmon_var",29,"type")="unsigned-int"
+	Set gtmtypfldindx("lvmon_var","values[0].varlvval.stats.lvtaskcycle")=29
+	Set gtmtypes("lvmon_var",30,"name")="lvmon_var.values[0].varlvval.has_aliascont"
+	Set gtmtypes("lvmon_var",30,"off")=104
+	Set gtmtypes("lvmon_var",30,"len")=4
+	Set gtmtypes("lvmon_var",30,"type")="boolean_t"
+	Set gtmtypfldindx("lvmon_var","values[0].varlvval.has_aliascont")=30
+	Set gtmtypes("lvmon_var",31,"name")="lvmon_var.values[0].varlvval.lvmon_mark"
+	Set gtmtypes("lvmon_var",31,"off")=108
+	Set gtmtypes("lvmon_var",31,"len")=4
+	Set gtmtypes("lvmon_var",31,"type")="boolean_t"
+	Set gtmtypfldindx("lvmon_var","values[0].varlvval.lvmon_mark")=31
+	Set gtmtypes("lvmon_var",32,"name")="lvmon_var.values[0].varlvval.tp_var"
+	Set gtmtypes("lvmon_var",32,"off")=112
+	Set gtmtypes("lvmon_var",32,"len")=8
+	Set gtmtypes("lvmon_var",32,"type")="addr"
+	Set gtmtypfldindx("lvmon_var","values[0].varlvval.tp_var")=32
+	Set gtmtypes("lvmon_var",33,"name")="lvmon_var.values[0].varvalue"
+	Set gtmtypes("lvmon_var",33,"off")=120
+	Set gtmtypes("lvmon_var",33,"len")=16
+	Set gtmtypes("lvmon_var",33,"type")="mstr"
+	Set gtmtypfldindx("lvmon_var","values[0].varvalue")=33
+	Set gtmtypes("lvmon_var",34,"name")="lvmon_var.values[0].varvalue.char_len"
+	Set gtmtypes("lvmon_var",34,"off")=120
+	Set gtmtypes("lvmon_var",34,"len")=4
+	Set gtmtypes("lvmon_var",34,"type")="unsigned-int"
+	Set gtmtypfldindx("lvmon_var","values[0].varvalue.char_len")=34
+	Set gtmtypes("lvmon_var",35,"name")="lvmon_var.values[0].varvalue.len"
+	Set gtmtypes("lvmon_var",35,"off")=124
+	Set gtmtypes("lvmon_var",35,"len")=4
+	Set gtmtypes("lvmon_var",35,"type")="int"
+	Set gtmtypfldindx("lvmon_var","values[0].varvalue.len")=35
+	Set gtmtypes("lvmon_var",36,"name")="lvmon_var.values[0].varvalue.addr"
+	Set gtmtypes("lvmon_var",36,"off")=128
+	Set gtmtypes("lvmon_var",36,"len")=8
+	Set gtmtypes("lvmon_var",36,"type")="addr"
+	Set gtmtypfldindx("lvmon_var","values[0].varvalue.addr")=36
+	Set gtmtypes("lvmon_var",37,"name")="lvmon_var.values[0].alloclen"
+	Set gtmtypes("lvmon_var",37,"off")=136
+	Set gtmtypes("lvmon_var",37,"len")=4
+	Set gtmtypes("lvmon_var",37,"type")="unsigned-int"
+	Set gtmtypfldindx("lvmon_var","values[0].alloclen")=37
+	Set gtmtypes("lvmon_var",38,"name")="lvmon_var.values[0].filler"
+	Set gtmtypes("lvmon_var",38,"off")=140
+	Set gtmtypes("lvmon_var",38,"len")=4
+	Set gtmtypes("lvmon_var",38,"type")="int"
+	Set gtmtypfldindx("lvmon_var","values[0].filler")=38
+	;
 	Set gtmtypes("lvname_info")="struct"
 	Set gtmtypes("lvname_info",0)=4
 	Set gtmtypes("lvname_info","len")=280
@@ -13449,8 +14288,8 @@ Init
 	Set gtmtypfldindx("mlabel","gbl")=9
 	;
 	Set gtmtypes("mline")="struct"
-	Set gtmtypes("mline",0)=6
-	Set gtmtypes("mline","len")=40
+	Set gtmtypes("mline",0)=7
+	Set gtmtypes("mline","len")=48
 	Set gtmtypes("mline",1,"name")="mline.parent"
 	Set gtmtypes("mline",1,"off")=0
 	Set gtmtypes("mline",1,"len")=8
@@ -13481,6 +14320,11 @@ Init
 	Set gtmtypes("mline",6,"len")=4
 	Set gtmtypes("mline",6,"type")="boolean_t"
 	Set gtmtypfldindx("mline","table")=6
+	Set gtmtypes("mline",7,"name")="mline.block_ok"
+	Set gtmtypes("mline",7,"off")=40
+	Set gtmtypes("mline",7,"len")=4
+	Set gtmtypes("mline",7,"type")="boolean_t"
+	Set gtmtypfldindx("mline","block_ok")=7
 	;
 	Set gtmtypes("mliteral")="struct"
 	Set gtmtypes("mliteral",0)=11
@@ -17115,8 +17959,8 @@ Init
 	Set gtmtypfldindx("nametabent","name")=2
 	;
 	Set gtmtypes("node_local")="struct"
-	Set gtmtypes("node_local",0)=247
-	Set gtmtypes("node_local","len")=121528
+	Set gtmtypes("node_local",0)=248
+	Set gtmtypes("node_local","len")=121536
 	Set gtmtypes("node_local",1,"name")="node_local.label"
 	Set gtmtypes("node_local",1,"off")=0
 	Set gtmtypes("node_local",1,"len")=12
@@ -18243,126 +19087,131 @@ Init
 	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,"name")="node_local.update_underway_tn"
 	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",224,"len")=8
+	Set gtmtypes("node_local",224,"type")="uint64_t"
+	Set gtmtypfldindx("node_local","update_underway_tn")=224
+	Set gtmtypes("node_local",225,"name")="node_local.lastwriterbypas_msg_issued"
+	Set gtmtypes("node_local",225,"off")=121464
 	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 gtmtypfldindx("node_local","lastwriterbypas_msg_issued")=225
+	Set gtmtypes("node_local",226,"name")="node_local.first_writer_seen"
+	Set gtmtypes("node_local",226,"off")=121468
 	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 gtmtypfldindx("node_local","first_writer_seen")=226
+	Set gtmtypes("node_local",227,"name")="node_local.first_nonbypas_writer_seen"
+	Set gtmtypes("node_local",227,"off")=121472
 	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 gtmtypfldindx("node_local","first_nonbypas_writer_seen")=227
+	Set gtmtypes("node_local",228,"name")="node_local.ftok_counter_halted"
+	Set gtmtypes("node_local",228,"off")=121476
 	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 gtmtypfldindx("node_local","ftok_counter_halted")=228
+	Set gtmtypes("node_local",229,"name")="node_local.access_counter_halted"
+	Set gtmtypes("node_local",229,"off")=121480
 	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 gtmtypfldindx("node_local","access_counter_halted")=229
+	Set gtmtypes("node_local",230,"name")="node_local.statsdb_created"
+	Set gtmtypes("node_local",230,"off")=121484
 	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",230,"type")="boolean_t"
+	Set gtmtypfldindx("node_local","statsdb_created")=230
+	Set gtmtypes("node_local",231,"name")="node_local.statsdb_fname_len"
+	Set gtmtypes("node_local",231,"off")=121488
 	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",231,"type")="unsigned-int"
+	Set gtmtypfldindx("node_local","statsdb_fname_len")=231
+	Set gtmtypes("node_local",232,"name")="node_local.statsdb_rundown_clean"
+	Set gtmtypes("node_local",232,"off")=121492
+	Set gtmtypes("node_local",232,"len")=4
+	Set gtmtypes("node_local",232,"type")="boolean_t"
+	Set gtmtypfldindx("node_local","statsdb_rundown_clean")=232
+	Set gtmtypes("node_local",233,"name")="node_local.freeze_latch"
+	Set gtmtypes("node_local",233,"off")=121496
 	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",233,"type")="global_latch_t"
+	Set gtmtypfldindx("node_local","freeze_latch")=233
+	Set gtmtypes("node_local",234,"name")="node_local.freeze_latch.u"
+	Set gtmtypes("node_local",234,"off")=121496
 	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",234,"type")="union"
+	Set gtmtypfldindx("node_local","freeze_latch.u")=234
+	Set gtmtypes("node_local",235,"name")="node_local.freeze_latch.u.pid_imgcnt"
+	Set gtmtypes("node_local",235,"off")=121496
 	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",235,"type")="uint64_t"
+	Set gtmtypfldindx("node_local","freeze_latch.u.pid_imgcnt")=235
+	Set gtmtypes("node_local",236,"name")="node_local.freeze_latch.u.parts"
+	Set gtmtypes("node_local",236,"off")=121496
+	Set gtmtypes("node_local",236,"len")=8
+	Set gtmtypes("node_local",236,"type")="struct"
+	Set gtmtypfldindx("node_local","freeze_latch.u.parts")=236
+	Set gtmtypes("node_local",237,"name")="node_local.freeze_latch.u.parts.latch_pid"
+	Set gtmtypes("node_local",237,"off")=121496
 	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 gtmtypfldindx("node_local","freeze_latch.u.parts.latch_pid")=237
+	Set gtmtypes("node_local",238,"name")="node_local.freeze_latch.u.parts.latch_word"
+	Set gtmtypes("node_local",238,"off")=121500
+	Set gtmtypes("node_local",238,"len")=4
+	Set gtmtypes("node_local",238,"type")="int"
+	Set gtmtypfldindx("node_local","freeze_latch.u.parts.latch_word")=238
+	Set gtmtypes("node_local",239,"name")="node_local.wcs_buffs_freed"
 	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 gtmtypfldindx("node_local","wcs_buffs_freed")=239
+	Set gtmtypes("node_local",240,"name")="node_local.dskspace_next_fire"
 	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",240,"type")="uint64_t"
+	Set gtmtypfldindx("node_local","dskspace_next_fire")=240
+	Set gtmtypes("node_local",241,"name")="node_local.lock_crit"
+	Set gtmtypes("node_local",241,"off")=121520
 	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",241,"type")="global_latch_t"
+	Set gtmtypfldindx("node_local","lock_crit")=241
+	Set gtmtypes("node_local",242,"name")="node_local.lock_crit.u"
+	Set gtmtypes("node_local",242,"off")=121520
 	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",242,"type")="union"
+	Set gtmtypfldindx("node_local","lock_crit.u")=242
+	Set gtmtypes("node_local",243,"name")="node_local.lock_crit.u.pid_imgcnt"
+	Set gtmtypes("node_local",243,"off")=121520
 	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",243,"type")="uint64_t"
+	Set gtmtypfldindx("node_local","lock_crit.u.pid_imgcnt")=243
+	Set gtmtypes("node_local",244,"name")="node_local.lock_crit.u.parts"
+	Set gtmtypes("node_local",244,"off")=121520
+	Set gtmtypes("node_local",244,"len")=8
+	Set gtmtypes("node_local",244,"type")="struct"
+	Set gtmtypfldindx("node_local","lock_crit.u.parts")=244
+	Set gtmtypes("node_local",245,"name")="node_local.lock_crit.u.parts.latch_pid"
+	Set gtmtypes("node_local",245,"off")=121520
 	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 gtmtypfldindx("node_local","lock_crit.u.parts.latch_pid")=245
+	Set gtmtypes("node_local",246,"name")="node_local.lock_crit.u.parts.latch_word"
+	Set gtmtypes("node_local",246,"off")=121524
 	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 gtmtypfldindx("node_local","lock_crit.u.parts.latch_word")=246
+	Set gtmtypes("node_local",247,"name")="node_local.tp_hint"
+	Set gtmtypes("node_local",247,"off")=121528
 	Set gtmtypes("node_local",247,"len")=4
 	Set gtmtypes("node_local",247,"type")="int"
-	Set gtmtypfldindx("node_local","filler_8byte_align6")=247
+	Set gtmtypfldindx("node_local","tp_hint")=247
+	Set gtmtypes("node_local",248,"name")="node_local.filler_8byte_align6"
+	Set gtmtypes("node_local",248,"off")=121532
+	Set gtmtypes("node_local",248,"len")=4
+	Set gtmtypes("node_local",248,"type")="int"
+	Set gtmtypfldindx("node_local","filler_8byte_align6")=248
 	;
 	Set gtmtypes("noisolation_element")="struct"
 	Set gtmtypes("noisolation_element",0)=2
@@ -19294,6 +20143,101 @@ Init
 	Set gtmtypes("parse_blk",17,"type")="addr"
 	Set gtmtypfldindx("parse_blk","l_ext")=17
 	;
+	Set gtmtypes("parse_save_block")="struct"
+	Set gtmtypes("parse_save_block",0)=18
+	Set gtmtypes("parse_save_block","len")=136
+	Set gtmtypes("parse_save_block",1,"name")="parse_save_block.source_error_found"
+	Set gtmtypes("parse_save_block",1,"off")=0
+	Set gtmtypes("parse_save_block",1,"len")=4
+	Set gtmtypes("parse_save_block",1,"type")="boolean_t"
+	Set gtmtypfldindx("parse_save_block","source_error_found")=1
+	Set gtmtypes("parse_save_block",2,"name")="parse_save_block.source_column"
+	Set gtmtypes("parse_save_block",2,"off")=4
+	Set gtmtypes("parse_save_block",2,"len")=4
+	Set gtmtypes("parse_save_block",2,"type")="int"
+	Set gtmtypfldindx("parse_save_block","source_column")=2
+	Set gtmtypes("parse_save_block",3,"name")="parse_save_block.director_ident_len"
+	Set gtmtypes("parse_save_block",3,"off")=8
+	Set gtmtypes("parse_save_block",3,"len")=4
+	Set gtmtypes("parse_save_block",3,"type")="int"
+	Set gtmtypfldindx("parse_save_block","director_ident_len")=3
+	Set gtmtypes("parse_save_block",4,"name")="parse_save_block.block_level"
+	Set gtmtypes("parse_save_block",4,"off")=12
+	Set gtmtypes("parse_save_block",4,"len")=4
+	Set gtmtypes("parse_save_block",4,"type")="int"
+	Set gtmtypfldindx("parse_save_block","block_level")=4
+	Set gtmtypes("parse_save_block",5,"name")="parse_save_block.source_len"
+	Set gtmtypes("parse_save_block",5,"off")=16
+	Set gtmtypes("parse_save_block",5,"len")=4
+	Set gtmtypes("parse_save_block",5,"type")="int"
+	Set gtmtypfldindx("parse_save_block","source_len")=5
+	Set gtmtypes("parse_save_block",6,"name")="parse_save_block.director_mval"
+	Set gtmtypes("parse_save_block",6,"off")=24
+	Set gtmtypes("parse_save_block",6,"len")=32
+	Set gtmtypes("parse_save_block",6,"type")="mval"
+	Set gtmtypfldindx("parse_save_block","director_mval")=6
+	Set gtmtypes("parse_save_block",7,"name")="parse_save_block.director_mval.mvtype"
+	Set gtmtypes("parse_save_block",7,"off")=24
+	Set gtmtypes("parse_save_block",7,"len")=2
+	Set gtmtypes("parse_save_block",7,"type")="unsigned-short"
+	Set gtmtypfldindx("parse_save_block","director_mval.mvtype")=7
+	Set gtmtypes("parse_save_block",8,"name")="parse_save_block.director_mval.fnpc_indx"
+	Set gtmtypes("parse_save_block",8,"off")=27
+	Set gtmtypes("parse_save_block",8,"len")=1
+	Set gtmtypes("parse_save_block",8,"type")="unsigned-char"
+	Set gtmtypfldindx("parse_save_block","director_mval.fnpc_indx")=8
+	Set gtmtypes("parse_save_block",9,"name")="parse_save_block.director_mval.utfcgr_indx"
+	Set gtmtypes("parse_save_block",9,"off")=28
+	Set gtmtypes("parse_save_block",9,"len")=4
+	Set gtmtypes("parse_save_block",9,"type")="unsigned-int"
+	Set gtmtypfldindx("parse_save_block","director_mval.utfcgr_indx")=9
+	Set gtmtypes("parse_save_block",10,"name")="parse_save_block.director_mval.m"
+	Set gtmtypes("parse_save_block",10,"off")=32
+	Set gtmtypes("parse_save_block",10,"len")=8
+	Set gtmtypes("parse_save_block",10,"type")="int"
+	Set gtmtypfldindx("parse_save_block","director_mval.m")=10
+	Set gtmtypes("parse_save_block",10,"dim")=2
+	Set gtmtypes("parse_save_block",11,"name")="parse_save_block.director_mval.str"
+	Set gtmtypes("parse_save_block",11,"off")=40
+	Set gtmtypes("parse_save_block",11,"len")=16
+	Set gtmtypes("parse_save_block",11,"type")="mstr"
+	Set gtmtypfldindx("parse_save_block","director_mval.str")=11
+	Set gtmtypes("parse_save_block",12,"name")="parse_save_block.director_mval.str.char_len"
+	Set gtmtypes("parse_save_block",12,"off")=40
+	Set gtmtypes("parse_save_block",12,"len")=4
+	Set gtmtypes("parse_save_block",12,"type")="unsigned-int"
+	Set gtmtypfldindx("parse_save_block","director_mval.str.char_len")=12
+	Set gtmtypes("parse_save_block",13,"name")="parse_save_block.director_mval.str.len"
+	Set gtmtypes("parse_save_block",13,"off")=44
+	Set gtmtypes("parse_save_block",13,"len")=4
+	Set gtmtypes("parse_save_block",13,"type")="int"
+	Set gtmtypfldindx("parse_save_block","director_mval.str.len")=13
+	Set gtmtypes("parse_save_block",14,"name")="parse_save_block.director_mval.str.addr"
+	Set gtmtypes("parse_save_block",14,"off")=48
+	Set gtmtypes("parse_save_block",14,"len")=8
+	Set gtmtypes("parse_save_block",14,"type")="addr"
+	Set gtmtypfldindx("parse_save_block","director_mval.str.addr")=14
+	Set gtmtypes("parse_save_block",15,"name")="parse_save_block.ident_buffer"
+	Set gtmtypes("parse_save_block",15,"off")=56
+	Set gtmtypes("parse_save_block",15,"len")=63
+	Set gtmtypes("parse_save_block",15,"type")="unsigned-char"
+	Set gtmtypfldindx("parse_save_block","ident_buffer")=15
+	Set gtmtypes("parse_save_block",16,"name")="parse_save_block.director_token"
+	Set gtmtypes("parse_save_block",16,"off")=119
+	Set gtmtypes("parse_save_block",16,"len")=1
+	Set gtmtypes("parse_save_block",16,"type")="char"
+	Set gtmtypfldindx("parse_save_block","director_token")=16
+	Set gtmtypes("parse_save_block",17,"name")="parse_save_block.lexical_ptr"
+	Set gtmtypes("parse_save_block",17,"off")=120
+	Set gtmtypes("parse_save_block",17,"len")=8
+	Set gtmtypes("parse_save_block",17,"type")="addr"
+	Set gtmtypfldindx("parse_save_block","lexical_ptr")=17
+	Set gtmtypes("parse_save_block",18,"name")="parse_save_block.window_token"
+	Set gtmtypes("parse_save_block",18,"off")=128
+	Set gtmtypes("parse_save_block",18,"len")=1
+	Set gtmtypes("parse_save_block",18,"type")="char"
+	Set gtmtypfldindx("parse_save_block","window_token")=18
+	;
 	Set gtmtypes("pat_strlit")="struct"
 	Set gtmtypes("pat_strlit",0)=4
 	Set gtmtypes("pat_strlit","len")=3956
@@ -26260,8 +27204,8 @@ Init
 	Set gtmtypfldindx("sgbg_addrs","cache_state")=1
 	;
 	Set gtmtypes("sgm_info")="struct"
-	Set gtmtypes("sgm_info",0)=39
-	Set gtmtypes("sgm_info","len")=264
+	Set gtmtypes("sgm_info",0)=40
+	Set gtmtypes("sgm_info","len")=272
 	Set gtmtypes("sgm_info",1,"name")="sgm_info.next_sgm_info"
 	Set gtmtypes("sgm_info",1,"off")=0
 	Set gtmtypes("sgm_info",1,"len")=8
@@ -26457,6 +27401,11 @@ Init
 	Set gtmtypes("sgm_info",39,"len")=4
 	Set gtmtypes("sgm_info",39,"type")="unsigned-int"
 	Set gtmtypfldindx("sgm_info","tot_jrec_size")=39
+	Set gtmtypes("sgm_info",40,"name")="sgm_info.jbuf_rsrv_ptr"
+	Set gtmtypes("sgm_info",40,"off")=264
+	Set gtmtypes("sgm_info",40,"len")=8
+	Set gtmtypes("sgm_info",40,"type")="addr"
+	Set gtmtypfldindx("sgm_info","jbuf_rsrv_ptr")=40
 	;
 	Set gtmtypes("sgmm_addrs")="struct"
 	Set gtmtypes("sgmm_addrs",0)=1
@@ -27070,7 +28019,7 @@ Init
 	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 gtmtypes("sgmnt_addrs",120,"type")="int"
 	Set gtmtypfldindx("sgmnt_addrs","do_fullblockwrites")=120
 	Set gtmtypes("sgmnt_addrs",121,"name")="sgmnt_addrs.regnum"
 	Set gtmtypes("sgmnt_addrs",121,"off")=836
@@ -27234,7 +28183,7 @@ Init
 	Set gtmtypfldindx("sgmnt_addrs","statsDB_setup_completed")=152
 	;
 	Set gtmtypes("sgmnt_data")="struct"
-	Set gtmtypes("sgmnt_data",0)=586
+	Set gtmtypes("sgmnt_data",0)=592
 	Set gtmtypes("sgmnt_data","len")=8192
 	Set gtmtypes("sgmnt_data",1,"name")="sgmnt_data.label"
 	Set gtmtypes("sgmnt_data",1,"off")=0
@@ -28117,11 +29066,11 @@ Init
 	Set gtmtypes("sgmnt_data",174,"len")=8
 	Set gtmtypes("sgmnt_data",174,"type")="uint64_t"
 	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,"name")="sgmnt_data.wcb_gds_rundown2_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_bgtrcrec1_tn")=175
+	Set gtmtypfldindx("sgmnt_data","wcb_gds_rundown2_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
@@ -28412,11 +29361,11 @@ Init
 	Set gtmtypes("sgmnt_data",233,"len")=8
 	Set gtmtypes("sgmnt_data",233,"type")="uint64_t"
 	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,"name")="sgmnt_data.wcb_wcs_flu0_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_tp_grab_crit_tn")=234
+	Set gtmtypfldindx("sgmnt_data","wcb_wcs_flu0_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
@@ -28437,11 +29386,11 @@ Init
 	Set gtmtypes("sgmnt_data",238,"len")=8
 	Set gtmtypes("sgmnt_data",238,"type")="uint64_t"
 	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,"name")="sgmnt_data.wcb_gds_rundown1_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_gds_rundown_tn")=239
+	Set gtmtypfldindx("sgmnt_data","wcb_gds_rundown1_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
@@ -28797,1391 +29746,1421 @@ Init
 	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,"name")="sgmnt_data.jnlbuff_phs2cmt_array_full_tn"
 	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","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","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","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",311,"len")=8
+	Set gtmtypes("sgmnt_data",311,"type")="uint64_t"
+	Set gtmtypfldindx("sgmnt_data","jnlbuff_phs2cmt_array_full_tn")=311
+	Set gtmtypes("sgmnt_data",312,"name")="sgmnt_data.jnl_phase2_cleanup_if_possible_tn"
+	Set gtmtypes("sgmnt_data",312,"off")=3208
+	Set gtmtypes("sgmnt_data",312,"len")=8
+	Set gtmtypes("sgmnt_data",312,"type")="uint64_t"
+	Set gtmtypfldindx("sgmnt_data","jnl_phase2_cleanup_if_possible_tn")=312
+	Set gtmtypes("sgmnt_data",313,"name")="sgmnt_data.jnlbuff_phs2cmt_isprcalv_tn"
+	Set gtmtypes("sgmnt_data",313,"off")=3216
+	Set gtmtypes("sgmnt_data",313,"len")=8
+	Set gtmtypes("sgmnt_data",313,"type")="uint64_t"
+	Set gtmtypfldindx("sgmnt_data","jnlbuff_phs2cmt_isprcalv_tn")=313
+	Set gtmtypes("sgmnt_data",314,"name")="sgmnt_data.bg_trc_rec_tn_filler"
+	Set gtmtypes("sgmnt_data",314,"off")=3224
+	Set gtmtypes("sgmnt_data",314,"len")=24
+	Set gtmtypes("sgmnt_data",314,"type")="char"
+	Set gtmtypfldindx("sgmnt_data","bg_trc_rec_tn_filler")=314
+	Set gtmtypes("sgmnt_data",315,"name")="sgmnt_data.total_buffer_flush_cntr"
+	Set gtmtypes("sgmnt_data",315,"off")=3248
 	Set gtmtypes("sgmnt_data",315,"len")=4
 	Set gtmtypes("sgmnt_data",315,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","total_buffer_flush_cntr")=315
+	Set gtmtypes("sgmnt_data",316,"name")="sgmnt_data.bufct_buffer_flush_cntr"
+	Set gtmtypes("sgmnt_data",316,"off")=3252
 	Set gtmtypes("sgmnt_data",316,"len")=4
 	Set gtmtypes("sgmnt_data",316,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","bufct_buffer_flush_cntr")=316
+	Set gtmtypes("sgmnt_data",317,"name")="sgmnt_data.bufct_buffer_flush_loop_cntr"
+	Set gtmtypes("sgmnt_data",317,"off")=3256
 	Set gtmtypes("sgmnt_data",317,"len")=4
 	Set gtmtypes("sgmnt_data",317,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","bufct_buffer_flush_loop_cntr")=317
+	Set gtmtypes("sgmnt_data",318,"name")="sgmnt_data.wrt_calls_cntr"
+	Set gtmtypes("sgmnt_data",318,"off")=3260
 	Set gtmtypes("sgmnt_data",318,"len")=4
 	Set gtmtypes("sgmnt_data",318,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","wrt_calls_cntr")=318
+	Set gtmtypes("sgmnt_data",319,"name")="sgmnt_data.wrt_count_cntr"
+	Set gtmtypes("sgmnt_data",319,"off")=3264
 	Set gtmtypes("sgmnt_data",319,"len")=4
 	Set gtmtypes("sgmnt_data",319,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","wrt_count_cntr")=319
+	Set gtmtypes("sgmnt_data",320,"name")="sgmnt_data.wrt_blocked_cntr"
+	Set gtmtypes("sgmnt_data",320,"off")=3268
 	Set gtmtypes("sgmnt_data",320,"len")=4
 	Set gtmtypes("sgmnt_data",320,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","wrt_blocked_cntr")=320
+	Set gtmtypes("sgmnt_data",321,"name")="sgmnt_data.wrt_busy_cntr"
+	Set gtmtypes("sgmnt_data",321,"off")=3272
 	Set gtmtypes("sgmnt_data",321,"len")=4
 	Set gtmtypes("sgmnt_data",321,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","wrt_busy_cntr")=321
+	Set gtmtypes("sgmnt_data",322,"name")="sgmnt_data.wrt_noblks_wrtn_cntr"
+	Set gtmtypes("sgmnt_data",322,"off")=3276
 	Set gtmtypes("sgmnt_data",322,"len")=4
 	Set gtmtypes("sgmnt_data",322,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","wrt_noblks_wrtn_cntr")=322
+	Set gtmtypes("sgmnt_data",323,"name")="sgmnt_data.wcb_gds_rundown2_cntr"
+	Set gtmtypes("sgmnt_data",323,"off")=3280
 	Set gtmtypes("sgmnt_data",323,"len")=4
 	Set gtmtypes("sgmnt_data",323,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","wcb_gds_rundown2_cntr")=323
+	Set gtmtypes("sgmnt_data",324,"name")="sgmnt_data.reserved_bgtrcrec2_cntr"
+	Set gtmtypes("sgmnt_data",324,"off")=3284
 	Set gtmtypes("sgmnt_data",324,"len")=4
 	Set gtmtypes("sgmnt_data",324,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","reserved_bgtrcrec2_cntr")=324
+	Set gtmtypes("sgmnt_data",325,"name")="sgmnt_data.reserved_bgtrcrec3_cntr"
+	Set gtmtypes("sgmnt_data",325,"off")=3288
 	Set gtmtypes("sgmnt_data",325,"len")=4
 	Set gtmtypes("sgmnt_data",325,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","reserved_bgtrcrec3_cntr")=325
+	Set gtmtypes("sgmnt_data",326,"name")="sgmnt_data.lost_block_recovery_cntr"
+	Set gtmtypes("sgmnt_data",326,"off")=3292
 	Set gtmtypes("sgmnt_data",326,"len")=4
 	Set gtmtypes("sgmnt_data",326,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","lost_block_recovery_cntr")=326
+	Set gtmtypes("sgmnt_data",327,"name")="sgmnt_data.wc_blocked_onln_rlbk_cntr"
+	Set gtmtypes("sgmnt_data",327,"off")=3296
 	Set gtmtypes("sgmnt_data",327,"len")=4
 	Set gtmtypes("sgmnt_data",327,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","wc_blocked_onln_rlbk_cntr")=327
+	Set gtmtypes("sgmnt_data",328,"name")="sgmnt_data.stale_cntr"
+	Set gtmtypes("sgmnt_data",328,"off")=3300
 	Set gtmtypes("sgmnt_data",328,"len")=4
 	Set gtmtypes("sgmnt_data",328,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","stale_cntr")=328
+	Set gtmtypes("sgmnt_data",329,"name")="sgmnt_data.starved_cntr"
+	Set gtmtypes("sgmnt_data",329,"off")=3304
 	Set gtmtypes("sgmnt_data",329,"len")=4
 	Set gtmtypes("sgmnt_data",329,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","starved_cntr")=329
+	Set gtmtypes("sgmnt_data",330,"name")="sgmnt_data.stale_timer_started_cntr"
+	Set gtmtypes("sgmnt_data",330,"off")=3308
 	Set gtmtypes("sgmnt_data",330,"len")=4
 	Set gtmtypes("sgmnt_data",330,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","stale_timer_started_cntr")=330
+	Set gtmtypes("sgmnt_data",331,"name")="sgmnt_data.stale_timer_pop_cntr"
+	Set gtmtypes("sgmnt_data",331,"off")=3312
 	Set gtmtypes("sgmnt_data",331,"len")=4
 	Set gtmtypes("sgmnt_data",331,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","stale_timer_pop_cntr")=331
+	Set gtmtypes("sgmnt_data",332,"name")="sgmnt_data.stale_process_defer_cntr"
+	Set gtmtypes("sgmnt_data",332,"off")=3316
 	Set gtmtypes("sgmnt_data",332,"len")=4
 	Set gtmtypes("sgmnt_data",332,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","stale_process_defer_cntr")=332
+	Set gtmtypes("sgmnt_data",333,"name")="sgmnt_data.stale_defer_processed_cntr"
+	Set gtmtypes("sgmnt_data",333,"off")=3320
 	Set gtmtypes("sgmnt_data",333,"len")=4
 	Set gtmtypes("sgmnt_data",333,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","stale_defer_processed_cntr")=333
+	Set gtmtypes("sgmnt_data",334,"name")="sgmnt_data.spcfc_buffer_flush_cntr"
+	Set gtmtypes("sgmnt_data",334,"off")=3324
 	Set gtmtypes("sgmnt_data",334,"len")=4
 	Set gtmtypes("sgmnt_data",334,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","spcfc_buffer_flush_cntr")=334
+	Set gtmtypes("sgmnt_data",335,"name")="sgmnt_data.spcfc_buffer_flush_loop_cntr"
+	Set gtmtypes("sgmnt_data",335,"off")=3328
 	Set gtmtypes("sgmnt_data",335,"len")=4
 	Set gtmtypes("sgmnt_data",335,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","spcfc_buffer_flush_loop_cntr")=335
+	Set gtmtypes("sgmnt_data",336,"name")="sgmnt_data.spcfc_buffer_flush_retries_cntr"
+	Set gtmtypes("sgmnt_data",336,"off")=3332
 	Set gtmtypes("sgmnt_data",336,"len")=4
 	Set gtmtypes("sgmnt_data",336,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","spcfc_buffer_flush_retries_cntr")=336
+	Set gtmtypes("sgmnt_data",337,"name")="sgmnt_data.spcfc_buffer_flushed_during_lockwait_cntr"
+	Set gtmtypes("sgmnt_data",337,"off")=3336
 	Set gtmtypes("sgmnt_data",337,"len")=4
 	Set gtmtypes("sgmnt_data",337,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","spcfc_buffer_flushed_during_lockwait_cntr")=337
+	Set gtmtypes("sgmnt_data",338,"name")="sgmnt_data.tp_crit_retries_cntr"
+	Set gtmtypes("sgmnt_data",338,"off")=3340
 	Set gtmtypes("sgmnt_data",338,"len")=4
 	Set gtmtypes("sgmnt_data",338,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","tp_crit_retries_cntr")=338
+	Set gtmtypes("sgmnt_data",339,"name")="sgmnt_data.db_csh_getn_flush_dirty_cntr"
+	Set gtmtypes("sgmnt_data",339,"off")=3344
 	Set gtmtypes("sgmnt_data",339,"len")=4
 	Set gtmtypes("sgmnt_data",339,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","db_csh_getn_flush_dirty_cntr")=339
+	Set gtmtypes("sgmnt_data",340,"name")="sgmnt_data.db_csh_getn_rip_wait_cntr"
+	Set gtmtypes("sgmnt_data",340,"off")=3348
 	Set gtmtypes("sgmnt_data",340,"len")=4
 	Set gtmtypes("sgmnt_data",340,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","db_csh_getn_rip_wait_cntr")=340
+	Set gtmtypes("sgmnt_data",341,"name")="sgmnt_data.db_csh_getn_buf_owner_stuck_cntr"
+	Set gtmtypes("sgmnt_data",341,"off")=3352
 	Set gtmtypes("sgmnt_data",341,"len")=4
 	Set gtmtypes("sgmnt_data",341,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","db_csh_getn_buf_owner_stuck_cntr")=341
+	Set gtmtypes("sgmnt_data",342,"name")="sgmnt_data.db_csh_getn_out_of_design_cntr"
+	Set gtmtypes("sgmnt_data",342,"off")=3356
 	Set gtmtypes("sgmnt_data",342,"len")=4
 	Set gtmtypes("sgmnt_data",342,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","db_csh_getn_out_of_design_cntr")=342
+	Set gtmtypes("sgmnt_data",343,"name")="sgmnt_data.t_qread_buf_owner_stuck_cntr"
+	Set gtmtypes("sgmnt_data",343,"off")=3360
 	Set gtmtypes("sgmnt_data",343,"len")=4
 	Set gtmtypes("sgmnt_data",343,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","t_qread_buf_owner_stuck_cntr")=343
+	Set gtmtypes("sgmnt_data",344,"name")="sgmnt_data.t_qread_out_of_design_cntr"
+	Set gtmtypes("sgmnt_data",344,"off")=3364
 	Set gtmtypes("sgmnt_data",344,"len")=4
 	Set gtmtypes("sgmnt_data",344,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","t_qread_out_of_design_cntr")=344
+	Set gtmtypes("sgmnt_data",345,"name")="sgmnt_data.bt_put_flush_dirty_cntr"
+	Set gtmtypes("sgmnt_data",345,"off")=3368
 	Set gtmtypes("sgmnt_data",345,"len")=4
 	Set gtmtypes("sgmnt_data",345,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","bt_put_flush_dirty_cntr")=345
+	Set gtmtypes("sgmnt_data",346,"name")="sgmnt_data.mlock_wakeups_cntr"
+	Set gtmtypes("sgmnt_data",346,"off")=3372
 	Set gtmtypes("sgmnt_data",346,"len")=4
 	Set gtmtypes("sgmnt_data",346,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","mlock_wakeups_cntr")=346
+	Set gtmtypes("sgmnt_data",347,"name")="sgmnt_data.wc_blocked_wcs_recover_invoked_cntr"
+	Set gtmtypes("sgmnt_data",347,"off")=3376
 	Set gtmtypes("sgmnt_data",347,"len")=4
 	Set gtmtypes("sgmnt_data",347,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","wc_blocked_wcs_recover_invoked_cntr")=347
+	Set gtmtypes("sgmnt_data",348,"name")="sgmnt_data.wc_blocked_wcs_verify_passed_cntr"
+	Set gtmtypes("sgmnt_data",348,"off")=3380
 	Set gtmtypes("sgmnt_data",348,"len")=4
 	Set gtmtypes("sgmnt_data",348,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","wc_blocked_wcs_verify_passed_cntr")=348
+	Set gtmtypes("sgmnt_data",349,"name")="sgmnt_data.wc_blocked_t_qread_db_csh_getn_invalid_blk_cntr"
+	Set gtmtypes("sgmnt_data",349,"off")=3384
 	Set gtmtypes("sgmnt_data",349,"len")=4
 	Set gtmtypes("sgmnt_data",349,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","wc_blocked_t_qread_db_csh_getn_invalid_blk_cntr")=349
+	Set gtmtypes("sgmnt_data",350,"name")="sgmnt_data.wc_blocked_t_qread_db_csh_get_invalid_blk_cntr"
+	Set gtmtypes("sgmnt_data",350,"off")=3388
 	Set gtmtypes("sgmnt_data",350,"len")=4
 	Set gtmtypes("sgmnt_data",350,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","wc_blocked_t_qread_db_csh_get_invalid_blk_cntr")=350
+	Set gtmtypes("sgmnt_data",351,"name")="sgmnt_data.wc_blocked_db_csh_getn_loopexceed_cntr"
+	Set gtmtypes("sgmnt_data",351,"off")=3392
 	Set gtmtypes("sgmnt_data",351,"len")=4
 	Set gtmtypes("sgmnt_data",351,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","wc_blocked_db_csh_getn_loopexceed_cntr")=351
+	Set gtmtypes("sgmnt_data",352,"name")="sgmnt_data.wc_blocked_db_csh_getn_wcsstarvewrt_cntr"
+	Set gtmtypes("sgmnt_data",352,"off")=3396
 	Set gtmtypes("sgmnt_data",352,"len")=4
 	Set gtmtypes("sgmnt_data",352,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","wc_blocked_db_csh_getn_wcsstarvewrt_cntr")=352
+	Set gtmtypes("sgmnt_data",353,"name")="sgmnt_data.wc_blocked_db_csh_get_cntr"
+	Set gtmtypes("sgmnt_data",353,"off")=3400
 	Set gtmtypes("sgmnt_data",353,"len")=4
 	Set gtmtypes("sgmnt_data",353,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","wc_blocked_db_csh_get_cntr")=353
+	Set gtmtypes("sgmnt_data",354,"name")="sgmnt_data.wc_blocked_tp_tend_wcsgetspace_cntr"
+	Set gtmtypes("sgmnt_data",354,"off")=3404
 	Set gtmtypes("sgmnt_data",354,"len")=4
 	Set gtmtypes("sgmnt_data",354,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","wc_blocked_tp_tend_wcsgetspace_cntr")=354
+	Set gtmtypes("sgmnt_data",355,"name")="sgmnt_data.wc_blocked_tp_tend_t1_cntr"
+	Set gtmtypes("sgmnt_data",355,"off")=3408
 	Set gtmtypes("sgmnt_data",355,"len")=4
 	Set gtmtypes("sgmnt_data",355,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","wc_blocked_tp_tend_t1_cntr")=355
+	Set gtmtypes("sgmnt_data",356,"name")="sgmnt_data.wc_blocked_tp_tend_bitmap_cntr"
+	Set gtmtypes("sgmnt_data",356,"off")=3412
 	Set gtmtypes("sgmnt_data",356,"len")=4
 	Set gtmtypes("sgmnt_data",356,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","wc_blocked_tp_tend_bitmap_cntr")=356
+	Set gtmtypes("sgmnt_data",357,"name")="sgmnt_data.wc_blocked_tp_tend_jnl_cwset_cntr"
+	Set gtmtypes("sgmnt_data",357,"off")=3416
 	Set gtmtypes("sgmnt_data",357,"len")=4
 	Set gtmtypes("sgmnt_data",357,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","wc_blocked_tp_tend_jnl_cwset_cntr")=357
+	Set gtmtypes("sgmnt_data",358,"name")="sgmnt_data.wc_blocked_tp_tend_jnl_wcsflu_cntr"
+	Set gtmtypes("sgmnt_data",358,"off")=3420
 	Set gtmtypes("sgmnt_data",358,"len")=4
 	Set gtmtypes("sgmnt_data",358,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","wc_blocked_tp_tend_jnl_wcsflu_cntr")=358
+	Set gtmtypes("sgmnt_data",359,"name")="sgmnt_data.wc_blocked_t_end_hist_cntr"
+	Set gtmtypes("sgmnt_data",359,"off")=3424
 	Set gtmtypes("sgmnt_data",359,"len")=4
 	Set gtmtypes("sgmnt_data",359,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","wc_blocked_t_end_hist_cntr")=359
+	Set gtmtypes("sgmnt_data",360,"name")="sgmnt_data.wc_blocked_t_end_hist1_nullbt_cntr"
+	Set gtmtypes("sgmnt_data",360,"off")=3428
 	Set gtmtypes("sgmnt_data",360,"len")=4
 	Set gtmtypes("sgmnt_data",360,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","wc_blocked_t_end_hist1_nullbt_cntr")=360
+	Set gtmtypes("sgmnt_data",361,"name")="sgmnt_data.wc_blocked_t_end_hist1_nonnullbt_cntr"
+	Set gtmtypes("sgmnt_data",361,"off")=3432
 	Set gtmtypes("sgmnt_data",361,"len")=4
 	Set gtmtypes("sgmnt_data",361,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","wc_blocked_t_end_hist1_nonnullbt_cntr")=361
+	Set gtmtypes("sgmnt_data",362,"name")="sgmnt_data.wc_blocked_t_end_bitmap_nullbt_cntr"
+	Set gtmtypes("sgmnt_data",362,"off")=3436
 	Set gtmtypes("sgmnt_data",362,"len")=4
 	Set gtmtypes("sgmnt_data",362,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","wc_blocked_t_end_bitmap_nullbt_cntr")=362
+	Set gtmtypes("sgmnt_data",363,"name")="sgmnt_data.wc_blocked_t_end_bitmap_nonnullbt_cntr"
+	Set gtmtypes("sgmnt_data",363,"off")=3440
 	Set gtmtypes("sgmnt_data",363,"len")=4
 	Set gtmtypes("sgmnt_data",363,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","wc_blocked_t_end_bitmap_nonnullbt_cntr")=363
+	Set gtmtypes("sgmnt_data",364,"name")="sgmnt_data.wc_blocked_t_end_jnl_cwset_cntr"
+	Set gtmtypes("sgmnt_data",364,"off")=3444
 	Set gtmtypes("sgmnt_data",364,"len")=4
 	Set gtmtypes("sgmnt_data",364,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","wc_blocked_t_end_jnl_cwset_cntr")=364
+	Set gtmtypes("sgmnt_data",365,"name")="sgmnt_data.wc_blocked_t_end_jnl_wcsflu_cntr"
+	Set gtmtypes("sgmnt_data",365,"off")=3448
 	Set gtmtypes("sgmnt_data",365,"len")=4
 	Set gtmtypes("sgmnt_data",365,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","wc_blocked_t_end_jnl_wcsflu_cntr")=365
+	Set gtmtypes("sgmnt_data",366,"name")="sgmnt_data.db_csh_get_too_many_loops_cntr"
+	Set gtmtypes("sgmnt_data",366,"off")=3452
 	Set gtmtypes("sgmnt_data",366,"len")=4
 	Set gtmtypes("sgmnt_data",366,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","db_csh_get_too_many_loops_cntr")=366
+	Set gtmtypes("sgmnt_data",367,"name")="sgmnt_data.wc_blocked_tpckh_hist1_nullbt_cntr"
+	Set gtmtypes("sgmnt_data",367,"off")=3456
 	Set gtmtypes("sgmnt_data",367,"len")=4
 	Set gtmtypes("sgmnt_data",367,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","wc_blocked_tpckh_hist1_nullbt_cntr")=367
+	Set gtmtypes("sgmnt_data",368,"name")="sgmnt_data.wc_blocked_tpckh_hist1_nonnullbt_cntr"
+	Set gtmtypes("sgmnt_data",368,"off")=3460
 	Set gtmtypes("sgmnt_data",368,"len")=4
 	Set gtmtypes("sgmnt_data",368,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","wc_blocked_tpckh_hist1_nonnullbt_cntr")=368
+	Set gtmtypes("sgmnt_data",369,"name")="sgmnt_data.jnl_blocked_writer_lost_cntr"
+	Set gtmtypes("sgmnt_data",369,"off")=3464
 	Set gtmtypes("sgmnt_data",369,"len")=4
 	Set gtmtypes("sgmnt_data",369,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","jnl_blocked_writer_lost_cntr")=369
+	Set gtmtypes("sgmnt_data",370,"name")="sgmnt_data.jnl_blocked_writer_stuck_cntr"
+	Set gtmtypes("sgmnt_data",370,"off")=3468
 	Set gtmtypes("sgmnt_data",370,"len")=4
 	Set gtmtypes("sgmnt_data",370,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","jnl_blocked_writer_stuck_cntr")=370
+	Set gtmtypes("sgmnt_data",371,"name")="sgmnt_data.jnl_blocked_writer_blocked_cntr"
+	Set gtmtypes("sgmnt_data",371,"off")=3472
 	Set gtmtypes("sgmnt_data",371,"len")=4
 	Set gtmtypes("sgmnt_data",371,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","jnl_blocked_writer_blocked_cntr")=371
+	Set gtmtypes("sgmnt_data",372,"name")="sgmnt_data.n_jnl_fsyncs_cntr"
+	Set gtmtypes("sgmnt_data",372,"off")=3476
 	Set gtmtypes("sgmnt_data",372,"len")=4
 	Set gtmtypes("sgmnt_data",372,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","n_jnl_fsyncs_cntr")=372
+	Set gtmtypes("sgmnt_data",373,"name")="sgmnt_data.n_jnl_fsync_tries_cntr"
+	Set gtmtypes("sgmnt_data",373,"off")=3480
 	Set gtmtypes("sgmnt_data",373,"len")=4
 	Set gtmtypes("sgmnt_data",373,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","n_jnl_fsync_tries_cntr")=373
+	Set gtmtypes("sgmnt_data",374,"name")="sgmnt_data.n_jnl_fsync_recovers_cntr"
+	Set gtmtypes("sgmnt_data",374,"off")=3484
 	Set gtmtypes("sgmnt_data",374,"len")=4
 	Set gtmtypes("sgmnt_data",374,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","n_jnl_fsync_recovers_cntr")=374
+	Set gtmtypes("sgmnt_data",375,"name")="sgmnt_data.n_db_fsyncs_cntr"
+	Set gtmtypes("sgmnt_data",375,"off")=3488
 	Set gtmtypes("sgmnt_data",375,"len")=4
 	Set gtmtypes("sgmnt_data",375,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","n_db_fsyncs_cntr")=375
+	Set gtmtypes("sgmnt_data",376,"name")="sgmnt_data.n_db_fsyncs_in_crit_cntr"
+	Set gtmtypes("sgmnt_data",376,"off")=3492
 	Set gtmtypes("sgmnt_data",376,"len")=4
 	Set gtmtypes("sgmnt_data",376,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","n_db_fsyncs_in_crit_cntr")=376
+	Set gtmtypes("sgmnt_data",377,"name")="sgmnt_data.n_dbsync_timers_cntr"
+	Set gtmtypes("sgmnt_data",377,"off")=3496
 	Set gtmtypes("sgmnt_data",377,"len")=4
 	Set gtmtypes("sgmnt_data",377,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","n_dbsync_timers_cntr")=377
+	Set gtmtypes("sgmnt_data",378,"name")="sgmnt_data.n_dbsync_writes_cntr"
+	Set gtmtypes("sgmnt_data",378,"off")=3500
 	Set gtmtypes("sgmnt_data",378,"len")=4
 	Set gtmtypes("sgmnt_data",378,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","n_dbsync_writes_cntr")=378
+	Set gtmtypes("sgmnt_data",379,"name")="sgmnt_data.mutex_queue_full_cntr"
+	Set gtmtypes("sgmnt_data",379,"off")=3504
 	Set gtmtypes("sgmnt_data",379,"len")=4
 	Set gtmtypes("sgmnt_data",379,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","mutex_queue_full_cntr")=379
+	Set gtmtypes("sgmnt_data",380,"name")="sgmnt_data.wcb_bt_put_cntr"
+	Set gtmtypes("sgmnt_data",380,"off")=3508
 	Set gtmtypes("sgmnt_data",380,"len")=4
 	Set gtmtypes("sgmnt_data",380,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","wcb_bt_put_cntr")=380
+	Set gtmtypes("sgmnt_data",381,"name")="sgmnt_data.wcb_mutex_salvage_cntr"
+	Set gtmtypes("sgmnt_data",381,"off")=3512
 	Set gtmtypes("sgmnt_data",381,"len")=4
 	Set gtmtypes("sgmnt_data",381,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","wcb_mutex_salvage_cntr")=381
+	Set gtmtypes("sgmnt_data",382,"name")="sgmnt_data.wcb_wcs_flu0_cntr"
+	Set gtmtypes("sgmnt_data",382,"off")=3516
 	Set gtmtypes("sgmnt_data",382,"len")=4
 	Set gtmtypes("sgmnt_data",382,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","wcb_wcs_flu0_cntr")=382
+	Set gtmtypes("sgmnt_data",383,"name")="sgmnt_data.wcb_t_end_sysops_nocr_invcr_cntr"
+	Set gtmtypes("sgmnt_data",383,"off")=3520
 	Set gtmtypes("sgmnt_data",383,"len")=4
 	Set gtmtypes("sgmnt_data",383,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","wcb_t_end_sysops_nocr_invcr_cntr")=383
+	Set gtmtypes("sgmnt_data",384,"name")="sgmnt_data.wcb_t_end_sysops_cr_invcr_cntr"
+	Set gtmtypes("sgmnt_data",384,"off")=3524
 	Set gtmtypes("sgmnt_data",384,"len")=4
 	Set gtmtypes("sgmnt_data",384,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","wcb_t_end_sysops_cr_invcr_cntr")=384
+	Set gtmtypes("sgmnt_data",385,"name")="sgmnt_data.wcb_t_end_sysops_rip_wait_cntr"
+	Set gtmtypes("sgmnt_data",385,"off")=3528
 	Set gtmtypes("sgmnt_data",385,"len")=4
 	Set gtmtypes("sgmnt_data",385,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","wcb_t_end_sysops_rip_wait_cntr")=385
+	Set gtmtypes("sgmnt_data",386,"name")="sgmnt_data.wcb_t_end_sysops_dirtyripwait_cntr"
+	Set gtmtypes("sgmnt_data",386,"off")=3532
 	Set gtmtypes("sgmnt_data",386,"len")=4
 	Set gtmtypes("sgmnt_data",386,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","wcb_t_end_sysops_dirtyripwait_cntr")=386
+	Set gtmtypes("sgmnt_data",387,"name")="sgmnt_data.wcb_gds_rundown1_cntr"
+	Set gtmtypes("sgmnt_data",387,"off")=3536
 	Set gtmtypes("sgmnt_data",387,"len")=4
 	Set gtmtypes("sgmnt_data",387,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","wcb_gds_rundown1_cntr")=387
+	Set gtmtypes("sgmnt_data",388,"name")="sgmnt_data.wcb_wcs_flu1_cntr"
+	Set gtmtypes("sgmnt_data",388,"off")=3540
 	Set gtmtypes("sgmnt_data",388,"len")=4
 	Set gtmtypes("sgmnt_data",388,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","wcb_wcs_flu1_cntr")=388
+	Set gtmtypes("sgmnt_data",389,"name")="sgmnt_data.wcb_mu_back_cntr"
+	Set gtmtypes("sgmnt_data",389,"off")=3544
 	Set gtmtypes("sgmnt_data",389,"len")=4
 	Set gtmtypes("sgmnt_data",389,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","wcb_mu_back_cntr")=389
+	Set gtmtypes("sgmnt_data",390,"name")="sgmnt_data.wcb_t_end_sysops_dirty_invcr_cntr"
+	Set gtmtypes("sgmnt_data",390,"off")=3548
 	Set gtmtypes("sgmnt_data",390,"len")=4
 	Set gtmtypes("sgmnt_data",390,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","wcb_t_end_sysops_dirty_invcr_cntr")=390
+	Set gtmtypes("sgmnt_data",391,"name")="sgmnt_data.wcb_t_end_sysops_wtfini_fail_cntr"
+	Set gtmtypes("sgmnt_data",391,"off")=3552
 	Set gtmtypes("sgmnt_data",391,"len")=4
 	Set gtmtypes("sgmnt_data",391,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","wcb_t_end_sysops_wtfini_fail_cntr")=391
+	Set gtmtypes("sgmnt_data",392,"name")="sgmnt_data.wcb_t_end_sysops_twin_stuck_cntr"
+	Set gtmtypes("sgmnt_data",392,"off")=3556
 	Set gtmtypes("sgmnt_data",392,"len")=4
 	Set gtmtypes("sgmnt_data",392,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","wcb_t_end_sysops_twin_stuck_cntr")=392
+	Set gtmtypes("sgmnt_data",393,"name")="sgmnt_data.db_csh_getn_wrt_latch_stuck_cntr"
+	Set gtmtypes("sgmnt_data",393,"off")=3560
 	Set gtmtypes("sgmnt_data",393,"len")=4
 	Set gtmtypes("sgmnt_data",393,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","db_csh_getn_wrt_latch_stuck_cntr")=393
+	Set gtmtypes("sgmnt_data",394,"name")="sgmnt_data.wcb_secshr_db_clnup_now_crit_cntr"
+	Set gtmtypes("sgmnt_data",394,"off")=3564
 	Set gtmtypes("sgmnt_data",394,"len")=4
 	Set gtmtypes("sgmnt_data",394,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","wcb_secshr_db_clnup_now_crit_cntr")=394
+	Set gtmtypes("sgmnt_data",395,"name")="sgmnt_data.wc_blocked_t_qread_bad_bt_index1_cntr"
+	Set gtmtypes("sgmnt_data",395,"off")=3568
 	Set gtmtypes("sgmnt_data",395,"len")=4
 	Set gtmtypes("sgmnt_data",395,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","wc_blocked_t_qread_bad_bt_index1_cntr")=395
+	Set gtmtypes("sgmnt_data",396,"name")="sgmnt_data.wc_blocked_t_qread_bad_bt_index2_cntr"
+	Set gtmtypes("sgmnt_data",396,"off")=3572
 	Set gtmtypes("sgmnt_data",396,"len")=4
 	Set gtmtypes("sgmnt_data",396,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","wc_blocked_t_qread_bad_bt_index2_cntr")=396
+	Set gtmtypes("sgmnt_data",397,"name")="sgmnt_data.wc_blocked_t_end_crbtmismatch1_cntr"
+	Set gtmtypes("sgmnt_data",397,"off")=3576
 	Set gtmtypes("sgmnt_data",397,"len")=4
 	Set gtmtypes("sgmnt_data",397,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","wc_blocked_t_end_crbtmismatch1_cntr")=397
+	Set gtmtypes("sgmnt_data",398,"name")="sgmnt_data.wc_blocked_t_end_crbtmismatch2_cntr"
+	Set gtmtypes("sgmnt_data",398,"off")=3580
 	Set gtmtypes("sgmnt_data",398,"len")=4
 	Set gtmtypes("sgmnt_data",398,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","wc_blocked_t_end_crbtmismatch2_cntr")=398
+	Set gtmtypes("sgmnt_data",399,"name")="sgmnt_data.wc_blocked_t_end_crbtmismatch3_cntr"
+	Set gtmtypes("sgmnt_data",399,"off")=3584
 	Set gtmtypes("sgmnt_data",399,"len")=4
 	Set gtmtypes("sgmnt_data",399,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","wc_blocked_t_end_crbtmismatch3_cntr")=399
+	Set gtmtypes("sgmnt_data",400,"name")="sgmnt_data.wc_blocked_tp_tend_crbtmismatch1_cntr"
+	Set gtmtypes("sgmnt_data",400,"off")=3588
 	Set gtmtypes("sgmnt_data",400,"len")=4
 	Set gtmtypes("sgmnt_data",400,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","wc_blocked_tp_tend_crbtmismatch1_cntr")=400
+	Set gtmtypes("sgmnt_data",401,"name")="sgmnt_data.wc_blocked_tp_tend_crbtmismatch2_cntr"
+	Set gtmtypes("sgmnt_data",401,"off")=3592
 	Set gtmtypes("sgmnt_data",401,"len")=4
 	Set gtmtypes("sgmnt_data",401,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","wc_blocked_tp_tend_crbtmismatch2_cntr")=401
+	Set gtmtypes("sgmnt_data",402,"name")="sgmnt_data.wc_blocked_tp_tend_crbtmismatch3_cntr"
+	Set gtmtypes("sgmnt_data",402,"off")=3596
 	Set gtmtypes("sgmnt_data",402,"len")=4
 	Set gtmtypes("sgmnt_data",402,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","wc_blocked_tp_tend_crbtmismatch3_cntr")=402
+	Set gtmtypes("sgmnt_data",403,"name")="sgmnt_data.wc_blocked_wcs_wtstart_bad_cr_cntr"
+	Set gtmtypes("sgmnt_data",403,"off")=3600
 	Set gtmtypes("sgmnt_data",403,"len")=4
 	Set gtmtypes("sgmnt_data",403,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","wc_blocked_wcs_wtstart_bad_cr_cntr")=403
+	Set gtmtypes("sgmnt_data",404,"name")="sgmnt_data.wc_blocked_wcs_wtfini_bad_cr_cntr"
+	Set gtmtypes("sgmnt_data",404,"off")=3604
 	Set gtmtypes("sgmnt_data",404,"len")=4
 	Set gtmtypes("sgmnt_data",404,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","wc_blocked_wcs_wtfini_bad_cr_cntr")=404
+	Set gtmtypes("sgmnt_data",405,"name")="sgmnt_data.wc_blocked_bt_get_cntr"
+	Set gtmtypes("sgmnt_data",405,"off")=3608
 	Set gtmtypes("sgmnt_data",405,"len")=4
 	Set gtmtypes("sgmnt_data",405,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","wc_blocked_bt_get_cntr")=405
+	Set gtmtypes("sgmnt_data",406,"name")="sgmnt_data.wc_blocked_wcs_cdb_sc_final_retry_cntr"
+	Set gtmtypes("sgmnt_data",406,"off")=3612
 	Set gtmtypes("sgmnt_data",406,"len")=4
 	Set gtmtypes("sgmnt_data",406,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","wc_blocked_wcs_cdb_sc_final_retry_cntr")=406
+	Set gtmtypes("sgmnt_data",407,"name")="sgmnt_data.wcb_bg_update_lckfail1_cntr"
+	Set gtmtypes("sgmnt_data",407,"off")=3616
 	Set gtmtypes("sgmnt_data",407,"len")=4
 	Set gtmtypes("sgmnt_data",407,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","wcb_bg_update_lckfail1_cntr")=407
+	Set gtmtypes("sgmnt_data",408,"name")="sgmnt_data.wcb_bg_update_lckfail2_cntr"
+	Set gtmtypes("sgmnt_data",408,"off")=3620
 	Set gtmtypes("sgmnt_data",408,"len")=4
 	Set gtmtypes("sgmnt_data",408,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","wcb_bg_update_lckfail2_cntr")=408
+	Set gtmtypes("sgmnt_data",409,"name")="sgmnt_data.wcb_wtstart_lckfail1_cntr"
+	Set gtmtypes("sgmnt_data",409,"off")=3624
 	Set gtmtypes("sgmnt_data",409,"len")=4
 	Set gtmtypes("sgmnt_data",409,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","wcb_wtstart_lckfail1_cntr")=409
+	Set gtmtypes("sgmnt_data",410,"name")="sgmnt_data.wcb_wtstart_lckfail2_cntr"
+	Set gtmtypes("sgmnt_data",410,"off")=3628
 	Set gtmtypes("sgmnt_data",410,"len")=4
 	Set gtmtypes("sgmnt_data",410,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","wcb_wtstart_lckfail2_cntr")=410
+	Set gtmtypes("sgmnt_data",411,"name")="sgmnt_data.wcb_wtstart_lckfail3_cntr"
+	Set gtmtypes("sgmnt_data",411,"off")=3632
 	Set gtmtypes("sgmnt_data",411,"len")=4
 	Set gtmtypes("sgmnt_data",411,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","wcb_wtstart_lckfail3_cntr")=411
+	Set gtmtypes("sgmnt_data",412,"name")="sgmnt_data.wcb_wtstart_lckfail4_cntr"
+	Set gtmtypes("sgmnt_data",412,"off")=3636
 	Set gtmtypes("sgmnt_data",412,"len")=4
 	Set gtmtypes("sgmnt_data",412,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","wcb_wtstart_lckfail4_cntr")=412
+	Set gtmtypes("sgmnt_data",413,"name")="sgmnt_data.wcb_wtfini_lckfail1_cntr"
+	Set gtmtypes("sgmnt_data",413,"off")=3640
 	Set gtmtypes("sgmnt_data",413,"len")=4
 	Set gtmtypes("sgmnt_data",413,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","wcb_wtfini_lckfail1_cntr")=413
+	Set gtmtypes("sgmnt_data",414,"name")="sgmnt_data.wcb_wtfini_lckfail2_cntr"
+	Set gtmtypes("sgmnt_data",414,"off")=3644
 	Set gtmtypes("sgmnt_data",414,"len")=4
 	Set gtmtypes("sgmnt_data",414,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","wcb_wtfini_lckfail2_cntr")=414
+	Set gtmtypes("sgmnt_data",415,"name")="sgmnt_data.wcb_wtfini_lckfail3_cntr"
+	Set gtmtypes("sgmnt_data",415,"off")=3648
 	Set gtmtypes("sgmnt_data",415,"len")=4
 	Set gtmtypes("sgmnt_data",415,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","wcb_wtfini_lckfail3_cntr")=415
+	Set gtmtypes("sgmnt_data",416,"name")="sgmnt_data.wcb_wtfini_lckfail4_cntr"
+	Set gtmtypes("sgmnt_data",416,"off")=3652
 	Set gtmtypes("sgmnt_data",416,"len")=4
 	Set gtmtypes("sgmnt_data",416,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","wcb_wtfini_lckfail4_cntr")=416
+	Set gtmtypes("sgmnt_data",417,"name")="sgmnt_data.wcb_t_end_sysops_dirtystuck1_cntr"
+	Set gtmtypes("sgmnt_data",417,"off")=3656
 	Set gtmtypes("sgmnt_data",417,"len")=4
 	Set gtmtypes("sgmnt_data",417,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","wcb_t_end_sysops_dirtystuck1_cntr")=417
+	Set gtmtypes("sgmnt_data",418,"name")="sgmnt_data.wcb_t_end_sysops_dirtystuck2_cntr"
+	Set gtmtypes("sgmnt_data",418,"off")=3660
 	Set gtmtypes("sgmnt_data",418,"len")=4
 	Set gtmtypes("sgmnt_data",418,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","wcb_t_end_sysops_dirtystuck2_cntr")=418
+	Set gtmtypes("sgmnt_data",419,"name")="sgmnt_data.wcb_secshr_db_clnup_wbuf_dqd_cntr"
+	Set gtmtypes("sgmnt_data",419,"off")=3664
 	Set gtmtypes("sgmnt_data",419,"len")=4
 	Set gtmtypes("sgmnt_data",419,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","wcb_secshr_db_clnup_wbuf_dqd_cntr")=419
+	Set gtmtypes("sgmnt_data",420,"name")="sgmnt_data.dwngrd_refmts_syncio_cntr"
+	Set gtmtypes("sgmnt_data",420,"off")=3668
 	Set gtmtypes("sgmnt_data",420,"len")=4
 	Set gtmtypes("sgmnt_data",420,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","dwngrd_refmts_syncio_cntr")=420
+	Set gtmtypes("sgmnt_data",421,"name")="sgmnt_data.dwngrd_refmts_asyncio_cntr"
+	Set gtmtypes("sgmnt_data",421,"off")=3672
 	Set gtmtypes("sgmnt_data",421,"len")=4
 	Set gtmtypes("sgmnt_data",421,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","dwngrd_refmts_asyncio_cntr")=421
+	Set gtmtypes("sgmnt_data",422,"name")="sgmnt_data.shmpool_refmt_harvests_cntr"
+	Set gtmtypes("sgmnt_data",422,"off")=3676
 	Set gtmtypes("sgmnt_data",422,"len")=4
 	Set gtmtypes("sgmnt_data",422,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","shmpool_refmt_harvests_cntr")=422
+	Set gtmtypes("sgmnt_data",423,"name")="sgmnt_data.shmpool_recovery_cntr"
+	Set gtmtypes("sgmnt_data",423,"off")=3680
 	Set gtmtypes("sgmnt_data",423,"len")=4
 	Set gtmtypes("sgmnt_data",423,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","shmpool_recovery_cntr")=423
+	Set gtmtypes("sgmnt_data",424,"name")="sgmnt_data.shmpool_blkd_by_sdc_cntr"
+	Set gtmtypes("sgmnt_data",424,"off")=3684
 	Set gtmtypes("sgmnt_data",424,"len")=4
 	Set gtmtypes("sgmnt_data",424,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","shmpool_blkd_by_sdc_cntr")=424
+	Set gtmtypes("sgmnt_data",425,"name")="sgmnt_data.shmpool_alloc_bbflush_cntr"
+	Set gtmtypes("sgmnt_data",425,"off")=3688
 	Set gtmtypes("sgmnt_data",425,"len")=4
 	Set gtmtypes("sgmnt_data",425,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","shmpool_alloc_bbflush_cntr")=425
+	Set gtmtypes("sgmnt_data",426,"name")="sgmnt_data.refmt_hvst_blk_released_replaced_cntr"
+	Set gtmtypes("sgmnt_data",426,"off")=3692
 	Set gtmtypes("sgmnt_data",426,"len")=4
 	Set gtmtypes("sgmnt_data",426,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","refmt_hvst_blk_released_replaced_cntr")=426
+	Set gtmtypes("sgmnt_data",427,"name")="sgmnt_data.refmt_hvst_blk_released_io_complete_cntr"
+	Set gtmtypes("sgmnt_data",427,"off")=3696
 	Set gtmtypes("sgmnt_data",427,"len")=4
 	Set gtmtypes("sgmnt_data",427,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","refmt_hvst_blk_released_io_complete_cntr")=427
+	Set gtmtypes("sgmnt_data",428,"name")="sgmnt_data.refmt_hvst_blk_kept_cntr"
+	Set gtmtypes("sgmnt_data",428,"off")=3700
 	Set gtmtypes("sgmnt_data",428,"len")=4
 	Set gtmtypes("sgmnt_data",428,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","refmt_hvst_blk_kept_cntr")=428
+	Set gtmtypes("sgmnt_data",429,"name")="sgmnt_data.refmt_hvst_blk_ignored_cntr"
+	Set gtmtypes("sgmnt_data",429,"off")=3704
 	Set gtmtypes("sgmnt_data",429,"len")=4
 	Set gtmtypes("sgmnt_data",429,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","refmt_hvst_blk_ignored_cntr")=429
+	Set gtmtypes("sgmnt_data",430,"name")="sgmnt_data.refmt_blk_chk_blk_freed_cntr"
+	Set gtmtypes("sgmnt_data",430,"off")=3708
 	Set gtmtypes("sgmnt_data",430,"len")=4
 	Set gtmtypes("sgmnt_data",430,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","refmt_blk_chk_blk_freed_cntr")=430
+	Set gtmtypes("sgmnt_data",431,"name")="sgmnt_data.refmt_blk_chk_blk_kept_cntr"
+	Set gtmtypes("sgmnt_data",431,"off")=3712
 	Set gtmtypes("sgmnt_data",431,"len")=4
 	Set gtmtypes("sgmnt_data",431,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","refmt_blk_chk_blk_kept_cntr")=431
+	Set gtmtypes("sgmnt_data",432,"name")="sgmnt_data.active_lvl_trigger_cntr"
+	Set gtmtypes("sgmnt_data",432,"off")=3716
 	Set gtmtypes("sgmnt_data",432,"len")=4
 	Set gtmtypes("sgmnt_data",432,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","active_lvl_trigger_cntr")=432
+	Set gtmtypes("sgmnt_data",433,"name")="sgmnt_data.new_buff_cntr"
+	Set gtmtypes("sgmnt_data",433,"off")=3720
 	Set gtmtypes("sgmnt_data",433,"len")=4
 	Set gtmtypes("sgmnt_data",433,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","new_buff_cntr")=433
+	Set gtmtypes("sgmnt_data",434,"name")="sgmnt_data.phase2_commit_wait_sleep_in_crit_cntr"
+	Set gtmtypes("sgmnt_data",434,"off")=3724
 	Set gtmtypes("sgmnt_data",434,"len")=4
 	Set gtmtypes("sgmnt_data",434,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","phase2_commit_wait_sleep_in_crit_cntr")=434
+	Set gtmtypes("sgmnt_data",435,"name")="sgmnt_data.phase2_commit_wait_sleep_no_crit_cntr"
+	Set gtmtypes("sgmnt_data",435,"off")=3728
 	Set gtmtypes("sgmnt_data",435,"len")=4
 	Set gtmtypes("sgmnt_data",435,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","phase2_commit_wait_sleep_no_crit_cntr")=435
+	Set gtmtypes("sgmnt_data",436,"name")="sgmnt_data.phase2_commit_wait_pidcnt_cntr"
+	Set gtmtypes("sgmnt_data",436,"off")=3732
 	Set gtmtypes("sgmnt_data",436,"len")=4
 	Set gtmtypes("sgmnt_data",436,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","phase2_commit_wait_pidcnt_cntr")=436
+	Set gtmtypes("sgmnt_data",437,"name")="sgmnt_data.wcb_t_end_sysops_intend_wait_cntr"
+	Set gtmtypes("sgmnt_data",437,"off")=3736
 	Set gtmtypes("sgmnt_data",437,"len")=4
 	Set gtmtypes("sgmnt_data",437,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","wcb_t_end_sysops_intend_wait_cntr")=437
+	Set gtmtypes("sgmnt_data",438,"name")="sgmnt_data.wcb_secshr_db_clnup_phase2_clnup_cntr"
+	Set gtmtypes("sgmnt_data",438,"off")=3740
 	Set gtmtypes("sgmnt_data",438,"len")=4
 	Set gtmtypes("sgmnt_data",438,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","wcb_secshr_db_clnup_phase2_clnup_cntr")=438
+	Set gtmtypes("sgmnt_data",439,"name")="sgmnt_data.wcb_phase2_commit_wait_cntr"
+	Set gtmtypes("sgmnt_data",439,"off")=3744
 	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 gtmtypfldindx("sgmnt_data","wcb_phase2_commit_wait_cntr")=439
+	Set gtmtypes("sgmnt_data",440,"name")="sgmnt_data.recompute_upd_array_calls_cntr"
+	Set gtmtypes("sgmnt_data",440,"off")=3748
 	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 gtmtypfldindx("sgmnt_data","recompute_upd_array_calls_cntr")=440
+	Set gtmtypes("sgmnt_data",441,"name")="sgmnt_data.recompute_upd_array_rip_cntr"
+	Set gtmtypes("sgmnt_data",441,"off")=3752
 	Set gtmtypes("sgmnt_data",441,"len")=4
 	Set gtmtypes("sgmnt_data",441,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","recompute_upd_array_rip_cntr")=441
+	Set gtmtypes("sgmnt_data",442,"name")="sgmnt_data.recompute_upd_array_in_tend_cntr"
+	Set gtmtypes("sgmnt_data",442,"off")=3756
 	Set gtmtypes("sgmnt_data",442,"len")=4
 	Set gtmtypes("sgmnt_data",442,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","recompute_upd_array_in_tend_cntr")=442
+	Set gtmtypes("sgmnt_data",443,"name")="sgmnt_data.recompute_upd_array_search_blk_cntr"
+	Set gtmtypes("sgmnt_data",443,"off")=3760
 	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 gtmtypfldindx("sgmnt_data","recompute_upd_array_search_blk_cntr")=443
+	Set gtmtypes("sgmnt_data",444,"name")="sgmnt_data.recompute_upd_array_new_rec_cntr"
+	Set gtmtypes("sgmnt_data",444,"off")=3764
 	Set gtmtypes("sgmnt_data",444,"len")=4
 	Set gtmtypes("sgmnt_data",444,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","recompute_upd_array_new_rec_cntr")=444
+	Set gtmtypes("sgmnt_data",445,"name")="sgmnt_data.recompute_upd_array_rec_size_cntr"
+	Set gtmtypes("sgmnt_data",445,"off")=3768
 	Set gtmtypes("sgmnt_data",445,"len")=4
 	Set gtmtypes("sgmnt_data",445,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","recompute_upd_array_rec_size_cntr")=445
+	Set gtmtypes("sgmnt_data",446,"name")="sgmnt_data.recompute_upd_array_rec_cmpc_cntr"
+	Set gtmtypes("sgmnt_data",446,"off")=3772
 	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 gtmtypfldindx("sgmnt_data","recompute_upd_array_rec_cmpc_cntr")=446
+	Set gtmtypes("sgmnt_data",447,"name")="sgmnt_data.recompute_upd_array_blk_fini_cntr"
+	Set gtmtypes("sgmnt_data",447,"off")=3776
 	Set gtmtypes("sgmnt_data",447,"len")=4
 	Set gtmtypes("sgmnt_data",447,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","recompute_upd_array_blk_fini_cntr")=447
+	Set gtmtypes("sgmnt_data",448,"name")="sgmnt_data.recompute_upd_array_blk_split_cntr"
+	Set gtmtypes("sgmnt_data",448,"off")=3780
 	Set gtmtypes("sgmnt_data",448,"len")=4
 	Set gtmtypes("sgmnt_data",448,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","recompute_upd_array_blk_split_cntr")=448
+	Set gtmtypes("sgmnt_data",449,"name")="sgmnt_data.t_qread_ripsleep_cnt_cntr"
+	Set gtmtypes("sgmnt_data",449,"off")=3784
 	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 gtmtypfldindx("sgmnt_data","t_qread_ripsleep_cnt_cntr")=449
+	Set gtmtypes("sgmnt_data",450,"name")="sgmnt_data.t_qread_ripsleep_nblks_cntr"
+	Set gtmtypes("sgmnt_data",450,"off")=3788
 	Set gtmtypes("sgmnt_data",450,"len")=4
 	Set gtmtypes("sgmnt_data",450,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","t_qread_ripsleep_nblks_cntr")=450
+	Set gtmtypes("sgmnt_data",451,"name")="sgmnt_data.wcs_wtfini_invoked_cntr"
+	Set gtmtypes("sgmnt_data",451,"off")=3792
 	Set gtmtypes("sgmnt_data",451,"len")=4
 	Set gtmtypes("sgmnt_data",451,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","wcs_wtfini_invoked_cntr")=451
+	Set gtmtypes("sgmnt_data",452,"name")="sgmnt_data.wcs_wterror_invoked_cntr"
+	Set gtmtypes("sgmnt_data",452,"off")=3796
 	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 gtmtypfldindx("sgmnt_data","wcs_wterror_invoked_cntr")=452
+	Set gtmtypes("sgmnt_data",453,"name")="sgmnt_data.wcs_wt_restart_invoked_cntr"
+	Set gtmtypes("sgmnt_data",453,"off")=3800
 	Set gtmtypes("sgmnt_data",453,"len")=4
 	Set gtmtypes("sgmnt_data",453,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","wcs_wt_restart_invoked_cntr")=453
+	Set gtmtypes("sgmnt_data",454,"name")="sgmnt_data.wcs_wt_restart_eagain_cntr"
+	Set gtmtypes("sgmnt_data",454,"off")=3804
 	Set gtmtypes("sgmnt_data",454,"len")=4
 	Set gtmtypes("sgmnt_data",454,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","wcs_wt_restart_eagain_cntr")=454
+	Set gtmtypes("sgmnt_data",455,"name")="sgmnt_data.wcs_wt_restart_reinsert_cntr"
+	Set gtmtypes("sgmnt_data",455,"off")=3808
 	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 gtmtypfldindx("sgmnt_data","wcs_wt_restart_reinsert_cntr")=455
+	Set gtmtypes("sgmnt_data",456,"name")="sgmnt_data.wcs_wtstart_eagain_cntr"
+	Set gtmtypes("sgmnt_data",456,"off")=3812
+	Set gtmtypes("sgmnt_data",456,"len")=4
+	Set gtmtypes("sgmnt_data",456,"type")="int"
+	Set gtmtypfldindx("sgmnt_data","wcs_wtstart_eagain_cntr")=456
+	Set gtmtypes("sgmnt_data",457,"name")="sgmnt_data.wcs_wtstart_eagain_incrit_cntr"
+	Set gtmtypes("sgmnt_data",457,"off")=3816
+	Set gtmtypes("sgmnt_data",457,"len")=4
+	Set gtmtypes("sgmnt_data",457,"type")="int"
+	Set gtmtypfldindx("sgmnt_data","wcs_wtstart_eagain_incrit_cntr")=457
+	Set gtmtypes("sgmnt_data",458,"name")="sgmnt_data.async_restart_eagain_cntr"
+	Set gtmtypes("sgmnt_data",458,"off")=3820
 	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 gtmtypfldindx("sgmnt_data","async_restart_eagain_cntr")=458
+	Set gtmtypes("sgmnt_data",459,"name")="sgmnt_data.jnlbuff_phs2cmt_array_full_cntr"
+	Set gtmtypes("sgmnt_data",459,"off")=3824
 	Set gtmtypes("sgmnt_data",459,"len")=4
 	Set gtmtypes("sgmnt_data",459,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","jnlbuff_phs2cmt_array_full_cntr")=459
+	Set gtmtypes("sgmnt_data",460,"name")="sgmnt_data.jnl_phase2_cleanup_if_possible_cntr"
+	Set gtmtypes("sgmnt_data",460,"off")=3828
+	Set gtmtypes("sgmnt_data",460,"len")=4
+	Set gtmtypes("sgmnt_data",460,"type")="int"
+	Set gtmtypfldindx("sgmnt_data","jnl_phase2_cleanup_if_possible_cntr")=460
+	Set gtmtypes("sgmnt_data",461,"name")="sgmnt_data.jnlbuff_phs2cmt_isprcalv_cntr"
+	Set gtmtypes("sgmnt_data",461,"off")=3832
 	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_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 gtmtypfldindx("sgmnt_data","jnlbuff_phs2cmt_isprcalv_cntr")=461
+	Set gtmtypes("sgmnt_data",462,"name")="sgmnt_data.bg_trc_rec_cntr_filler"
+	Set gtmtypes("sgmnt_data",462,"off")=3836
+	Set gtmtypes("sgmnt_data",462,"len")=12
+	Set gtmtypes("sgmnt_data",462,"type")="char"
+	Set gtmtypfldindx("sgmnt_data","bg_trc_rec_cntr_filler")=462
+	Set gtmtypes("sgmnt_data",463,"name")="sgmnt_data.n_gvcst_srches"
+	Set gtmtypes("sgmnt_data",463,"off")=3848
 	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 gtmtypfldindx("sgmnt_data","n_gvcst_srches")=463
+	Set gtmtypes("sgmnt_data",464,"name")="sgmnt_data.n_gvcst_srches.curr_count"
+	Set gtmtypes("sgmnt_data",464,"off")=3848
 	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 gtmtypfldindx("sgmnt_data","n_gvcst_srches.curr_count")=464
+	Set gtmtypes("sgmnt_data",465,"name")="sgmnt_data.n_gvcst_srches.cumul_count"
+	Set gtmtypes("sgmnt_data",465,"off")=3852
 	Set gtmtypes("sgmnt_data",465,"len")=4
 	Set gtmtypes("sgmnt_data",465,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","n_gvcst_srches.cumul_count")=465
+	Set gtmtypes("sgmnt_data",466,"name")="sgmnt_data.n_gvcst_srch_clues"
+	Set gtmtypes("sgmnt_data",466,"off")=3856
 	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 gtmtypfldindx("sgmnt_data","n_gvcst_srch_clues")=466
+	Set gtmtypes("sgmnt_data",467,"name")="sgmnt_data.n_gvcst_srch_clues.curr_count"
+	Set gtmtypes("sgmnt_data",467,"off")=3856
 	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 gtmtypfldindx("sgmnt_data","n_gvcst_srch_clues.curr_count")=467
+	Set gtmtypes("sgmnt_data",468,"name")="sgmnt_data.n_gvcst_srch_clues.cumul_count"
+	Set gtmtypes("sgmnt_data",468,"off")=3860
 	Set gtmtypes("sgmnt_data",468,"len")=4
 	Set gtmtypes("sgmnt_data",468,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","n_gvcst_srch_clues.cumul_count")=468
+	Set gtmtypes("sgmnt_data",469,"name")="sgmnt_data.n_clue_used_head"
+	Set gtmtypes("sgmnt_data",469,"off")=3864
 	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 gtmtypfldindx("sgmnt_data","n_clue_used_head")=469
+	Set gtmtypes("sgmnt_data",470,"name")="sgmnt_data.n_clue_used_head.curr_count"
+	Set gtmtypes("sgmnt_data",470,"off")=3864
 	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 gtmtypfldindx("sgmnt_data","n_clue_used_head.curr_count")=470
+	Set gtmtypes("sgmnt_data",471,"name")="sgmnt_data.n_clue_used_head.cumul_count"
+	Set gtmtypes("sgmnt_data",471,"off")=3868
 	Set gtmtypes("sgmnt_data",471,"len")=4
 	Set gtmtypes("sgmnt_data",471,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","n_clue_used_head.cumul_count")=471
+	Set gtmtypes("sgmnt_data",472,"name")="sgmnt_data.n_clue_used_same"
+	Set gtmtypes("sgmnt_data",472,"off")=3872
 	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 gtmtypfldindx("sgmnt_data","n_clue_used_same")=472
+	Set gtmtypes("sgmnt_data",473,"name")="sgmnt_data.n_clue_used_same.curr_count"
+	Set gtmtypes("sgmnt_data",473,"off")=3872
 	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 gtmtypfldindx("sgmnt_data","n_clue_used_same.curr_count")=473
+	Set gtmtypes("sgmnt_data",474,"name")="sgmnt_data.n_clue_used_same.cumul_count"
+	Set gtmtypes("sgmnt_data",474,"off")=3876
 	Set gtmtypes("sgmnt_data",474,"len")=4
 	Set gtmtypes("sgmnt_data",474,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","n_clue_used_same.cumul_count")=474
+	Set gtmtypes("sgmnt_data",475,"name")="sgmnt_data.n_clue_used_tail"
+	Set gtmtypes("sgmnt_data",475,"off")=3880
 	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 gtmtypfldindx("sgmnt_data","n_clue_used_tail")=475
+	Set gtmtypes("sgmnt_data",476,"name")="sgmnt_data.n_clue_used_tail.curr_count"
+	Set gtmtypes("sgmnt_data",476,"off")=3880
 	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 gtmtypfldindx("sgmnt_data","n_clue_used_tail.curr_count")=476
+	Set gtmtypes("sgmnt_data",477,"name")="sgmnt_data.n_clue_used_tail.cumul_count"
+	Set gtmtypes("sgmnt_data",477,"off")=3884
 	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 gtmtypfldindx("sgmnt_data","n_clue_used_tail.cumul_count")=477
+	Set gtmtypes("sgmnt_data",478,"name")="sgmnt_data.n_t_qreads"
+	Set gtmtypes("sgmnt_data",478,"off")=3888
 	Set gtmtypes("sgmnt_data",478,"len")=8
 	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 gtmtypfldindx("sgmnt_data","n_t_qreads")=478
+	Set gtmtypes("sgmnt_data",479,"name")="sgmnt_data.n_t_qreads.curr_count"
+	Set gtmtypes("sgmnt_data",479,"off")=3888
 	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 gtmtypfldindx("sgmnt_data","n_t_qreads.curr_count")=479
+	Set gtmtypes("sgmnt_data",480,"name")="sgmnt_data.n_t_qreads.cumul_count"
+	Set gtmtypes("sgmnt_data",480,"off")=3892
 	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 gtmtypfldindx("sgmnt_data","n_t_qreads.cumul_count")=480
+	Set gtmtypes("sgmnt_data",481,"name")="sgmnt_data.unused_dsk_reads"
+	Set gtmtypes("sgmnt_data",481,"off")=3896
 	Set gtmtypes("sgmnt_data",481,"len")=8
 	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 gtmtypfldindx("sgmnt_data","unused_dsk_reads")=481
+	Set gtmtypes("sgmnt_data",482,"name")="sgmnt_data.unused_dsk_reads.curr_count"
+	Set gtmtypes("sgmnt_data",482,"off")=3896
 	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 gtmtypfldindx("sgmnt_data","unused_dsk_reads.curr_count")=482
+	Set gtmtypes("sgmnt_data",483,"name")="sgmnt_data.unused_dsk_reads.cumul_count"
+	Set gtmtypes("sgmnt_data",483,"off")=3900
 	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 gtmtypfldindx("sgmnt_data","unused_dsk_reads.cumul_count")=483
+	Set gtmtypes("sgmnt_data",484,"name")="sgmnt_data.n_bgmm_updates"
+	Set gtmtypes("sgmnt_data",484,"off")=3904
 	Set gtmtypes("sgmnt_data",484,"len")=8
 	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 gtmtypfldindx("sgmnt_data","n_bgmm_updates")=484
+	Set gtmtypes("sgmnt_data",485,"name")="sgmnt_data.n_bgmm_updates.curr_count"
+	Set gtmtypes("sgmnt_data",485,"off")=3904
 	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 gtmtypfldindx("sgmnt_data","n_bgmm_updates.curr_count")=485
+	Set gtmtypes("sgmnt_data",486,"name")="sgmnt_data.n_bgmm_updates.cumul_count"
+	Set gtmtypes("sgmnt_data",486,"off")=3908
 	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 gtmtypfldindx("sgmnt_data","n_bgmm_updates.cumul_count")=486
+	Set gtmtypes("sgmnt_data",487,"name")="sgmnt_data.unused_dsk_writes"
+	Set gtmtypes("sgmnt_data",487,"off")=3912
 	Set gtmtypes("sgmnt_data",487,"len")=8
 	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 gtmtypfldindx("sgmnt_data","unused_dsk_writes")=487
+	Set gtmtypes("sgmnt_data",488,"name")="sgmnt_data.unused_dsk_writes.curr_count"
+	Set gtmtypes("sgmnt_data",488,"off")=3912
 	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 gtmtypfldindx("sgmnt_data","unused_dsk_writes.curr_count")=488
+	Set gtmtypes("sgmnt_data",489,"name")="sgmnt_data.unused_dsk_writes.cumul_count"
+	Set gtmtypes("sgmnt_data",489,"off")=3916
 	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 gtmtypfldindx("sgmnt_data","unused_dsk_writes.cumul_count")=489
+	Set gtmtypes("sgmnt_data",490,"name")="sgmnt_data.n_bg_update_creates"
+	Set gtmtypes("sgmnt_data",490,"off")=3920
 	Set gtmtypes("sgmnt_data",490,"len")=8
 	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 gtmtypfldindx("sgmnt_data","n_bg_update_creates")=490
+	Set gtmtypes("sgmnt_data",491,"name")="sgmnt_data.n_bg_update_creates.curr_count"
+	Set gtmtypes("sgmnt_data",491,"off")=3920
 	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 gtmtypfldindx("sgmnt_data","n_bg_update_creates.curr_count")=491
+	Set gtmtypes("sgmnt_data",492,"name")="sgmnt_data.n_bg_update_creates.cumul_count"
+	Set gtmtypes("sgmnt_data",492,"off")=3924
 	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_set")=495
-	Set gtmtypes("sgmnt_data",496,"name")="sgmnt_data.gvstats_rec.n_kill"
-	Set gtmtypes("sgmnt_data",496,"off")=4104
+	Set gtmtypfldindx("sgmnt_data","n_bg_update_creates.cumul_count")=492
+	Set gtmtypes("sgmnt_data",493,"name")="sgmnt_data.n_db_csh_getns"
+	Set gtmtypes("sgmnt_data",493,"off")=3928
+	Set gtmtypes("sgmnt_data",493,"len")=8
+	Set gtmtypes("sgmnt_data",493,"type")="db_csh_acct_rec"
+	Set gtmtypfldindx("sgmnt_data","n_db_csh_getns")=493
+	Set gtmtypes("sgmnt_data",494,"name")="sgmnt_data.n_db_csh_getns.curr_count"
+	Set gtmtypes("sgmnt_data",494,"off")=3928
+	Set gtmtypes("sgmnt_data",494,"len")=4
+	Set gtmtypes("sgmnt_data",494,"type")="int"
+	Set gtmtypfldindx("sgmnt_data","n_db_csh_getns.curr_count")=494
+	Set gtmtypes("sgmnt_data",495,"name")="sgmnt_data.n_db_csh_getns.cumul_count"
+	Set gtmtypes("sgmnt_data",495,"off")=3932
+	Set gtmtypes("sgmnt_data",495,"len")=4
+	Set gtmtypes("sgmnt_data",495,"type")="int"
+	Set gtmtypfldindx("sgmnt_data","n_db_csh_getns.cumul_count")=495
+	Set gtmtypes("sgmnt_data",496,"name")="sgmnt_data.n_db_csh_getn_lcnt"
+	Set gtmtypes("sgmnt_data",496,"off")=3936
 	Set gtmtypes("sgmnt_data",496,"len")=8
-	Set gtmtypes("sgmnt_data",496,"type")="uint64_t"
-	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_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_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_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_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",496,"type")="db_csh_acct_rec"
+	Set gtmtypfldindx("sgmnt_data","n_db_csh_getn_lcnt")=496
+	Set gtmtypes("sgmnt_data",497,"name")="sgmnt_data.n_db_csh_getn_lcnt.curr_count"
+	Set gtmtypes("sgmnt_data",497,"off")=3936
+	Set gtmtypes("sgmnt_data",497,"len")=4
+	Set gtmtypes("sgmnt_data",497,"type")="int"
+	Set gtmtypfldindx("sgmnt_data","n_db_csh_getn_lcnt.curr_count")=497
+	Set gtmtypes("sgmnt_data",498,"name")="sgmnt_data.n_db_csh_getn_lcnt.cumul_count"
+	Set gtmtypes("sgmnt_data",498,"off")=3940
+	Set gtmtypes("sgmnt_data",498,"len")=4
+	Set gtmtypes("sgmnt_data",498,"type")="int"
+	Set gtmtypfldindx("sgmnt_data","n_db_csh_getn_lcnt.cumul_count")=498
+	Set gtmtypes("sgmnt_data",499,"name")="sgmnt_data.db_csh_acct_rec_filler_4k"
+	Set gtmtypes("sgmnt_data",499,"off")=3944
+	Set gtmtypes("sgmnt_data",499,"len")=152
+	Set gtmtypes("sgmnt_data",499,"type")="char"
+	Set gtmtypfldindx("sgmnt_data","db_csh_acct_rec_filler_4k")=499
+	Set gtmtypes("sgmnt_data",500,"name")="sgmnt_data.gvstats_rec"
+	Set gtmtypes("sgmnt_data",500,"off")=4096
+	Set gtmtypes("sgmnt_data",500,"len")=472
+	Set gtmtypes("sgmnt_data",500,"type")="gvstats_rec_t"
+	Set gtmtypfldindx("sgmnt_data","gvstats_rec")=500
+	Set gtmtypes("sgmnt_data",501,"name")="sgmnt_data.gvstats_rec.n_set"
+	Set gtmtypes("sgmnt_data",501,"off")=4096
 	Set gtmtypes("sgmnt_data",501,"len")=8
 	Set gtmtypes("sgmnt_data",501,"type")="uint64_t"
-	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 gtmtypfldindx("sgmnt_data","gvstats_rec.n_set")=501
+	Set gtmtypes("sgmnt_data",502,"name")="sgmnt_data.gvstats_rec.n_kill"
+	Set gtmtypes("sgmnt_data",502,"off")=4104
 	Set gtmtypes("sgmnt_data",502,"len")=8
 	Set gtmtypes("sgmnt_data",502,"type")="uint64_t"
-	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 gtmtypfldindx("sgmnt_data","gvstats_rec.n_kill")=502
+	Set gtmtypes("sgmnt_data",503,"name")="sgmnt_data.gvstats_rec.n_get"
+	Set gtmtypes("sgmnt_data",503,"off")=4112
 	Set gtmtypes("sgmnt_data",503,"len")=8
 	Set gtmtypes("sgmnt_data",503,"type")="uint64_t"
-	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 gtmtypfldindx("sgmnt_data","gvstats_rec.n_get")=503
+	Set gtmtypes("sgmnt_data",504,"name")="sgmnt_data.gvstats_rec.n_data"
+	Set gtmtypes("sgmnt_data",504,"off")=4120
 	Set gtmtypes("sgmnt_data",504,"len")=8
 	Set gtmtypes("sgmnt_data",504,"type")="uint64_t"
-	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 gtmtypfldindx("sgmnt_data","gvstats_rec.n_data")=504
+	Set gtmtypes("sgmnt_data",505,"name")="sgmnt_data.gvstats_rec.n_order"
+	Set gtmtypes("sgmnt_data",505,"off")=4128
 	Set gtmtypes("sgmnt_data",505,"len")=8
 	Set gtmtypes("sgmnt_data",505,"type")="uint64_t"
-	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 gtmtypfldindx("sgmnt_data","gvstats_rec.n_order")=505
+	Set gtmtypes("sgmnt_data",506,"name")="sgmnt_data.gvstats_rec.n_zprev"
+	Set gtmtypes("sgmnt_data",506,"off")=4136
 	Set gtmtypes("sgmnt_data",506,"len")=8
 	Set gtmtypes("sgmnt_data",506,"type")="uint64_t"
-	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 gtmtypfldindx("sgmnt_data","gvstats_rec.n_zprev")=506
+	Set gtmtypes("sgmnt_data",507,"name")="sgmnt_data.gvstats_rec.n_query"
+	Set gtmtypes("sgmnt_data",507,"off")=4144
 	Set gtmtypes("sgmnt_data",507,"len")=8
 	Set gtmtypes("sgmnt_data",507,"type")="uint64_t"
-	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 gtmtypfldindx("sgmnt_data","gvstats_rec.n_query")=507
+	Set gtmtypes("sgmnt_data",508,"name")="sgmnt_data.gvstats_rec.n_lock_success"
+	Set gtmtypes("sgmnt_data",508,"off")=4152
 	Set gtmtypes("sgmnt_data",508,"len")=8
 	Set gtmtypes("sgmnt_data",508,"type")="uint64_t"
-	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 gtmtypfldindx("sgmnt_data","gvstats_rec.n_lock_success")=508
+	Set gtmtypes("sgmnt_data",509,"name")="sgmnt_data.gvstats_rec.n_lock_fail"
+	Set gtmtypes("sgmnt_data",509,"off")=4160
 	Set gtmtypes("sgmnt_data",509,"len")=8
 	Set gtmtypes("sgmnt_data",509,"type")="uint64_t"
-	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 gtmtypfldindx("sgmnt_data","gvstats_rec.n_lock_fail")=509
+	Set gtmtypes("sgmnt_data",510,"name")="sgmnt_data.gvstats_rec.db_curr_tn"
+	Set gtmtypes("sgmnt_data",510,"off")=4168
 	Set gtmtypes("sgmnt_data",510,"len")=8
 	Set gtmtypes("sgmnt_data",510,"type")="uint64_t"
-	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 gtmtypfldindx("sgmnt_data","gvstats_rec.db_curr_tn")=510
+	Set gtmtypes("sgmnt_data",511,"name")="sgmnt_data.gvstats_rec.n_dsk_read"
+	Set gtmtypes("sgmnt_data",511,"off")=4176
 	Set gtmtypes("sgmnt_data",511,"len")=8
 	Set gtmtypes("sgmnt_data",511,"type")="uint64_t"
-	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 gtmtypfldindx("sgmnt_data","gvstats_rec.n_dsk_read")=511
+	Set gtmtypes("sgmnt_data",512,"name")="sgmnt_data.gvstats_rec.n_dsk_write"
+	Set gtmtypes("sgmnt_data",512,"off")=4184
 	Set gtmtypes("sgmnt_data",512,"len")=8
 	Set gtmtypes("sgmnt_data",512,"type")="uint64_t"
-	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 gtmtypfldindx("sgmnt_data","gvstats_rec.n_dsk_write")=512
+	Set gtmtypes("sgmnt_data",513,"name")="sgmnt_data.gvstats_rec.n_nontp_readwrite"
+	Set gtmtypes("sgmnt_data",513,"off")=4192
 	Set gtmtypes("sgmnt_data",513,"len")=8
 	Set gtmtypes("sgmnt_data",513,"type")="uint64_t"
-	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 gtmtypfldindx("sgmnt_data","gvstats_rec.n_nontp_readwrite")=513
+	Set gtmtypes("sgmnt_data",514,"name")="sgmnt_data.gvstats_rec.n_nontp_readonly"
+	Set gtmtypes("sgmnt_data",514,"off")=4200
 	Set gtmtypes("sgmnt_data",514,"len")=8
 	Set gtmtypes("sgmnt_data",514,"type")="uint64_t"
-	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 gtmtypfldindx("sgmnt_data","gvstats_rec.n_nontp_readonly")=514
+	Set gtmtypes("sgmnt_data",515,"name")="sgmnt_data.gvstats_rec.n_nontp_blkwrite"
+	Set gtmtypes("sgmnt_data",515,"off")=4208
 	Set gtmtypes("sgmnt_data",515,"len")=8
 	Set gtmtypes("sgmnt_data",515,"type")="uint64_t"
-	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 gtmtypfldindx("sgmnt_data","gvstats_rec.n_nontp_blkwrite")=515
+	Set gtmtypes("sgmnt_data",516,"name")="sgmnt_data.gvstats_rec.n_nontp_blkread"
+	Set gtmtypes("sgmnt_data",516,"off")=4216
 	Set gtmtypes("sgmnt_data",516,"len")=8
 	Set gtmtypes("sgmnt_data",516,"type")="uint64_t"
-	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 gtmtypfldindx("sgmnt_data","gvstats_rec.n_nontp_blkread")=516
+	Set gtmtypes("sgmnt_data",517,"name")="sgmnt_data.gvstats_rec.n_nontp_retries_0"
+	Set gtmtypes("sgmnt_data",517,"off")=4224
 	Set gtmtypes("sgmnt_data",517,"len")=8
 	Set gtmtypes("sgmnt_data",517,"type")="uint64_t"
-	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 gtmtypfldindx("sgmnt_data","gvstats_rec.n_nontp_retries_0")=517
+	Set gtmtypes("sgmnt_data",518,"name")="sgmnt_data.gvstats_rec.n_nontp_retries_1"
+	Set gtmtypes("sgmnt_data",518,"off")=4232
 	Set gtmtypes("sgmnt_data",518,"len")=8
 	Set gtmtypes("sgmnt_data",518,"type")="uint64_t"
-	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 gtmtypfldindx("sgmnt_data","gvstats_rec.n_nontp_retries_1")=518
+	Set gtmtypes("sgmnt_data",519,"name")="sgmnt_data.gvstats_rec.n_nontp_retries_2"
+	Set gtmtypes("sgmnt_data",519,"off")=4240
 	Set gtmtypes("sgmnt_data",519,"len")=8
 	Set gtmtypes("sgmnt_data",519,"type")="uint64_t"
-	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 gtmtypfldindx("sgmnt_data","gvstats_rec.n_nontp_retries_2")=519
+	Set gtmtypes("sgmnt_data",520,"name")="sgmnt_data.gvstats_rec.n_nontp_retries_3"
+	Set gtmtypes("sgmnt_data",520,"off")=4248
 	Set gtmtypes("sgmnt_data",520,"len")=8
 	Set gtmtypes("sgmnt_data",520,"type")="uint64_t"
-	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 gtmtypfldindx("sgmnt_data","gvstats_rec.n_nontp_retries_3")=520
+	Set gtmtypes("sgmnt_data",521,"name")="sgmnt_data.gvstats_rec.n_tp_readwrite"
+	Set gtmtypes("sgmnt_data",521,"off")=4256
 	Set gtmtypes("sgmnt_data",521,"len")=8
 	Set gtmtypes("sgmnt_data",521,"type")="uint64_t"
-	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 gtmtypfldindx("sgmnt_data","gvstats_rec.n_tp_readwrite")=521
+	Set gtmtypes("sgmnt_data",522,"name")="sgmnt_data.gvstats_rec.n_tp_readonly"
+	Set gtmtypes("sgmnt_data",522,"off")=4264
 	Set gtmtypes("sgmnt_data",522,"len")=8
 	Set gtmtypes("sgmnt_data",522,"type")="uint64_t"
-	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 gtmtypfldindx("sgmnt_data","gvstats_rec.n_tp_readonly")=522
+	Set gtmtypes("sgmnt_data",523,"name")="sgmnt_data.gvstats_rec.n_tp_rolledback"
+	Set gtmtypes("sgmnt_data",523,"off")=4272
 	Set gtmtypes("sgmnt_data",523,"len")=8
 	Set gtmtypes("sgmnt_data",523,"type")="uint64_t"
-	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 gtmtypfldindx("sgmnt_data","gvstats_rec.n_tp_rolledback")=523
+	Set gtmtypes("sgmnt_data",524,"name")="sgmnt_data.gvstats_rec.n_tp_blkwrite"
+	Set gtmtypes("sgmnt_data",524,"off")=4280
 	Set gtmtypes("sgmnt_data",524,"len")=8
 	Set gtmtypes("sgmnt_data",524,"type")="uint64_t"
-	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 gtmtypfldindx("sgmnt_data","gvstats_rec.n_tp_blkwrite")=524
+	Set gtmtypes("sgmnt_data",525,"name")="sgmnt_data.gvstats_rec.n_tp_blkread"
+	Set gtmtypes("sgmnt_data",525,"off")=4288
 	Set gtmtypes("sgmnt_data",525,"len")=8
 	Set gtmtypes("sgmnt_data",525,"type")="uint64_t"
-	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 gtmtypfldindx("sgmnt_data","gvstats_rec.n_tp_blkread")=525
+	Set gtmtypes("sgmnt_data",526,"name")="sgmnt_data.gvstats_rec.n_tp_tot_retries_0"
+	Set gtmtypes("sgmnt_data",526,"off")=4296
 	Set gtmtypes("sgmnt_data",526,"len")=8
 	Set gtmtypes("sgmnt_data",526,"type")="uint64_t"
-	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 gtmtypfldindx("sgmnt_data","gvstats_rec.n_tp_tot_retries_0")=526
+	Set gtmtypes("sgmnt_data",527,"name")="sgmnt_data.gvstats_rec.n_tp_tot_retries_1"
+	Set gtmtypes("sgmnt_data",527,"off")=4304
 	Set gtmtypes("sgmnt_data",527,"len")=8
 	Set gtmtypes("sgmnt_data",527,"type")="uint64_t"
-	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 gtmtypfldindx("sgmnt_data","gvstats_rec.n_tp_tot_retries_1")=527
+	Set gtmtypes("sgmnt_data",528,"name")="sgmnt_data.gvstats_rec.n_tp_tot_retries_2"
+	Set gtmtypes("sgmnt_data",528,"off")=4312
 	Set gtmtypes("sgmnt_data",528,"len")=8
 	Set gtmtypes("sgmnt_data",528,"type")="uint64_t"
-	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 gtmtypfldindx("sgmnt_data","gvstats_rec.n_tp_tot_retries_2")=528
+	Set gtmtypes("sgmnt_data",529,"name")="sgmnt_data.gvstats_rec.n_tp_tot_retries_3"
+	Set gtmtypes("sgmnt_data",529,"off")=4320
 	Set gtmtypes("sgmnt_data",529,"len")=8
 	Set gtmtypes("sgmnt_data",529,"type")="uint64_t"
-	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 gtmtypfldindx("sgmnt_data","gvstats_rec.n_tp_tot_retries_3")=529
+	Set gtmtypes("sgmnt_data",530,"name")="sgmnt_data.gvstats_rec.n_tp_tot_retries_4"
+	Set gtmtypes("sgmnt_data",530,"off")=4328
 	Set gtmtypes("sgmnt_data",530,"len")=8
 	Set gtmtypes("sgmnt_data",530,"type")="uint64_t"
-	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 gtmtypfldindx("sgmnt_data","gvstats_rec.n_tp_tot_retries_4")=530
+	Set gtmtypes("sgmnt_data",531,"name")="sgmnt_data.gvstats_rec.n_tp_cnflct_retries_0"
+	Set gtmtypes("sgmnt_data",531,"off")=4336
 	Set gtmtypes("sgmnt_data",531,"len")=8
 	Set gtmtypes("sgmnt_data",531,"type")="uint64_t"
-	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 gtmtypfldindx("sgmnt_data","gvstats_rec.n_tp_cnflct_retries_0")=531
+	Set gtmtypes("sgmnt_data",532,"name")="sgmnt_data.gvstats_rec.n_tp_cnflct_retries_1"
+	Set gtmtypes("sgmnt_data",532,"off")=4344
 	Set gtmtypes("sgmnt_data",532,"len")=8
 	Set gtmtypes("sgmnt_data",532,"type")="uint64_t"
-	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 gtmtypfldindx("sgmnt_data","gvstats_rec.n_tp_cnflct_retries_1")=532
+	Set gtmtypes("sgmnt_data",533,"name")="sgmnt_data.gvstats_rec.n_tp_cnflct_retries_2"
+	Set gtmtypes("sgmnt_data",533,"off")=4352
 	Set gtmtypes("sgmnt_data",533,"len")=8
 	Set gtmtypes("sgmnt_data",533,"type")="uint64_t"
-	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 gtmtypfldindx("sgmnt_data","gvstats_rec.n_tp_cnflct_retries_2")=533
+	Set gtmtypes("sgmnt_data",534,"name")="sgmnt_data.gvstats_rec.n_tp_cnflct_retries_3"
+	Set gtmtypes("sgmnt_data",534,"off")=4360
 	Set gtmtypes("sgmnt_data",534,"len")=8
 	Set gtmtypes("sgmnt_data",534,"type")="uint64_t"
-	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 gtmtypfldindx("sgmnt_data","gvstats_rec.n_tp_cnflct_retries_3")=534
+	Set gtmtypes("sgmnt_data",535,"name")="sgmnt_data.gvstats_rec.n_tp_cnflct_retries_4"
+	Set gtmtypes("sgmnt_data",535,"off")=4368
 	Set gtmtypes("sgmnt_data",535,"len")=8
 	Set gtmtypes("sgmnt_data",535,"type")="uint64_t"
-	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 gtmtypfldindx("sgmnt_data","gvstats_rec.n_tp_cnflct_retries_4")=535
+	Set gtmtypes("sgmnt_data",536,"name")="sgmnt_data.gvstats_rec.n_ztrigger"
+	Set gtmtypes("sgmnt_data",536,"off")=4376
 	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 gtmtypfldindx("sgmnt_data","gvstats_rec.n_ztrigger")=536
+	Set gtmtypes("sgmnt_data",537,"name")="sgmnt_data.gvstats_rec.n_db_flush"
+	Set gtmtypes("sgmnt_data",537,"off")=4384
 	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 gtmtypfldindx("sgmnt_data","gvstats_rec.n_db_flush")=537
+	Set gtmtypes("sgmnt_data",538,"name")="sgmnt_data.gvstats_rec.n_db_fsync"
+	Set gtmtypes("sgmnt_data",538,"off")=4392
 	Set gtmtypes("sgmnt_data",538,"len")=8
 	Set gtmtypes("sgmnt_data",538,"type")="uint64_t"
-	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 gtmtypfldindx("sgmnt_data","gvstats_rec.n_db_fsync")=538
+	Set gtmtypes("sgmnt_data",539,"name")="sgmnt_data.gvstats_rec.n_jnl_flush"
+	Set gtmtypes("sgmnt_data",539,"off")=4400
 	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 gtmtypfldindx("sgmnt_data","gvstats_rec.n_jnl_flush")=539
+	Set gtmtypes("sgmnt_data",540,"name")="sgmnt_data.gvstats_rec.n_jnl_fsync"
+	Set gtmtypes("sgmnt_data",540,"off")=4408
 	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 gtmtypfldindx("sgmnt_data","gvstats_rec.n_jnl_fsync")=540
+	Set gtmtypes("sgmnt_data",541,"name")="sgmnt_data.gvstats_rec.n_jbuff_bytes"
+	Set gtmtypes("sgmnt_data",541,"off")=4416
 	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 gtmtypfldindx("sgmnt_data","gvstats_rec.n_jbuff_bytes")=541
+	Set gtmtypes("sgmnt_data",542,"name")="sgmnt_data.gvstats_rec.n_jfile_bytes"
+	Set gtmtypes("sgmnt_data",542,"off")=4424
 	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 gtmtypfldindx("sgmnt_data","gvstats_rec.n_jfile_bytes")=542
+	Set gtmtypes("sgmnt_data",543,"name")="sgmnt_data.gvstats_rec.n_jfile_writes"
+	Set gtmtypes("sgmnt_data",543,"off")=4432
 	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 gtmtypfldindx("sgmnt_data","gvstats_rec.n_jfile_writes")=543
+	Set gtmtypes("sgmnt_data",544,"name")="sgmnt_data.gvstats_rec.n_jrec_logical"
+	Set gtmtypes("sgmnt_data",544,"off")=4440
 	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 gtmtypfldindx("sgmnt_data","gvstats_rec.n_jrec_logical")=544
+	Set gtmtypes("sgmnt_data",545,"name")="sgmnt_data.gvstats_rec.n_jrec_pblk"
+	Set gtmtypes("sgmnt_data",545,"off")=4448
 	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 gtmtypfldindx("sgmnt_data","gvstats_rec.n_jrec_pblk")=545
+	Set gtmtypes("sgmnt_data",546,"name")="sgmnt_data.gvstats_rec.n_jrec_epoch_regular"
+	Set gtmtypes("sgmnt_data",546,"off")=4456
 	Set gtmtypes("sgmnt_data",546,"len")=8
 	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 gtmtypfldindx("sgmnt_data","gvstats_rec.n_jrec_epoch_regular")=546
+	Set gtmtypes("sgmnt_data",547,"name")="sgmnt_data.gvstats_rec.n_jrec_epoch_idle"
+	Set gtmtypes("sgmnt_data",547,"off")=4464
 	Set gtmtypes("sgmnt_data",547,"len")=8
 	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 gtmtypfldindx("sgmnt_data","gvstats_rec.n_jrec_epoch_idle")=547
+	Set gtmtypes("sgmnt_data",548,"name")="sgmnt_data.gvstats_rec.n_jrec_other"
+	Set gtmtypes("sgmnt_data",548,"off")=4472
 	Set gtmtypes("sgmnt_data",548,"len")=8
 	Set gtmtypes("sgmnt_data",548,"type")="uint64_t"
-	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 gtmtypfldindx("sgmnt_data","gvstats_rec.n_jrec_other")=548
+	Set gtmtypes("sgmnt_data",549,"name")="sgmnt_data.gvstats_rec.n_jnl_extends"
+	Set gtmtypes("sgmnt_data",549,"off")=4480
 	Set gtmtypes("sgmnt_data",549,"len")=8
 	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 gtmtypfldindx("sgmnt_data","gvstats_rec.n_jnl_extends")=549
+	Set gtmtypes("sgmnt_data",550,"name")="sgmnt_data.gvstats_rec.n_db_extends"
+	Set gtmtypes("sgmnt_data",550,"off")=4488
 	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 gtmtypfldindx("sgmnt_data","gvstats_rec.n_db_extends")=550
+	Set gtmtypes("sgmnt_data",551,"name")="sgmnt_data.gvstats_rec.n_crit_success"
+	Set gtmtypes("sgmnt_data",551,"off")=4496
 	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 gtmtypfldindx("sgmnt_data","gvstats_rec.n_crit_success")=551
+	Set gtmtypes("sgmnt_data",552,"name")="sgmnt_data.gvstats_rec.n_crits_in_epch"
+	Set gtmtypes("sgmnt_data",552,"off")=4504
 	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 gtmtypfldindx("sgmnt_data","gvstats_rec.n_crits_in_epch")=552
+	Set gtmtypes("sgmnt_data",553,"name")="sgmnt_data.gvstats_rec.sq_crit_failed"
+	Set gtmtypes("sgmnt_data",553,"off")=4512
 	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 gtmtypfldindx("sgmnt_data","gvstats_rec.sq_crit_failed")=553
+	Set gtmtypes("sgmnt_data",554,"name")="sgmnt_data.gvstats_rec.n_crit_failed"
+	Set gtmtypes("sgmnt_data",554,"off")=4520
+	Set gtmtypes("sgmnt_data",554,"len")=8
+	Set gtmtypes("sgmnt_data",554,"type")="uint64_t"
+	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_crit_failed")=554
+	Set gtmtypes("sgmnt_data",555,"name")="sgmnt_data.gvstats_rec.sq_crit_que_slps"
+	Set gtmtypes("sgmnt_data",555,"off")=4528
+	Set gtmtypes("sgmnt_data",555,"len")=8
+	Set gtmtypes("sgmnt_data",555,"type")="uint64_t"
+	Set gtmtypfldindx("sgmnt_data","gvstats_rec.sq_crit_que_slps")=555
+	Set gtmtypes("sgmnt_data",556,"name")="sgmnt_data.gvstats_rec.n_crit_que_slps"
+	Set gtmtypes("sgmnt_data",556,"off")=4536
+	Set gtmtypes("sgmnt_data",556,"len")=8
 	Set gtmtypes("sgmnt_data",556,"type")="uint64_t"
-	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.creation_db_ver"
-	Set gtmtypes("sgmnt_data",557,"off")=5104
-	Set gtmtypes("sgmnt_data",557,"len")=4
-	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")="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")="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")="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")="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 gtmtypfldindx("sgmnt_data","gvstats_rec.n_crit_que_slps")=556
+	Set gtmtypes("sgmnt_data",557,"name")="sgmnt_data.gvstats_rec.sq_crit_yields"
+	Set gtmtypes("sgmnt_data",557,"off")=4544
+	Set gtmtypes("sgmnt_data",557,"len")=8
+	Set gtmtypes("sgmnt_data",557,"type")="uint64_t"
+	Set gtmtypfldindx("sgmnt_data","gvstats_rec.sq_crit_yields")=557
+	Set gtmtypes("sgmnt_data",558,"name")="sgmnt_data.gvstats_rec.n_crit_yields"
+	Set gtmtypes("sgmnt_data",558,"off")=4552
+	Set gtmtypes("sgmnt_data",558,"len")=8
+	Set gtmtypes("sgmnt_data",558,"type")="uint64_t"
+	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_crit_yields")=558
+	Set gtmtypes("sgmnt_data",559,"name")="sgmnt_data.gvstats_rec.n_clean2dirty"
+	Set gtmtypes("sgmnt_data",559,"off")=4560
+	Set gtmtypes("sgmnt_data",559,"len")=8
+	Set gtmtypes("sgmnt_data",559,"type")="uint64_t"
+	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_clean2dirty")=559
+	Set gtmtypes("sgmnt_data",560,"name")="sgmnt_data.gvstats_rec_filler_4k_plus_512"
+	Set gtmtypes("sgmnt_data",560,"off")=4568
+	Set gtmtypes("sgmnt_data",560,"len")=40
+	Set gtmtypes("sgmnt_data",560,"type")="char"
+	Set gtmtypfldindx("sgmnt_data","gvstats_rec_filler_4k_plus_512")=560
+	Set gtmtypes("sgmnt_data",561,"name")="sgmnt_data.filler_4k_plus_512"
+	Set gtmtypes("sgmnt_data",561,"off")=4608
+	Set gtmtypes("sgmnt_data",561,"len")=368
+	Set gtmtypes("sgmnt_data",561,"type")="char"
+	Set gtmtypfldindx("sgmnt_data","filler_4k_plus_512")=561
+	Set gtmtypes("sgmnt_data",562,"name")="sgmnt_data.intrpt_recov_resync_strm_seqno"
+	Set gtmtypes("sgmnt_data",562,"off")=4976
+	Set gtmtypes("sgmnt_data",562,"len")=128
+	Set gtmtypes("sgmnt_data",562,"type")="uint64_t"
+	Set gtmtypfldindx("sgmnt_data","intrpt_recov_resync_strm_seqno")=562
+	Set gtmtypes("sgmnt_data",562,"dim")=16
+	Set gtmtypes("sgmnt_data",563,"name")="sgmnt_data.creation_db_ver"
+	Set gtmtypes("sgmnt_data",563,"off")=5104
+	Set gtmtypes("sgmnt_data",563,"len")=4
+	Set gtmtypes("sgmnt_data",563,"type")="int"
+	Set gtmtypfldindx("sgmnt_data","creation_db_ver")=563
+	Set gtmtypes("sgmnt_data",564,"name")="sgmnt_data.creation_mdb_ver"
+	Set gtmtypes("sgmnt_data",564,"off")=5108
+	Set gtmtypes("sgmnt_data",564,"len")=4
+	Set gtmtypes("sgmnt_data",564,"type")="int"
+	Set gtmtypfldindx("sgmnt_data","creation_mdb_ver")=564
+	Set gtmtypes("sgmnt_data",565,"name")="sgmnt_data.certified_for_upgrade_to"
+	Set gtmtypes("sgmnt_data",565,"off")=5112
+	Set gtmtypes("sgmnt_data",565,"len")=4
+	Set gtmtypes("sgmnt_data",565,"type")="int"
+	Set gtmtypfldindx("sgmnt_data","certified_for_upgrade_to")=565
+	Set gtmtypes("sgmnt_data",566,"name")="sgmnt_data.filler_5k"
+	Set gtmtypes("sgmnt_data",566,"off")=5116
+	Set gtmtypes("sgmnt_data",566,"len")=4
+	Set gtmtypes("sgmnt_data",566,"type")="int"
+	Set gtmtypfldindx("sgmnt_data","filler_5k")=566
+	Set gtmtypes("sgmnt_data",567,"name")="sgmnt_data.secshr_ops_index_filler"
+	Set gtmtypes("sgmnt_data",567,"off")=5120
+	Set gtmtypes("sgmnt_data",567,"len")=4
+	Set gtmtypes("sgmnt_data",567,"type")="int"
+	Set gtmtypfldindx("sgmnt_data","secshr_ops_index_filler")=567
+	Set gtmtypes("sgmnt_data",568,"name")="sgmnt_data.secshr_ops_array_filler"
+	Set gtmtypes("sgmnt_data",568,"off")=5124
+	Set gtmtypes("sgmnt_data",568,"len")=1020
 	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 gtmtypfldindx("sgmnt_data","secshr_ops_array_filler")=568
+	Set gtmtypes("sgmnt_data",568,"dim")=255
+	Set gtmtypes("sgmnt_data",569,"name")="sgmnt_data.next_upgrd_warn"
+	Set gtmtypes("sgmnt_data",569,"off")=6144
+	Set gtmtypes("sgmnt_data",569,"len")=24
+	Set gtmtypes("sgmnt_data",569,"type")="compswap_time_field"
+	Set gtmtypfldindx("sgmnt_data","next_upgrd_warn")=569
+	Set gtmtypes("sgmnt_data",570,"name")="sgmnt_data.next_upgrd_warn.time_latch"
+	Set gtmtypes("sgmnt_data",570,"off")=6144
+	Set gtmtypes("sgmnt_data",570,"len")=8
+	Set gtmtypes("sgmnt_data",570,"type")="global_latch_t"
+	Set gtmtypfldindx("sgmnt_data","next_upgrd_warn.time_latch")=570
+	Set gtmtypes("sgmnt_data",571,"name")="sgmnt_data.next_upgrd_warn.time_latch.u"
+	Set gtmtypes("sgmnt_data",571,"off")=6144
+	Set gtmtypes("sgmnt_data",571,"len")=8
+	Set gtmtypes("sgmnt_data",571,"type")="union"
+	Set gtmtypfldindx("sgmnt_data","next_upgrd_warn.time_latch.u")=571
+	Set gtmtypes("sgmnt_data",572,"name")="sgmnt_data.next_upgrd_warn.time_latch.u.pid_imgcnt"
+	Set gtmtypes("sgmnt_data",572,"off")=6144
+	Set gtmtypes("sgmnt_data",572,"len")=8
+	Set gtmtypes("sgmnt_data",572,"type")="uint64_t"
+	Set gtmtypfldindx("sgmnt_data","next_upgrd_warn.time_latch.u.pid_imgcnt")=572
+	Set gtmtypes("sgmnt_data",573,"name")="sgmnt_data.next_upgrd_warn.time_latch.u.parts"
+	Set gtmtypes("sgmnt_data",573,"off")=6144
+	Set gtmtypes("sgmnt_data",573,"len")=8
+	Set gtmtypes("sgmnt_data",573,"type")="struct"
+	Set gtmtypfldindx("sgmnt_data","next_upgrd_warn.time_latch.u.parts")=573
+	Set gtmtypes("sgmnt_data",574,"name")="sgmnt_data.next_upgrd_warn.time_latch.u.parts.latch_pid"
+	Set gtmtypes("sgmnt_data",574,"off")=6144
+	Set gtmtypes("sgmnt_data",574,"len")=4
+	Set gtmtypes("sgmnt_data",574,"type")="int"
+	Set gtmtypfldindx("sgmnt_data","next_upgrd_warn.time_latch.u.parts.latch_pid")=574
+	Set gtmtypes("sgmnt_data",575,"name")="sgmnt_data.next_upgrd_warn.time_latch.u.parts.latch_word"
+	Set gtmtypes("sgmnt_data",575,"off")=6148
 	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",575,"type")="int"
+	Set gtmtypfldindx("sgmnt_data","next_upgrd_warn.time_latch.u.parts.latch_word")=575
+	Set gtmtypes("sgmnt_data",576,"name")="sgmnt_data.next_upgrd_warn.hp_latch_space"
+	Set gtmtypes("sgmnt_data",576,"off")=6152
+	Set gtmtypes("sgmnt_data",576,"len")=16
+	Set gtmtypes("sgmnt_data",576,"type")="int"
+	Set gtmtypfldindx("sgmnt_data","next_upgrd_warn.hp_latch_space")=576
+	Set gtmtypes("sgmnt_data",576,"dim")=4
+	Set gtmtypes("sgmnt_data",577,"name")="sgmnt_data.is_encrypted"
+	Set gtmtypes("sgmnt_data",577,"off")=6168
 	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",577,"type")="unsigned-int"
+	Set gtmtypfldindx("sgmnt_data","is_encrypted")=577
+	Set gtmtypes("sgmnt_data",578,"name")="sgmnt_data.db_trigger_cycle"
+	Set gtmtypes("sgmnt_data",578,"off")=6172
 	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",578,"type")="unsigned-int"
+	Set gtmtypfldindx("sgmnt_data","db_trigger_cycle")=578
+	Set gtmtypes("sgmnt_data",579,"name")="sgmnt_data.strm_reg_seqno"
+	Set gtmtypes("sgmnt_data",579,"off")=6176
+	Set gtmtypes("sgmnt_data",579,"len")=128
+	Set gtmtypes("sgmnt_data",579,"type")="uint64_t"
+	Set gtmtypfldindx("sgmnt_data","strm_reg_seqno")=579
+	Set gtmtypes("sgmnt_data",579,"dim")=16
+	Set gtmtypes("sgmnt_data",580,"name")="sgmnt_data.save_strm_reg_seqno"
+	Set gtmtypes("sgmnt_data",580,"off")=6304
+	Set gtmtypes("sgmnt_data",580,"len")=128
+	Set gtmtypes("sgmnt_data",580,"type")="uint64_t"
+	Set gtmtypfldindx("sgmnt_data","save_strm_reg_seqno")=580
+	Set gtmtypes("sgmnt_data",580,"dim")=16
+	Set gtmtypes("sgmnt_data",581,"name")="sgmnt_data.freeze_on_fail"
+	Set gtmtypes("sgmnt_data",581,"off")=6432
 	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 gtmtypfldindx("sgmnt_data","freeze_on_fail")=581
+	Set gtmtypes("sgmnt_data",582,"name")="sgmnt_data.span_node_absent"
+	Set gtmtypes("sgmnt_data",582,"off")=6436
 	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 gtmtypfldindx("sgmnt_data","span_node_absent")=582
+	Set gtmtypes("sgmnt_data",583,"name")="sgmnt_data.maxkeysz_assured"
+	Set gtmtypes("sgmnt_data",583,"off")=6440
 	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("sgmnt_data",583,"type")="boolean_t"
+	Set gtmtypfldindx("sgmnt_data","maxkeysz_assured")=583
+	Set gtmtypes("sgmnt_data",584,"name")="sgmnt_data.hasht_upgrade_needed"
+	Set gtmtypes("sgmnt_data",584,"off")=6444
+	Set gtmtypes("sgmnt_data",584,"len")=4
+	Set gtmtypes("sgmnt_data",584,"type")="boolean_t"
+	Set gtmtypfldindx("sgmnt_data","hasht_upgrade_needed")=584
+	Set gtmtypes("sgmnt_data",585,"name")="sgmnt_data.defer_allocate"
+	Set gtmtypes("sgmnt_data",585,"off")=6448
+	Set gtmtypes("sgmnt_data",585,"len")=4
+	Set gtmtypes("sgmnt_data",585,"type")="boolean_t"
+	Set gtmtypfldindx("sgmnt_data","defer_allocate")=585
+	Set gtmtypes("sgmnt_data",586,"name")="sgmnt_data.filler_ftok_counter_halted"
+	Set gtmtypes("sgmnt_data",586,"off")=6452
+	Set gtmtypes("sgmnt_data",586,"len")=4
+	Set gtmtypes("sgmnt_data",586,"type")="boolean_t"
+	Set gtmtypfldindx("sgmnt_data","filler_ftok_counter_halted")=586
+	Set gtmtypes("sgmnt_data",587,"name")="sgmnt_data.filler_access_counter_halted"
+	Set gtmtypes("sgmnt_data",587,"off")=6456
+	Set gtmtypes("sgmnt_data",587,"len")=4
+	Set gtmtypes("sgmnt_data",587,"type")="boolean_t"
+	Set gtmtypfldindx("sgmnt_data","filler_access_counter_halted")=587
+	Set gtmtypes("sgmnt_data",588,"name")="sgmnt_data.lock_crit_with_db"
+	Set gtmtypes("sgmnt_data",588,"off")=6460
+	Set gtmtypes("sgmnt_data",588,"len")=4
+	Set gtmtypes("sgmnt_data",588,"type")="boolean_t"
+	Set gtmtypfldindx("sgmnt_data","lock_crit_with_db")=588
+	Set gtmtypes("sgmnt_data",589,"name")="sgmnt_data.basedb_fname_len"
+	Set gtmtypes("sgmnt_data",589,"off")=6464
+	Set gtmtypes("sgmnt_data",589,"len")=4
+	Set gtmtypes("sgmnt_data",589,"type")="unsigned-int"
+	Set gtmtypfldindx("sgmnt_data","basedb_fname_len")=589
+	Set gtmtypes("sgmnt_data",590,"name")="sgmnt_data.basedb_fname"
+	Set gtmtypes("sgmnt_data",590,"off")=6468
+	Set gtmtypes("sgmnt_data",590,"len")=256
+	Set gtmtypes("sgmnt_data",590,"type")="unsigned-char"
+	Set gtmtypfldindx("sgmnt_data","basedb_fname")=590
+	Set gtmtypes("sgmnt_data",591,"name")="sgmnt_data.filler_7k"
+	Set gtmtypes("sgmnt_data",591,"off")=6724
+	Set gtmtypes("sgmnt_data",591,"len")=444
+	Set gtmtypes("sgmnt_data",591,"type")="char"
+	Set gtmtypfldindx("sgmnt_data","filler_7k")=591
+	Set gtmtypes("sgmnt_data",592,"name")="sgmnt_data.filler_8k"
+	Set gtmtypes("sgmnt_data",592,"off")=7168
+	Set gtmtypes("sgmnt_data",592,"len")=1024
+	Set gtmtypes("sgmnt_data",592,"type")="char"
+	Set gtmtypfldindx("sgmnt_data","filler_8k")=592
 	;
 	Set gtmtypes("shm_forw_multi_t")="struct"
 	Set gtmtypes("shm_forw_multi_t",0)=20
@@ -30358,7 +31337,7 @@ Init
 	Set gtmtypes("shm_reg_ctl_t",9,"dim")=3
 	;
 	Set gtmtypes("shm_snapshot_t")="struct"
-	Set gtmtypes("shm_snapshot_t",0)=608
+	Set gtmtypes("shm_snapshot_t",0)=614
 	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
@@ -31351,11 +32330,11 @@ Init
 	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.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,"name")="shm_snapshot_t.shadow_file_header.wcb_gds_rundown2_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_bgtrcrec1_tn")=197
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_gds_rundown2_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
@@ -31646,11 +32625,11 @@ Init
 	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_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,"name")="shm_snapshot_t.shadow_file_header.wcb_wcs_flu0_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_tp_grab_crit_tn")=256
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_wcs_flu0_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
@@ -31671,11 +32650,11 @@ Init
 	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_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,"name")="shm_snapshot_t.shadow_file_header.wcb_gds_rundown1_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_gds_rundown_tn")=261
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_gds_rundown1_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
@@ -32031,1391 +33010,1421 @@ Init
 	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,"name")="shm_snapshot_t.shadow_file_header.jnlbuff_phs2cmt_array_full_tn"
 	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.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.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.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",333,"len")=8
+	Set gtmtypes("shm_snapshot_t",333,"type")="uint64_t"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.jnlbuff_phs2cmt_array_full_tn")=333
+	Set gtmtypes("shm_snapshot_t",334,"name")="shm_snapshot_t.shadow_file_header.jnl_phase2_cleanup_if_possible_tn"
+	Set gtmtypes("shm_snapshot_t",334,"off")=7392
+	Set gtmtypes("shm_snapshot_t",334,"len")=8
+	Set gtmtypes("shm_snapshot_t",334,"type")="uint64_t"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.jnl_phase2_cleanup_if_possible_tn")=334
+	Set gtmtypes("shm_snapshot_t",335,"name")="shm_snapshot_t.shadow_file_header.jnlbuff_phs2cmt_isprcalv_tn"
+	Set gtmtypes("shm_snapshot_t",335,"off")=7400
+	Set gtmtypes("shm_snapshot_t",335,"len")=8
+	Set gtmtypes("shm_snapshot_t",335,"type")="uint64_t"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.jnlbuff_phs2cmt_isprcalv_tn")=335
+	Set gtmtypes("shm_snapshot_t",336,"name")="shm_snapshot_t.shadow_file_header.bg_trc_rec_tn_filler"
+	Set gtmtypes("shm_snapshot_t",336,"off")=7408
+	Set gtmtypes("shm_snapshot_t",336,"len")=24
+	Set gtmtypes("shm_snapshot_t",336,"type")="char"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.bg_trc_rec_tn_filler")=336
+	Set gtmtypes("shm_snapshot_t",337,"name")="shm_snapshot_t.shadow_file_header.total_buffer_flush_cntr"
+	Set gtmtypes("shm_snapshot_t",337,"off")=7432
 	Set gtmtypes("shm_snapshot_t",337,"len")=4
 	Set gtmtypes("shm_snapshot_t",337,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.total_buffer_flush_cntr")=337
+	Set gtmtypes("shm_snapshot_t",338,"name")="shm_snapshot_t.shadow_file_header.bufct_buffer_flush_cntr"
+	Set gtmtypes("shm_snapshot_t",338,"off")=7436
 	Set gtmtypes("shm_snapshot_t",338,"len")=4
 	Set gtmtypes("shm_snapshot_t",338,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.bufct_buffer_flush_cntr")=338
+	Set gtmtypes("shm_snapshot_t",339,"name")="shm_snapshot_t.shadow_file_header.bufct_buffer_flush_loop_cntr"
+	Set gtmtypes("shm_snapshot_t",339,"off")=7440
 	Set gtmtypes("shm_snapshot_t",339,"len")=4
 	Set gtmtypes("shm_snapshot_t",339,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.bufct_buffer_flush_loop_cntr")=339
+	Set gtmtypes("shm_snapshot_t",340,"name")="shm_snapshot_t.shadow_file_header.wrt_calls_cntr"
+	Set gtmtypes("shm_snapshot_t",340,"off")=7444
 	Set gtmtypes("shm_snapshot_t",340,"len")=4
 	Set gtmtypes("shm_snapshot_t",340,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.wrt_calls_cntr")=340
+	Set gtmtypes("shm_snapshot_t",341,"name")="shm_snapshot_t.shadow_file_header.wrt_count_cntr"
+	Set gtmtypes("shm_snapshot_t",341,"off")=7448
 	Set gtmtypes("shm_snapshot_t",341,"len")=4
 	Set gtmtypes("shm_snapshot_t",341,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.wrt_count_cntr")=341
+	Set gtmtypes("shm_snapshot_t",342,"name")="shm_snapshot_t.shadow_file_header.wrt_blocked_cntr"
+	Set gtmtypes("shm_snapshot_t",342,"off")=7452
 	Set gtmtypes("shm_snapshot_t",342,"len")=4
 	Set gtmtypes("shm_snapshot_t",342,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.wrt_blocked_cntr")=342
+	Set gtmtypes("shm_snapshot_t",343,"name")="shm_snapshot_t.shadow_file_header.wrt_busy_cntr"
+	Set gtmtypes("shm_snapshot_t",343,"off")=7456
 	Set gtmtypes("shm_snapshot_t",343,"len")=4
 	Set gtmtypes("shm_snapshot_t",343,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.wrt_busy_cntr")=343
+	Set gtmtypes("shm_snapshot_t",344,"name")="shm_snapshot_t.shadow_file_header.wrt_noblks_wrtn_cntr"
+	Set gtmtypes("shm_snapshot_t",344,"off")=7460
 	Set gtmtypes("shm_snapshot_t",344,"len")=4
 	Set gtmtypes("shm_snapshot_t",344,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.wrt_noblks_wrtn_cntr")=344
+	Set gtmtypes("shm_snapshot_t",345,"name")="shm_snapshot_t.shadow_file_header.wcb_gds_rundown2_cntr"
+	Set gtmtypes("shm_snapshot_t",345,"off")=7464
 	Set gtmtypes("shm_snapshot_t",345,"len")=4
 	Set gtmtypes("shm_snapshot_t",345,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_gds_rundown2_cntr")=345
+	Set gtmtypes("shm_snapshot_t",346,"name")="shm_snapshot_t.shadow_file_header.reserved_bgtrcrec2_cntr"
+	Set gtmtypes("shm_snapshot_t",346,"off")=7468
 	Set gtmtypes("shm_snapshot_t",346,"len")=4
 	Set gtmtypes("shm_snapshot_t",346,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.reserved_bgtrcrec2_cntr")=346
+	Set gtmtypes("shm_snapshot_t",347,"name")="shm_snapshot_t.shadow_file_header.reserved_bgtrcrec3_cntr"
+	Set gtmtypes("shm_snapshot_t",347,"off")=7472
 	Set gtmtypes("shm_snapshot_t",347,"len")=4
 	Set gtmtypes("shm_snapshot_t",347,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.reserved_bgtrcrec3_cntr")=347
+	Set gtmtypes("shm_snapshot_t",348,"name")="shm_snapshot_t.shadow_file_header.lost_block_recovery_cntr"
+	Set gtmtypes("shm_snapshot_t",348,"off")=7476
 	Set gtmtypes("shm_snapshot_t",348,"len")=4
 	Set gtmtypes("shm_snapshot_t",348,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.lost_block_recovery_cntr")=348
+	Set gtmtypes("shm_snapshot_t",349,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_onln_rlbk_cntr"
+	Set gtmtypes("shm_snapshot_t",349,"off")=7480
 	Set gtmtypes("shm_snapshot_t",349,"len")=4
 	Set gtmtypes("shm_snapshot_t",349,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_onln_rlbk_cntr")=349
+	Set gtmtypes("shm_snapshot_t",350,"name")="shm_snapshot_t.shadow_file_header.stale_cntr"
+	Set gtmtypes("shm_snapshot_t",350,"off")=7484
 	Set gtmtypes("shm_snapshot_t",350,"len")=4
 	Set gtmtypes("shm_snapshot_t",350,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.stale_cntr")=350
+	Set gtmtypes("shm_snapshot_t",351,"name")="shm_snapshot_t.shadow_file_header.starved_cntr"
+	Set gtmtypes("shm_snapshot_t",351,"off")=7488
 	Set gtmtypes("shm_snapshot_t",351,"len")=4
 	Set gtmtypes("shm_snapshot_t",351,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.starved_cntr")=351
+	Set gtmtypes("shm_snapshot_t",352,"name")="shm_snapshot_t.shadow_file_header.stale_timer_started_cntr"
+	Set gtmtypes("shm_snapshot_t",352,"off")=7492
 	Set gtmtypes("shm_snapshot_t",352,"len")=4
 	Set gtmtypes("shm_snapshot_t",352,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.stale_timer_started_cntr")=352
+	Set gtmtypes("shm_snapshot_t",353,"name")="shm_snapshot_t.shadow_file_header.stale_timer_pop_cntr"
+	Set gtmtypes("shm_snapshot_t",353,"off")=7496
 	Set gtmtypes("shm_snapshot_t",353,"len")=4
 	Set gtmtypes("shm_snapshot_t",353,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.stale_timer_pop_cntr")=353
+	Set gtmtypes("shm_snapshot_t",354,"name")="shm_snapshot_t.shadow_file_header.stale_process_defer_cntr"
+	Set gtmtypes("shm_snapshot_t",354,"off")=7500
 	Set gtmtypes("shm_snapshot_t",354,"len")=4
 	Set gtmtypes("shm_snapshot_t",354,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.stale_process_defer_cntr")=354
+	Set gtmtypes("shm_snapshot_t",355,"name")="shm_snapshot_t.shadow_file_header.stale_defer_processed_cntr"
+	Set gtmtypes("shm_snapshot_t",355,"off")=7504
 	Set gtmtypes("shm_snapshot_t",355,"len")=4
 	Set gtmtypes("shm_snapshot_t",355,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.stale_defer_processed_cntr")=355
+	Set gtmtypes("shm_snapshot_t",356,"name")="shm_snapshot_t.shadow_file_header.spcfc_buffer_flush_cntr"
+	Set gtmtypes("shm_snapshot_t",356,"off")=7508
 	Set gtmtypes("shm_snapshot_t",356,"len")=4
 	Set gtmtypes("shm_snapshot_t",356,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.spcfc_buffer_flush_cntr")=356
+	Set gtmtypes("shm_snapshot_t",357,"name")="shm_snapshot_t.shadow_file_header.spcfc_buffer_flush_loop_cntr"
+	Set gtmtypes("shm_snapshot_t",357,"off")=7512
 	Set gtmtypes("shm_snapshot_t",357,"len")=4
 	Set gtmtypes("shm_snapshot_t",357,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.spcfc_buffer_flush_loop_cntr")=357
+	Set gtmtypes("shm_snapshot_t",358,"name")="shm_snapshot_t.shadow_file_header.spcfc_buffer_flush_retries_cntr"
+	Set gtmtypes("shm_snapshot_t",358,"off")=7516
 	Set gtmtypes("shm_snapshot_t",358,"len")=4
 	Set gtmtypes("shm_snapshot_t",358,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.spcfc_buffer_flush_retries_cntr")=358
+	Set gtmtypes("shm_snapshot_t",359,"name")="shm_snapshot_t.shadow_file_header.spcfc_buffer_flushed_during_lockwait_cntr"
+	Set gtmtypes("shm_snapshot_t",359,"off")=7520
 	Set gtmtypes("shm_snapshot_t",359,"len")=4
 	Set gtmtypes("shm_snapshot_t",359,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.spcfc_buffer_flushed_during_lockwait_cntr")=359
+	Set gtmtypes("shm_snapshot_t",360,"name")="shm_snapshot_t.shadow_file_header.tp_crit_retries_cntr"
+	Set gtmtypes("shm_snapshot_t",360,"off")=7524
 	Set gtmtypes("shm_snapshot_t",360,"len")=4
 	Set gtmtypes("shm_snapshot_t",360,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.tp_crit_retries_cntr")=360
+	Set gtmtypes("shm_snapshot_t",361,"name")="shm_snapshot_t.shadow_file_header.db_csh_getn_flush_dirty_cntr"
+	Set gtmtypes("shm_snapshot_t",361,"off")=7528
 	Set gtmtypes("shm_snapshot_t",361,"len")=4
 	Set gtmtypes("shm_snapshot_t",361,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.db_csh_getn_flush_dirty_cntr")=361
+	Set gtmtypes("shm_snapshot_t",362,"name")="shm_snapshot_t.shadow_file_header.db_csh_getn_rip_wait_cntr"
+	Set gtmtypes("shm_snapshot_t",362,"off")=7532
 	Set gtmtypes("shm_snapshot_t",362,"len")=4
 	Set gtmtypes("shm_snapshot_t",362,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.db_csh_getn_rip_wait_cntr")=362
+	Set gtmtypes("shm_snapshot_t",363,"name")="shm_snapshot_t.shadow_file_header.db_csh_getn_buf_owner_stuck_cntr"
+	Set gtmtypes("shm_snapshot_t",363,"off")=7536
 	Set gtmtypes("shm_snapshot_t",363,"len")=4
 	Set gtmtypes("shm_snapshot_t",363,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.db_csh_getn_buf_owner_stuck_cntr")=363
+	Set gtmtypes("shm_snapshot_t",364,"name")="shm_snapshot_t.shadow_file_header.db_csh_getn_out_of_design_cntr"
+	Set gtmtypes("shm_snapshot_t",364,"off")=7540
 	Set gtmtypes("shm_snapshot_t",364,"len")=4
 	Set gtmtypes("shm_snapshot_t",364,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.db_csh_getn_out_of_design_cntr")=364
+	Set gtmtypes("shm_snapshot_t",365,"name")="shm_snapshot_t.shadow_file_header.t_qread_buf_owner_stuck_cntr"
+	Set gtmtypes("shm_snapshot_t",365,"off")=7544
 	Set gtmtypes("shm_snapshot_t",365,"len")=4
 	Set gtmtypes("shm_snapshot_t",365,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.t_qread_buf_owner_stuck_cntr")=365
+	Set gtmtypes("shm_snapshot_t",366,"name")="shm_snapshot_t.shadow_file_header.t_qread_out_of_design_cntr"
+	Set gtmtypes("shm_snapshot_t",366,"off")=7548
 	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_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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.t_qread_out_of_design_cntr")=366
+	Set gtmtypes("shm_snapshot_t",367,"name")="shm_snapshot_t.shadow_file_header.bt_put_flush_dirty_cntr"
+	Set gtmtypes("shm_snapshot_t",367,"off")=7552
 	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_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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.bt_put_flush_dirty_cntr")=367
+	Set gtmtypes("shm_snapshot_t",368,"name")="shm_snapshot_t.shadow_file_header.mlock_wakeups_cntr"
+	Set gtmtypes("shm_snapshot_t",368,"off")=7556
 	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_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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.mlock_wakeups_cntr")=368
+	Set gtmtypes("shm_snapshot_t",369,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_wcs_recover_invoked_cntr"
+	Set gtmtypes("shm_snapshot_t",369,"off")=7560
 	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_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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_wcs_recover_invoked_cntr")=369
+	Set gtmtypes("shm_snapshot_t",370,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_wcs_verify_passed_cntr"
+	Set gtmtypes("shm_snapshot_t",370,"off")=7564
 	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_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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_wcs_verify_passed_cntr")=370
+	Set gtmtypes("shm_snapshot_t",371,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_t_qread_db_csh_getn_invalid_blk_cntr"
+	Set gtmtypes("shm_snapshot_t",371,"off")=7568
 	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_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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_t_qread_db_csh_getn_invalid_blk_cntr")=371
+	Set gtmtypes("shm_snapshot_t",372,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_t_qread_db_csh_get_invalid_blk_cntr"
+	Set gtmtypes("shm_snapshot_t",372,"off")=7572
 	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_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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_t_qread_db_csh_get_invalid_blk_cntr")=372
+	Set gtmtypes("shm_snapshot_t",373,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_db_csh_getn_loopexceed_cntr"
+	Set gtmtypes("shm_snapshot_t",373,"off")=7576
 	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_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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_db_csh_getn_loopexceed_cntr")=373
+	Set gtmtypes("shm_snapshot_t",374,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_db_csh_getn_wcsstarvewrt_cntr"
+	Set gtmtypes("shm_snapshot_t",374,"off")=7580
 	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_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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_db_csh_getn_wcsstarvewrt_cntr")=374
+	Set gtmtypes("shm_snapshot_t",375,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_db_csh_get_cntr"
+	Set gtmtypes("shm_snapshot_t",375,"off")=7584
 	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_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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_db_csh_get_cntr")=375
+	Set gtmtypes("shm_snapshot_t",376,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_tp_tend_wcsgetspace_cntr"
+	Set gtmtypes("shm_snapshot_t",376,"off")=7588
 	Set gtmtypes("shm_snapshot_t",376,"len")=4
 	Set gtmtypes("shm_snapshot_t",376,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_tp_tend_wcsgetspace_cntr")=376
+	Set gtmtypes("shm_snapshot_t",377,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_tp_tend_t1_cntr"
+	Set gtmtypes("shm_snapshot_t",377,"off")=7592
 	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_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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_tp_tend_t1_cntr")=377
+	Set gtmtypes("shm_snapshot_t",378,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_tp_tend_bitmap_cntr"
+	Set gtmtypes("shm_snapshot_t",378,"off")=7596
 	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_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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_tp_tend_bitmap_cntr")=378
+	Set gtmtypes("shm_snapshot_t",379,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_tp_tend_jnl_cwset_cntr"
+	Set gtmtypes("shm_snapshot_t",379,"off")=7600
 	Set gtmtypes("shm_snapshot_t",379,"len")=4
 	Set gtmtypes("shm_snapshot_t",379,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_tp_tend_jnl_cwset_cntr")=379
+	Set gtmtypes("shm_snapshot_t",380,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_tp_tend_jnl_wcsflu_cntr"
+	Set gtmtypes("shm_snapshot_t",380,"off")=7604
 	Set gtmtypes("shm_snapshot_t",380,"len")=4
 	Set gtmtypes("shm_snapshot_t",380,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_tp_tend_jnl_wcsflu_cntr")=380
+	Set gtmtypes("shm_snapshot_t",381,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_t_end_hist_cntr"
+	Set gtmtypes("shm_snapshot_t",381,"off")=7608
 	Set gtmtypes("shm_snapshot_t",381,"len")=4
 	Set gtmtypes("shm_snapshot_t",381,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_t_end_hist_cntr")=381
+	Set gtmtypes("shm_snapshot_t",382,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_t_end_hist1_nullbt_cntr"
+	Set gtmtypes("shm_snapshot_t",382,"off")=7612
 	Set gtmtypes("shm_snapshot_t",382,"len")=4
 	Set gtmtypes("shm_snapshot_t",382,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_t_end_hist1_nullbt_cntr")=382
+	Set gtmtypes("shm_snapshot_t",383,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_t_end_hist1_nonnullbt_cntr"
+	Set gtmtypes("shm_snapshot_t",383,"off")=7616
 	Set gtmtypes("shm_snapshot_t",383,"len")=4
 	Set gtmtypes("shm_snapshot_t",383,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_t_end_hist1_nonnullbt_cntr")=383
+	Set gtmtypes("shm_snapshot_t",384,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_t_end_bitmap_nullbt_cntr"
+	Set gtmtypes("shm_snapshot_t",384,"off")=7620
 	Set gtmtypes("shm_snapshot_t",384,"len")=4
 	Set gtmtypes("shm_snapshot_t",384,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_t_end_bitmap_nullbt_cntr")=384
+	Set gtmtypes("shm_snapshot_t",385,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_t_end_bitmap_nonnullbt_cntr"
+	Set gtmtypes("shm_snapshot_t",385,"off")=7624
 	Set gtmtypes("shm_snapshot_t",385,"len")=4
 	Set gtmtypes("shm_snapshot_t",385,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_t_end_bitmap_nonnullbt_cntr")=385
+	Set gtmtypes("shm_snapshot_t",386,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_t_end_jnl_cwset_cntr"
+	Set gtmtypes("shm_snapshot_t",386,"off")=7628
 	Set gtmtypes("shm_snapshot_t",386,"len")=4
 	Set gtmtypes("shm_snapshot_t",386,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_t_end_jnl_cwset_cntr")=386
+	Set gtmtypes("shm_snapshot_t",387,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_t_end_jnl_wcsflu_cntr"
+	Set gtmtypes("shm_snapshot_t",387,"off")=7632
 	Set gtmtypes("shm_snapshot_t",387,"len")=4
 	Set gtmtypes("shm_snapshot_t",387,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_t_end_jnl_wcsflu_cntr")=387
+	Set gtmtypes("shm_snapshot_t",388,"name")="shm_snapshot_t.shadow_file_header.db_csh_get_too_many_loops_cntr"
+	Set gtmtypes("shm_snapshot_t",388,"off")=7636
 	Set gtmtypes("shm_snapshot_t",388,"len")=4
 	Set gtmtypes("shm_snapshot_t",388,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.db_csh_get_too_many_loops_cntr")=388
+	Set gtmtypes("shm_snapshot_t",389,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_tpckh_hist1_nullbt_cntr"
+	Set gtmtypes("shm_snapshot_t",389,"off")=7640
 	Set gtmtypes("shm_snapshot_t",389,"len")=4
 	Set gtmtypes("shm_snapshot_t",389,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_tpckh_hist1_nullbt_cntr")=389
+	Set gtmtypes("shm_snapshot_t",390,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_tpckh_hist1_nonnullbt_cntr"
+	Set gtmtypes("shm_snapshot_t",390,"off")=7644
 	Set gtmtypes("shm_snapshot_t",390,"len")=4
 	Set gtmtypes("shm_snapshot_t",390,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_tpckh_hist1_nonnullbt_cntr")=390
+	Set gtmtypes("shm_snapshot_t",391,"name")="shm_snapshot_t.shadow_file_header.jnl_blocked_writer_lost_cntr"
+	Set gtmtypes("shm_snapshot_t",391,"off")=7648
 	Set gtmtypes("shm_snapshot_t",391,"len")=4
 	Set gtmtypes("shm_snapshot_t",391,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.jnl_blocked_writer_lost_cntr")=391
+	Set gtmtypes("shm_snapshot_t",392,"name")="shm_snapshot_t.shadow_file_header.jnl_blocked_writer_stuck_cntr"
+	Set gtmtypes("shm_snapshot_t",392,"off")=7652
 	Set gtmtypes("shm_snapshot_t",392,"len")=4
 	Set gtmtypes("shm_snapshot_t",392,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.jnl_blocked_writer_stuck_cntr")=392
+	Set gtmtypes("shm_snapshot_t",393,"name")="shm_snapshot_t.shadow_file_header.jnl_blocked_writer_blocked_cntr"
+	Set gtmtypes("shm_snapshot_t",393,"off")=7656
 	Set gtmtypes("shm_snapshot_t",393,"len")=4
 	Set gtmtypes("shm_snapshot_t",393,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.jnl_blocked_writer_blocked_cntr")=393
+	Set gtmtypes("shm_snapshot_t",394,"name")="shm_snapshot_t.shadow_file_header.n_jnl_fsyncs_cntr"
+	Set gtmtypes("shm_snapshot_t",394,"off")=7660
 	Set gtmtypes("shm_snapshot_t",394,"len")=4
 	Set gtmtypes("shm_snapshot_t",394,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_jnl_fsyncs_cntr")=394
+	Set gtmtypes("shm_snapshot_t",395,"name")="shm_snapshot_t.shadow_file_header.n_jnl_fsync_tries_cntr"
+	Set gtmtypes("shm_snapshot_t",395,"off")=7664
 	Set gtmtypes("shm_snapshot_t",395,"len")=4
 	Set gtmtypes("shm_snapshot_t",395,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_jnl_fsync_tries_cntr")=395
+	Set gtmtypes("shm_snapshot_t",396,"name")="shm_snapshot_t.shadow_file_header.n_jnl_fsync_recovers_cntr"
+	Set gtmtypes("shm_snapshot_t",396,"off")=7668
 	Set gtmtypes("shm_snapshot_t",396,"len")=4
 	Set gtmtypes("shm_snapshot_t",396,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_jnl_fsync_recovers_cntr")=396
+	Set gtmtypes("shm_snapshot_t",397,"name")="shm_snapshot_t.shadow_file_header.n_db_fsyncs_cntr"
+	Set gtmtypes("shm_snapshot_t",397,"off")=7672
 	Set gtmtypes("shm_snapshot_t",397,"len")=4
 	Set gtmtypes("shm_snapshot_t",397,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_db_fsyncs_cntr")=397
+	Set gtmtypes("shm_snapshot_t",398,"name")="shm_snapshot_t.shadow_file_header.n_db_fsyncs_in_crit_cntr"
+	Set gtmtypes("shm_snapshot_t",398,"off")=7676
 	Set gtmtypes("shm_snapshot_t",398,"len")=4
 	Set gtmtypes("shm_snapshot_t",398,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_db_fsyncs_in_crit_cntr")=398
+	Set gtmtypes("shm_snapshot_t",399,"name")="shm_snapshot_t.shadow_file_header.n_dbsync_timers_cntr"
+	Set gtmtypes("shm_snapshot_t",399,"off")=7680
 	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_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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_dbsync_timers_cntr")=399
+	Set gtmtypes("shm_snapshot_t",400,"name")="shm_snapshot_t.shadow_file_header.n_dbsync_writes_cntr"
+	Set gtmtypes("shm_snapshot_t",400,"off")=7684
 	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_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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_dbsync_writes_cntr")=400
+	Set gtmtypes("shm_snapshot_t",401,"name")="shm_snapshot_t.shadow_file_header.mutex_queue_full_cntr"
+	Set gtmtypes("shm_snapshot_t",401,"off")=7688
 	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_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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.mutex_queue_full_cntr")=401
+	Set gtmtypes("shm_snapshot_t",402,"name")="shm_snapshot_t.shadow_file_header.wcb_bt_put_cntr"
+	Set gtmtypes("shm_snapshot_t",402,"off")=7692
 	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_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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_bt_put_cntr")=402
+	Set gtmtypes("shm_snapshot_t",403,"name")="shm_snapshot_t.shadow_file_header.wcb_mutex_salvage_cntr"
+	Set gtmtypes("shm_snapshot_t",403,"off")=7696
 	Set gtmtypes("shm_snapshot_t",403,"len")=4
 	Set gtmtypes("shm_snapshot_t",403,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_mutex_salvage_cntr")=403
+	Set gtmtypes("shm_snapshot_t",404,"name")="shm_snapshot_t.shadow_file_header.wcb_wcs_flu0_cntr"
+	Set gtmtypes("shm_snapshot_t",404,"off")=7700
 	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_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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_wcs_flu0_cntr")=404
+	Set gtmtypes("shm_snapshot_t",405,"name")="shm_snapshot_t.shadow_file_header.wcb_t_end_sysops_nocr_invcr_cntr"
+	Set gtmtypes("shm_snapshot_t",405,"off")=7704
 	Set gtmtypes("shm_snapshot_t",405,"len")=4
 	Set gtmtypes("shm_snapshot_t",405,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_t_end_sysops_nocr_invcr_cntr")=405
+	Set gtmtypes("shm_snapshot_t",406,"name")="shm_snapshot_t.shadow_file_header.wcb_t_end_sysops_cr_invcr_cntr"
+	Set gtmtypes("shm_snapshot_t",406,"off")=7708
 	Set gtmtypes("shm_snapshot_t",406,"len")=4
 	Set gtmtypes("shm_snapshot_t",406,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_t_end_sysops_cr_invcr_cntr")=406
+	Set gtmtypes("shm_snapshot_t",407,"name")="shm_snapshot_t.shadow_file_header.wcb_t_end_sysops_rip_wait_cntr"
+	Set gtmtypes("shm_snapshot_t",407,"off")=7712
 	Set gtmtypes("shm_snapshot_t",407,"len")=4
 	Set gtmtypes("shm_snapshot_t",407,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_t_end_sysops_rip_wait_cntr")=407
+	Set gtmtypes("shm_snapshot_t",408,"name")="shm_snapshot_t.shadow_file_header.wcb_t_end_sysops_dirtyripwait_cntr"
+	Set gtmtypes("shm_snapshot_t",408,"off")=7716
 	Set gtmtypes("shm_snapshot_t",408,"len")=4
 	Set gtmtypes("shm_snapshot_t",408,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_t_end_sysops_dirtyripwait_cntr")=408
+	Set gtmtypes("shm_snapshot_t",409,"name")="shm_snapshot_t.shadow_file_header.wcb_gds_rundown1_cntr"
+	Set gtmtypes("shm_snapshot_t",409,"off")=7720
 	Set gtmtypes("shm_snapshot_t",409,"len")=4
 	Set gtmtypes("shm_snapshot_t",409,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_gds_rundown1_cntr")=409
+	Set gtmtypes("shm_snapshot_t",410,"name")="shm_snapshot_t.shadow_file_header.wcb_wcs_flu1_cntr"
+	Set gtmtypes("shm_snapshot_t",410,"off")=7724
 	Set gtmtypes("shm_snapshot_t",410,"len")=4
 	Set gtmtypes("shm_snapshot_t",410,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_wcs_flu1_cntr")=410
+	Set gtmtypes("shm_snapshot_t",411,"name")="shm_snapshot_t.shadow_file_header.wcb_mu_back_cntr"
+	Set gtmtypes("shm_snapshot_t",411,"off")=7728
 	Set gtmtypes("shm_snapshot_t",411,"len")=4
 	Set gtmtypes("shm_snapshot_t",411,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_mu_back_cntr")=411
+	Set gtmtypes("shm_snapshot_t",412,"name")="shm_snapshot_t.shadow_file_header.wcb_t_end_sysops_dirty_invcr_cntr"
+	Set gtmtypes("shm_snapshot_t",412,"off")=7732
 	Set gtmtypes("shm_snapshot_t",412,"len")=4
 	Set gtmtypes("shm_snapshot_t",412,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_t_end_sysops_dirty_invcr_cntr")=412
+	Set gtmtypes("shm_snapshot_t",413,"name")="shm_snapshot_t.shadow_file_header.wcb_t_end_sysops_wtfini_fail_cntr"
+	Set gtmtypes("shm_snapshot_t",413,"off")=7736
 	Set gtmtypes("shm_snapshot_t",413,"len")=4
 	Set gtmtypes("shm_snapshot_t",413,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_t_end_sysops_wtfini_fail_cntr")=413
+	Set gtmtypes("shm_snapshot_t",414,"name")="shm_snapshot_t.shadow_file_header.wcb_t_end_sysops_twin_stuck_cntr"
+	Set gtmtypes("shm_snapshot_t",414,"off")=7740
 	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_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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_t_end_sysops_twin_stuck_cntr")=414
+	Set gtmtypes("shm_snapshot_t",415,"name")="shm_snapshot_t.shadow_file_header.db_csh_getn_wrt_latch_stuck_cntr"
+	Set gtmtypes("shm_snapshot_t",415,"off")=7744
 	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_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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.db_csh_getn_wrt_latch_stuck_cntr")=415
+	Set gtmtypes("shm_snapshot_t",416,"name")="shm_snapshot_t.shadow_file_header.wcb_secshr_db_clnup_now_crit_cntr"
+	Set gtmtypes("shm_snapshot_t",416,"off")=7748
 	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_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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_secshr_db_clnup_now_crit_cntr")=416
+	Set gtmtypes("shm_snapshot_t",417,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_t_qread_bad_bt_index1_cntr"
+	Set gtmtypes("shm_snapshot_t",417,"off")=7752
 	Set gtmtypes("shm_snapshot_t",417,"len")=4
 	Set gtmtypes("shm_snapshot_t",417,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_t_qread_bad_bt_index1_cntr")=417
+	Set gtmtypes("shm_snapshot_t",418,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_t_qread_bad_bt_index2_cntr"
+	Set gtmtypes("shm_snapshot_t",418,"off")=7756
 	Set gtmtypes("shm_snapshot_t",418,"len")=4
 	Set gtmtypes("shm_snapshot_t",418,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_t_qread_bad_bt_index2_cntr")=418
+	Set gtmtypes("shm_snapshot_t",419,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_t_end_crbtmismatch1_cntr"
+	Set gtmtypes("shm_snapshot_t",419,"off")=7760
 	Set gtmtypes("shm_snapshot_t",419,"len")=4
 	Set gtmtypes("shm_snapshot_t",419,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_t_end_crbtmismatch1_cntr")=419
+	Set gtmtypes("shm_snapshot_t",420,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_t_end_crbtmismatch2_cntr"
+	Set gtmtypes("shm_snapshot_t",420,"off")=7764
 	Set gtmtypes("shm_snapshot_t",420,"len")=4
 	Set gtmtypes("shm_snapshot_t",420,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_t_end_crbtmismatch2_cntr")=420
+	Set gtmtypes("shm_snapshot_t",421,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_t_end_crbtmismatch3_cntr"
+	Set gtmtypes("shm_snapshot_t",421,"off")=7768
 	Set gtmtypes("shm_snapshot_t",421,"len")=4
 	Set gtmtypes("shm_snapshot_t",421,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_t_end_crbtmismatch3_cntr")=421
+	Set gtmtypes("shm_snapshot_t",422,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_tp_tend_crbtmismatch1_cntr"
+	Set gtmtypes("shm_snapshot_t",422,"off")=7772
 	Set gtmtypes("shm_snapshot_t",422,"len")=4
 	Set gtmtypes("shm_snapshot_t",422,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_tp_tend_crbtmismatch1_cntr")=422
+	Set gtmtypes("shm_snapshot_t",423,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_tp_tend_crbtmismatch2_cntr"
+	Set gtmtypes("shm_snapshot_t",423,"off")=7776
 	Set gtmtypes("shm_snapshot_t",423,"len")=4
 	Set gtmtypes("shm_snapshot_t",423,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_tp_tend_crbtmismatch2_cntr")=423
+	Set gtmtypes("shm_snapshot_t",424,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_tp_tend_crbtmismatch3_cntr"
+	Set gtmtypes("shm_snapshot_t",424,"off")=7780
 	Set gtmtypes("shm_snapshot_t",424,"len")=4
 	Set gtmtypes("shm_snapshot_t",424,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_tp_tend_crbtmismatch3_cntr")=424
+	Set gtmtypes("shm_snapshot_t",425,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_wcs_wtstart_bad_cr_cntr"
+	Set gtmtypes("shm_snapshot_t",425,"off")=7784
 	Set gtmtypes("shm_snapshot_t",425,"len")=4
 	Set gtmtypes("shm_snapshot_t",425,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_wcs_wtstart_bad_cr_cntr")=425
+	Set gtmtypes("shm_snapshot_t",426,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_wcs_wtfini_bad_cr_cntr"
+	Set gtmtypes("shm_snapshot_t",426,"off")=7788
 	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_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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_wcs_wtfini_bad_cr_cntr")=426
+	Set gtmtypes("shm_snapshot_t",427,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_bt_get_cntr"
+	Set gtmtypes("shm_snapshot_t",427,"off")=7792
 	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_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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_bt_get_cntr")=427
+	Set gtmtypes("shm_snapshot_t",428,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_wcs_cdb_sc_final_retry_cntr"
+	Set gtmtypes("shm_snapshot_t",428,"off")=7796
 	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_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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_wcs_cdb_sc_final_retry_cntr")=428
+	Set gtmtypes("shm_snapshot_t",429,"name")="shm_snapshot_t.shadow_file_header.wcb_bg_update_lckfail1_cntr"
+	Set gtmtypes("shm_snapshot_t",429,"off")=7800
 	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_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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_bg_update_lckfail1_cntr")=429
+	Set gtmtypes("shm_snapshot_t",430,"name")="shm_snapshot_t.shadow_file_header.wcb_bg_update_lckfail2_cntr"
+	Set gtmtypes("shm_snapshot_t",430,"off")=7804
 	Set gtmtypes("shm_snapshot_t",430,"len")=4
 	Set gtmtypes("shm_snapshot_t",430,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_bg_update_lckfail2_cntr")=430
+	Set gtmtypes("shm_snapshot_t",431,"name")="shm_snapshot_t.shadow_file_header.wcb_wtstart_lckfail1_cntr"
+	Set gtmtypes("shm_snapshot_t",431,"off")=7808
 	Set gtmtypes("shm_snapshot_t",431,"len")=4
 	Set gtmtypes("shm_snapshot_t",431,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_wtstart_lckfail1_cntr")=431
+	Set gtmtypes("shm_snapshot_t",432,"name")="shm_snapshot_t.shadow_file_header.wcb_wtstart_lckfail2_cntr"
+	Set gtmtypes("shm_snapshot_t",432,"off")=7812
 	Set gtmtypes("shm_snapshot_t",432,"len")=4
 	Set gtmtypes("shm_snapshot_t",432,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_wtstart_lckfail2_cntr")=432
+	Set gtmtypes("shm_snapshot_t",433,"name")="shm_snapshot_t.shadow_file_header.wcb_wtstart_lckfail3_cntr"
+	Set gtmtypes("shm_snapshot_t",433,"off")=7816
 	Set gtmtypes("shm_snapshot_t",433,"len")=4
 	Set gtmtypes("shm_snapshot_t",433,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_wtstart_lckfail3_cntr")=433
+	Set gtmtypes("shm_snapshot_t",434,"name")="shm_snapshot_t.shadow_file_header.wcb_wtstart_lckfail4_cntr"
+	Set gtmtypes("shm_snapshot_t",434,"off")=7820
 	Set gtmtypes("shm_snapshot_t",434,"len")=4
 	Set gtmtypes("shm_snapshot_t",434,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_wtstart_lckfail4_cntr")=434
+	Set gtmtypes("shm_snapshot_t",435,"name")="shm_snapshot_t.shadow_file_header.wcb_wtfini_lckfail1_cntr"
+	Set gtmtypes("shm_snapshot_t",435,"off")=7824
 	Set gtmtypes("shm_snapshot_t",435,"len")=4
 	Set gtmtypes("shm_snapshot_t",435,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_wtfini_lckfail1_cntr")=435
+	Set gtmtypes("shm_snapshot_t",436,"name")="shm_snapshot_t.shadow_file_header.wcb_wtfini_lckfail2_cntr"
+	Set gtmtypes("shm_snapshot_t",436,"off")=7828
 	Set gtmtypes("shm_snapshot_t",436,"len")=4
 	Set gtmtypes("shm_snapshot_t",436,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_wtfini_lckfail2_cntr")=436
+	Set gtmtypes("shm_snapshot_t",437,"name")="shm_snapshot_t.shadow_file_header.wcb_wtfini_lckfail3_cntr"
+	Set gtmtypes("shm_snapshot_t",437,"off")=7832
 	Set gtmtypes("shm_snapshot_t",437,"len")=4
 	Set gtmtypes("shm_snapshot_t",437,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_wtfini_lckfail3_cntr")=437
+	Set gtmtypes("shm_snapshot_t",438,"name")="shm_snapshot_t.shadow_file_header.wcb_wtfini_lckfail4_cntr"
+	Set gtmtypes("shm_snapshot_t",438,"off")=7836
 	Set gtmtypes("shm_snapshot_t",438,"len")=4
 	Set gtmtypes("shm_snapshot_t",438,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_wtfini_lckfail4_cntr")=438
+	Set gtmtypes("shm_snapshot_t",439,"name")="shm_snapshot_t.shadow_file_header.wcb_t_end_sysops_dirtystuck1_cntr"
+	Set gtmtypes("shm_snapshot_t",439,"off")=7840
 	Set gtmtypes("shm_snapshot_t",439,"len")=4
 	Set gtmtypes("shm_snapshot_t",439,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_t_end_sysops_dirtystuck1_cntr")=439
+	Set gtmtypes("shm_snapshot_t",440,"name")="shm_snapshot_t.shadow_file_header.wcb_t_end_sysops_dirtystuck2_cntr"
+	Set gtmtypes("shm_snapshot_t",440,"off")=7844
 	Set gtmtypes("shm_snapshot_t",440,"len")=4
 	Set gtmtypes("shm_snapshot_t",440,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_t_end_sysops_dirtystuck2_cntr")=440
+	Set gtmtypes("shm_snapshot_t",441,"name")="shm_snapshot_t.shadow_file_header.wcb_secshr_db_clnup_wbuf_dqd_cntr"
+	Set gtmtypes("shm_snapshot_t",441,"off")=7848
 	Set gtmtypes("shm_snapshot_t",441,"len")=4
 	Set gtmtypes("shm_snapshot_t",441,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_secshr_db_clnup_wbuf_dqd_cntr")=441
+	Set gtmtypes("shm_snapshot_t",442,"name")="shm_snapshot_t.shadow_file_header.dwngrd_refmts_syncio_cntr"
+	Set gtmtypes("shm_snapshot_t",442,"off")=7852
 	Set gtmtypes("shm_snapshot_t",442,"len")=4
 	Set gtmtypes("shm_snapshot_t",442,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.dwngrd_refmts_syncio_cntr")=442
+	Set gtmtypes("shm_snapshot_t",443,"name")="shm_snapshot_t.shadow_file_header.dwngrd_refmts_asyncio_cntr"
+	Set gtmtypes("shm_snapshot_t",443,"off")=7856
 	Set gtmtypes("shm_snapshot_t",443,"len")=4
 	Set gtmtypes("shm_snapshot_t",443,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.dwngrd_refmts_asyncio_cntr")=443
+	Set gtmtypes("shm_snapshot_t",444,"name")="shm_snapshot_t.shadow_file_header.shmpool_refmt_harvests_cntr"
+	Set gtmtypes("shm_snapshot_t",444,"off")=7860
 	Set gtmtypes("shm_snapshot_t",444,"len")=4
 	Set gtmtypes("shm_snapshot_t",444,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.shmpool_refmt_harvests_cntr")=444
+	Set gtmtypes("shm_snapshot_t",445,"name")="shm_snapshot_t.shadow_file_header.shmpool_recovery_cntr"
+	Set gtmtypes("shm_snapshot_t",445,"off")=7864
 	Set gtmtypes("shm_snapshot_t",445,"len")=4
 	Set gtmtypes("shm_snapshot_t",445,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.shmpool_recovery_cntr")=445
+	Set gtmtypes("shm_snapshot_t",446,"name")="shm_snapshot_t.shadow_file_header.shmpool_blkd_by_sdc_cntr"
+	Set gtmtypes("shm_snapshot_t",446,"off")=7868
 	Set gtmtypes("shm_snapshot_t",446,"len")=4
 	Set gtmtypes("shm_snapshot_t",446,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.shmpool_blkd_by_sdc_cntr")=446
+	Set gtmtypes("shm_snapshot_t",447,"name")="shm_snapshot_t.shadow_file_header.shmpool_alloc_bbflush_cntr"
+	Set gtmtypes("shm_snapshot_t",447,"off")=7872
 	Set gtmtypes("shm_snapshot_t",447,"len")=4
 	Set gtmtypes("shm_snapshot_t",447,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.shmpool_alloc_bbflush_cntr")=447
+	Set gtmtypes("shm_snapshot_t",448,"name")="shm_snapshot_t.shadow_file_header.refmt_hvst_blk_released_replaced_cntr"
+	Set gtmtypes("shm_snapshot_t",448,"off")=7876
 	Set gtmtypes("shm_snapshot_t",448,"len")=4
 	Set gtmtypes("shm_snapshot_t",448,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.refmt_hvst_blk_released_replaced_cntr")=448
+	Set gtmtypes("shm_snapshot_t",449,"name")="shm_snapshot_t.shadow_file_header.refmt_hvst_blk_released_io_complete_cntr"
+	Set gtmtypes("shm_snapshot_t",449,"off")=7880
 	Set gtmtypes("shm_snapshot_t",449,"len")=4
 	Set gtmtypes("shm_snapshot_t",449,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.refmt_hvst_blk_released_io_complete_cntr")=449
+	Set gtmtypes("shm_snapshot_t",450,"name")="shm_snapshot_t.shadow_file_header.refmt_hvst_blk_kept_cntr"
+	Set gtmtypes("shm_snapshot_t",450,"off")=7884
 	Set gtmtypes("shm_snapshot_t",450,"len")=4
 	Set gtmtypes("shm_snapshot_t",450,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.refmt_hvst_blk_kept_cntr")=450
+	Set gtmtypes("shm_snapshot_t",451,"name")="shm_snapshot_t.shadow_file_header.refmt_hvst_blk_ignored_cntr"
+	Set gtmtypes("shm_snapshot_t",451,"off")=7888
 	Set gtmtypes("shm_snapshot_t",451,"len")=4
 	Set gtmtypes("shm_snapshot_t",451,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.refmt_hvst_blk_ignored_cntr")=451
+	Set gtmtypes("shm_snapshot_t",452,"name")="shm_snapshot_t.shadow_file_header.refmt_blk_chk_blk_freed_cntr"
+	Set gtmtypes("shm_snapshot_t",452,"off")=7892
 	Set gtmtypes("shm_snapshot_t",452,"len")=4
 	Set gtmtypes("shm_snapshot_t",452,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.refmt_blk_chk_blk_freed_cntr")=452
+	Set gtmtypes("shm_snapshot_t",453,"name")="shm_snapshot_t.shadow_file_header.refmt_blk_chk_blk_kept_cntr"
+	Set gtmtypes("shm_snapshot_t",453,"off")=7896
 	Set gtmtypes("shm_snapshot_t",453,"len")=4
 	Set gtmtypes("shm_snapshot_t",453,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.refmt_blk_chk_blk_kept_cntr")=453
+	Set gtmtypes("shm_snapshot_t",454,"name")="shm_snapshot_t.shadow_file_header.active_lvl_trigger_cntr"
+	Set gtmtypes("shm_snapshot_t",454,"off")=7900
 	Set gtmtypes("shm_snapshot_t",454,"len")=4
 	Set gtmtypes("shm_snapshot_t",454,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.active_lvl_trigger_cntr")=454
+	Set gtmtypes("shm_snapshot_t",455,"name")="shm_snapshot_t.shadow_file_header.new_buff_cntr"
+	Set gtmtypes("shm_snapshot_t",455,"off")=7904
 	Set gtmtypes("shm_snapshot_t",455,"len")=4
 	Set gtmtypes("shm_snapshot_t",455,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.new_buff_cntr")=455
+	Set gtmtypes("shm_snapshot_t",456,"name")="shm_snapshot_t.shadow_file_header.phase2_commit_wait_sleep_in_crit_cntr"
+	Set gtmtypes("shm_snapshot_t",456,"off")=7908
 	Set gtmtypes("shm_snapshot_t",456,"len")=4
 	Set gtmtypes("shm_snapshot_t",456,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.phase2_commit_wait_sleep_in_crit_cntr")=456
+	Set gtmtypes("shm_snapshot_t",457,"name")="shm_snapshot_t.shadow_file_header.phase2_commit_wait_sleep_no_crit_cntr"
+	Set gtmtypes("shm_snapshot_t",457,"off")=7912
 	Set gtmtypes("shm_snapshot_t",457,"len")=4
 	Set gtmtypes("shm_snapshot_t",457,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.phase2_commit_wait_sleep_no_crit_cntr")=457
+	Set gtmtypes("shm_snapshot_t",458,"name")="shm_snapshot_t.shadow_file_header.phase2_commit_wait_pidcnt_cntr"
+	Set gtmtypes("shm_snapshot_t",458,"off")=7916
 	Set gtmtypes("shm_snapshot_t",458,"len")=4
 	Set gtmtypes("shm_snapshot_t",458,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.phase2_commit_wait_pidcnt_cntr")=458
+	Set gtmtypes("shm_snapshot_t",459,"name")="shm_snapshot_t.shadow_file_header.wcb_t_end_sysops_intend_wait_cntr"
+	Set gtmtypes("shm_snapshot_t",459,"off")=7920
 	Set gtmtypes("shm_snapshot_t",459,"len")=4
 	Set gtmtypes("shm_snapshot_t",459,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_t_end_sysops_intend_wait_cntr")=459
+	Set gtmtypes("shm_snapshot_t",460,"name")="shm_snapshot_t.shadow_file_header.wcb_secshr_db_clnup_phase2_clnup_cntr"
+	Set gtmtypes("shm_snapshot_t",460,"off")=7924
 	Set gtmtypes("shm_snapshot_t",460,"len")=4
 	Set gtmtypes("shm_snapshot_t",460,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_secshr_db_clnup_phase2_clnup_cntr")=460
+	Set gtmtypes("shm_snapshot_t",461,"name")="shm_snapshot_t.shadow_file_header.wcb_phase2_commit_wait_cntr"
+	Set gtmtypes("shm_snapshot_t",461,"off")=7928
 	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_phase2_commit_wait_cntr")=461
+	Set gtmtypes("shm_snapshot_t",462,"name")="shm_snapshot_t.shadow_file_header.recompute_upd_array_calls_cntr"
+	Set gtmtypes("shm_snapshot_t",462,"off")=7932
 	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.recompute_upd_array_calls_cntr")=462
+	Set gtmtypes("shm_snapshot_t",463,"name")="shm_snapshot_t.shadow_file_header.recompute_upd_array_rip_cntr"
+	Set gtmtypes("shm_snapshot_t",463,"off")=7936
 	Set gtmtypes("shm_snapshot_t",463,"len")=4
 	Set gtmtypes("shm_snapshot_t",463,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.recompute_upd_array_rip_cntr")=463
+	Set gtmtypes("shm_snapshot_t",464,"name")="shm_snapshot_t.shadow_file_header.recompute_upd_array_in_tend_cntr"
+	Set gtmtypes("shm_snapshot_t",464,"off")=7940
 	Set gtmtypes("shm_snapshot_t",464,"len")=4
 	Set gtmtypes("shm_snapshot_t",464,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.recompute_upd_array_in_tend_cntr")=464
+	Set gtmtypes("shm_snapshot_t",465,"name")="shm_snapshot_t.shadow_file_header.recompute_upd_array_search_blk_cntr"
+	Set gtmtypes("shm_snapshot_t",465,"off")=7944
 	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.recompute_upd_array_search_blk_cntr")=465
+	Set gtmtypes("shm_snapshot_t",466,"name")="shm_snapshot_t.shadow_file_header.recompute_upd_array_new_rec_cntr"
+	Set gtmtypes("shm_snapshot_t",466,"off")=7948
 	Set gtmtypes("shm_snapshot_t",466,"len")=4
 	Set gtmtypes("shm_snapshot_t",466,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.recompute_upd_array_new_rec_cntr")=466
+	Set gtmtypes("shm_snapshot_t",467,"name")="shm_snapshot_t.shadow_file_header.recompute_upd_array_rec_size_cntr"
+	Set gtmtypes("shm_snapshot_t",467,"off")=7952
 	Set gtmtypes("shm_snapshot_t",467,"len")=4
 	Set gtmtypes("shm_snapshot_t",467,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.recompute_upd_array_rec_size_cntr")=467
+	Set gtmtypes("shm_snapshot_t",468,"name")="shm_snapshot_t.shadow_file_header.recompute_upd_array_rec_cmpc_cntr"
+	Set gtmtypes("shm_snapshot_t",468,"off")=7956
 	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.recompute_upd_array_rec_cmpc_cntr")=468
+	Set gtmtypes("shm_snapshot_t",469,"name")="shm_snapshot_t.shadow_file_header.recompute_upd_array_blk_fini_cntr"
+	Set gtmtypes("shm_snapshot_t",469,"off")=7960
 	Set gtmtypes("shm_snapshot_t",469,"len")=4
 	Set gtmtypes("shm_snapshot_t",469,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.recompute_upd_array_blk_fini_cntr")=469
+	Set gtmtypes("shm_snapshot_t",470,"name")="shm_snapshot_t.shadow_file_header.recompute_upd_array_blk_split_cntr"
+	Set gtmtypes("shm_snapshot_t",470,"off")=7964
 	Set gtmtypes("shm_snapshot_t",470,"len")=4
 	Set gtmtypes("shm_snapshot_t",470,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.recompute_upd_array_blk_split_cntr")=470
+	Set gtmtypes("shm_snapshot_t",471,"name")="shm_snapshot_t.shadow_file_header.t_qread_ripsleep_cnt_cntr"
+	Set gtmtypes("shm_snapshot_t",471,"off")=7968
 	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.t_qread_ripsleep_cnt_cntr")=471
+	Set gtmtypes("shm_snapshot_t",472,"name")="shm_snapshot_t.shadow_file_header.t_qread_ripsleep_nblks_cntr"
+	Set gtmtypes("shm_snapshot_t",472,"off")=7972
 	Set gtmtypes("shm_snapshot_t",472,"len")=4
 	Set gtmtypes("shm_snapshot_t",472,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.t_qread_ripsleep_nblks_cntr")=472
+	Set gtmtypes("shm_snapshot_t",473,"name")="shm_snapshot_t.shadow_file_header.wcs_wtfini_invoked_cntr"
+	Set gtmtypes("shm_snapshot_t",473,"off")=7976
 	Set gtmtypes("shm_snapshot_t",473,"len")=4
 	Set gtmtypes("shm_snapshot_t",473,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcs_wtfini_invoked_cntr")=473
+	Set gtmtypes("shm_snapshot_t",474,"name")="shm_snapshot_t.shadow_file_header.wcs_wterror_invoked_cntr"
+	Set gtmtypes("shm_snapshot_t",474,"off")=7980
 	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcs_wterror_invoked_cntr")=474
+	Set gtmtypes("shm_snapshot_t",475,"name")="shm_snapshot_t.shadow_file_header.wcs_wt_restart_invoked_cntr"
+	Set gtmtypes("shm_snapshot_t",475,"off")=7984
 	Set gtmtypes("shm_snapshot_t",475,"len")=4
 	Set gtmtypes("shm_snapshot_t",475,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcs_wt_restart_invoked_cntr")=475
+	Set gtmtypes("shm_snapshot_t",476,"name")="shm_snapshot_t.shadow_file_header.wcs_wt_restart_eagain_cntr"
+	Set gtmtypes("shm_snapshot_t",476,"off")=7988
 	Set gtmtypes("shm_snapshot_t",476,"len")=4
 	Set gtmtypes("shm_snapshot_t",476,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcs_wt_restart_eagain_cntr")=476
+	Set gtmtypes("shm_snapshot_t",477,"name")="shm_snapshot_t.shadow_file_header.wcs_wt_restart_reinsert_cntr"
+	Set gtmtypes("shm_snapshot_t",477,"off")=7992
 	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcs_wt_restart_reinsert_cntr")=477
+	Set gtmtypes("shm_snapshot_t",478,"name")="shm_snapshot_t.shadow_file_header.wcs_wtstart_eagain_cntr"
+	Set gtmtypes("shm_snapshot_t",478,"off")=7996
+	Set gtmtypes("shm_snapshot_t",478,"len")=4
+	Set gtmtypes("shm_snapshot_t",478,"type")="int"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcs_wtstart_eagain_cntr")=478
+	Set gtmtypes("shm_snapshot_t",479,"name")="shm_snapshot_t.shadow_file_header.wcs_wtstart_eagain_incrit_cntr"
+	Set gtmtypes("shm_snapshot_t",479,"off")=8000
+	Set gtmtypes("shm_snapshot_t",479,"len")=4
+	Set gtmtypes("shm_snapshot_t",479,"type")="int"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcs_wtstart_eagain_incrit_cntr")=479
+	Set gtmtypes("shm_snapshot_t",480,"name")="shm_snapshot_t.shadow_file_header.async_restart_eagain_cntr"
+	Set gtmtypes("shm_snapshot_t",480,"off")=8004
 	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.async_restart_eagain_cntr")=480
+	Set gtmtypes("shm_snapshot_t",481,"name")="shm_snapshot_t.shadow_file_header.jnlbuff_phs2cmt_array_full_cntr"
+	Set gtmtypes("shm_snapshot_t",481,"off")=8008
 	Set gtmtypes("shm_snapshot_t",481,"len")=4
 	Set gtmtypes("shm_snapshot_t",481,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.jnlbuff_phs2cmt_array_full_cntr")=481
+	Set gtmtypes("shm_snapshot_t",482,"name")="shm_snapshot_t.shadow_file_header.jnl_phase2_cleanup_if_possible_cntr"
+	Set gtmtypes("shm_snapshot_t",482,"off")=8012
+	Set gtmtypes("shm_snapshot_t",482,"len")=4
+	Set gtmtypes("shm_snapshot_t",482,"type")="int"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.jnl_phase2_cleanup_if_possible_cntr")=482
+	Set gtmtypes("shm_snapshot_t",483,"name")="shm_snapshot_t.shadow_file_header.jnlbuff_phs2cmt_isprcalv_cntr"
+	Set gtmtypes("shm_snapshot_t",483,"off")=8016
 	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_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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.jnlbuff_phs2cmt_isprcalv_cntr")=483
+	Set gtmtypes("shm_snapshot_t",484,"name")="shm_snapshot_t.shadow_file_header.bg_trc_rec_cntr_filler"
+	Set gtmtypes("shm_snapshot_t",484,"off")=8020
+	Set gtmtypes("shm_snapshot_t",484,"len")=12
+	Set gtmtypes("shm_snapshot_t",484,"type")="char"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.bg_trc_rec_cntr_filler")=484
+	Set gtmtypes("shm_snapshot_t",485,"name")="shm_snapshot_t.shadow_file_header.n_gvcst_srches"
+	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")=8048
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_gvcst_srches")=485
+	Set gtmtypes("shm_snapshot_t",486,"name")="shm_snapshot_t.shadow_file_header.n_gvcst_srches.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")=8052
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_gvcst_srches.curr_count")=486
+	Set gtmtypes("shm_snapshot_t",487,"name")="shm_snapshot_t.shadow_file_header.n_gvcst_srches.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.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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_gvcst_srches.cumul_count")=487
+	Set gtmtypes("shm_snapshot_t",488,"name")="shm_snapshot_t.shadow_file_header.n_gvcst_srch_clues"
+	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")=8056
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_gvcst_srch_clues")=488
+	Set gtmtypes("shm_snapshot_t",489,"name")="shm_snapshot_t.shadow_file_header.n_gvcst_srch_clues.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")=8060
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_gvcst_srch_clues.curr_count")=489
+	Set gtmtypes("shm_snapshot_t",490,"name")="shm_snapshot_t.shadow_file_header.n_gvcst_srch_clues.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_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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_gvcst_srch_clues.cumul_count")=490
+	Set gtmtypes("shm_snapshot_t",491,"name")="shm_snapshot_t.shadow_file_header.n_clue_used_head"
+	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")=8064
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_clue_used_head")=491
+	Set gtmtypes("shm_snapshot_t",492,"name")="shm_snapshot_t.shadow_file_header.n_clue_used_head.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")=8068
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_clue_used_head.curr_count")=492
+	Set gtmtypes("shm_snapshot_t",493,"name")="shm_snapshot_t.shadow_file_header.n_clue_used_head.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_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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_clue_used_head.cumul_count")=493
+	Set gtmtypes("shm_snapshot_t",494,"name")="shm_snapshot_t.shadow_file_header.n_clue_used_same"
+	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")=8072
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_clue_used_same")=494
+	Set gtmtypes("shm_snapshot_t",495,"name")="shm_snapshot_t.shadow_file_header.n_clue_used_same.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")=8076
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_clue_used_same.curr_count")=495
+	Set gtmtypes("shm_snapshot_t",496,"name")="shm_snapshot_t.shadow_file_header.n_clue_used_same.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_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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_clue_used_same.cumul_count")=496
+	Set gtmtypes("shm_snapshot_t",497,"name")="shm_snapshot_t.shadow_file_header.n_clue_used_tail"
+	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")=8080
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_clue_used_tail")=497
+	Set gtmtypes("shm_snapshot_t",498,"name")="shm_snapshot_t.shadow_file_header.n_clue_used_tail.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")=8084
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_clue_used_tail.curr_count")=498
+	Set gtmtypes("shm_snapshot_t",499,"name")="shm_snapshot_t.shadow_file_header.n_clue_used_tail.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")=8088
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_clue_used_tail.cumul_count")=499
+	Set gtmtypes("shm_snapshot_t",500,"name")="shm_snapshot_t.shadow_file_header.n_t_qreads"
+	Set gtmtypes("shm_snapshot_t",500,"off")=8072
 	Set gtmtypes("shm_snapshot_t",500,"len")=8
 	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_t_qreads")=500
+	Set gtmtypes("shm_snapshot_t",501,"name")="shm_snapshot_t.shadow_file_header.n_t_qreads.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")=8092
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_t_qreads.curr_count")=501
+	Set gtmtypes("shm_snapshot_t",502,"name")="shm_snapshot_t.shadow_file_header.n_t_qreads.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")=8096
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_t_qreads.cumul_count")=502
+	Set gtmtypes("shm_snapshot_t",503,"name")="shm_snapshot_t.shadow_file_header.unused_dsk_reads"
+	Set gtmtypes("shm_snapshot_t",503,"off")=8080
 	Set gtmtypes("shm_snapshot_t",503,"len")=8
 	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.unused_dsk_reads")=503
+	Set gtmtypes("shm_snapshot_t",504,"name")="shm_snapshot_t.shadow_file_header.unused_dsk_reads.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")=8100
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.unused_dsk_reads.curr_count")=504
+	Set gtmtypes("shm_snapshot_t",505,"name")="shm_snapshot_t.shadow_file_header.unused_dsk_reads.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")=8104
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.unused_dsk_reads.cumul_count")=505
+	Set gtmtypes("shm_snapshot_t",506,"name")="shm_snapshot_t.shadow_file_header.n_bgmm_updates"
+	Set gtmtypes("shm_snapshot_t",506,"off")=8088
 	Set gtmtypes("shm_snapshot_t",506,"len")=8
 	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_bgmm_updates")=506
+	Set gtmtypes("shm_snapshot_t",507,"name")="shm_snapshot_t.shadow_file_header.n_bgmm_updates.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")=8108
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_bgmm_updates.curr_count")=507
+	Set gtmtypes("shm_snapshot_t",508,"name")="shm_snapshot_t.shadow_file_header.n_bgmm_updates.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")=8112
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_bgmm_updates.cumul_count")=508
+	Set gtmtypes("shm_snapshot_t",509,"name")="shm_snapshot_t.shadow_file_header.unused_dsk_writes"
+	Set gtmtypes("shm_snapshot_t",509,"off")=8096
 	Set gtmtypes("shm_snapshot_t",509,"len")=8
 	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.unused_dsk_writes")=509
+	Set gtmtypes("shm_snapshot_t",510,"name")="shm_snapshot_t.shadow_file_header.unused_dsk_writes.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")=8116
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.unused_dsk_writes.curr_count")=510
+	Set gtmtypes("shm_snapshot_t",511,"name")="shm_snapshot_t.shadow_file_header.unused_dsk_writes.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")=8120
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.unused_dsk_writes.cumul_count")=511
+	Set gtmtypes("shm_snapshot_t",512,"name")="shm_snapshot_t.shadow_file_header.n_bg_update_creates"
+	Set gtmtypes("shm_snapshot_t",512,"off")=8104
 	Set gtmtypes("shm_snapshot_t",512,"len")=8
 	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_bg_update_creates")=512
+	Set gtmtypes("shm_snapshot_t",513,"name")="shm_snapshot_t.shadow_file_header.n_bg_update_creates.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")=8124
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_bg_update_creates.curr_count")=513
+	Set gtmtypes("shm_snapshot_t",514,"name")="shm_snapshot_t.shadow_file_header.n_bg_update_creates.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")=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_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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_bg_update_creates.cumul_count")=514
+	Set gtmtypes("shm_snapshot_t",515,"name")="shm_snapshot_t.shadow_file_header.n_db_csh_getns"
+	Set gtmtypes("shm_snapshot_t",515,"off")=8112
+	Set gtmtypes("shm_snapshot_t",515,"len")=8
+	Set gtmtypes("shm_snapshot_t",515,"type")="db_csh_acct_rec"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_db_csh_getns")=515
+	Set gtmtypes("shm_snapshot_t",516,"name")="shm_snapshot_t.shadow_file_header.n_db_csh_getns.curr_count"
+	Set gtmtypes("shm_snapshot_t",516,"off")=8112
+	Set gtmtypes("shm_snapshot_t",516,"len")=4
+	Set gtmtypes("shm_snapshot_t",516,"type")="int"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_db_csh_getns.curr_count")=516
+	Set gtmtypes("shm_snapshot_t",517,"name")="shm_snapshot_t.shadow_file_header.n_db_csh_getns.cumul_count"
+	Set gtmtypes("shm_snapshot_t",517,"off")=8116
+	Set gtmtypes("shm_snapshot_t",517,"len")=4
+	Set gtmtypes("shm_snapshot_t",517,"type")="int"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_db_csh_getns.cumul_count")=517
+	Set gtmtypes("shm_snapshot_t",518,"name")="shm_snapshot_t.shadow_file_header.n_db_csh_getn_lcnt"
+	Set gtmtypes("shm_snapshot_t",518,"off")=8120
 	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_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_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_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_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_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",518,"type")="db_csh_acct_rec"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_db_csh_getn_lcnt")=518
+	Set gtmtypes("shm_snapshot_t",519,"name")="shm_snapshot_t.shadow_file_header.n_db_csh_getn_lcnt.curr_count"
+	Set gtmtypes("shm_snapshot_t",519,"off")=8120
+	Set gtmtypes("shm_snapshot_t",519,"len")=4
+	Set gtmtypes("shm_snapshot_t",519,"type")="int"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_db_csh_getn_lcnt.curr_count")=519
+	Set gtmtypes("shm_snapshot_t",520,"name")="shm_snapshot_t.shadow_file_header.n_db_csh_getn_lcnt.cumul_count"
+	Set gtmtypes("shm_snapshot_t",520,"off")=8124
+	Set gtmtypes("shm_snapshot_t",520,"len")=4
+	Set gtmtypes("shm_snapshot_t",520,"type")="int"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_db_csh_getn_lcnt.cumul_count")=520
+	Set gtmtypes("shm_snapshot_t",521,"name")="shm_snapshot_t.shadow_file_header.db_csh_acct_rec_filler_4k"
+	Set gtmtypes("shm_snapshot_t",521,"off")=8128
+	Set gtmtypes("shm_snapshot_t",521,"len")=152
+	Set gtmtypes("shm_snapshot_t",521,"type")="char"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.db_csh_acct_rec_filler_4k")=521
+	Set gtmtypes("shm_snapshot_t",522,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec"
+	Set gtmtypes("shm_snapshot_t",522,"off")=8280
+	Set gtmtypes("shm_snapshot_t",522,"len")=472
+	Set gtmtypes("shm_snapshot_t",522,"type")="gvstats_rec_t"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec")=522
+	Set gtmtypes("shm_snapshot_t",523,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_set"
+	Set gtmtypes("shm_snapshot_t",523,"off")=8280
 	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_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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_set")=523
+	Set gtmtypes("shm_snapshot_t",524,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_kill"
+	Set gtmtypes("shm_snapshot_t",524,"off")=8288
 	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_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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_kill")=524
+	Set gtmtypes("shm_snapshot_t",525,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_get"
+	Set gtmtypes("shm_snapshot_t",525,"off")=8296
 	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_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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_get")=525
+	Set gtmtypes("shm_snapshot_t",526,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_data"
+	Set gtmtypes("shm_snapshot_t",526,"off")=8304
 	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.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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_data")=526
+	Set gtmtypes("shm_snapshot_t",527,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_order"
+	Set gtmtypes("shm_snapshot_t",527,"off")=8312
 	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_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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_order")=527
+	Set gtmtypes("shm_snapshot_t",528,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_zprev"
+	Set gtmtypes("shm_snapshot_t",528,"off")=8320
 	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_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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_zprev")=528
+	Set gtmtypes("shm_snapshot_t",529,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_query"
+	Set gtmtypes("shm_snapshot_t",529,"off")=8328
 	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_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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_query")=529
+	Set gtmtypes("shm_snapshot_t",530,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_lock_success"
+	Set gtmtypes("shm_snapshot_t",530,"off")=8336
 	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_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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_lock_success")=530
+	Set gtmtypes("shm_snapshot_t",531,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_lock_fail"
+	Set gtmtypes("shm_snapshot_t",531,"off")=8344
 	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_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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_lock_fail")=531
+	Set gtmtypes("shm_snapshot_t",532,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.db_curr_tn"
+	Set gtmtypes("shm_snapshot_t",532,"off")=8352
 	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_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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.db_curr_tn")=532
+	Set gtmtypes("shm_snapshot_t",533,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_dsk_read"
+	Set gtmtypes("shm_snapshot_t",533,"off")=8360
 	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_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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_dsk_read")=533
+	Set gtmtypes("shm_snapshot_t",534,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_dsk_write"
+	Set gtmtypes("shm_snapshot_t",534,"off")=8368
 	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_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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_dsk_write")=534
+	Set gtmtypes("shm_snapshot_t",535,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_nontp_readwrite"
+	Set gtmtypes("shm_snapshot_t",535,"off")=8376
 	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_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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_nontp_readwrite")=535
+	Set gtmtypes("shm_snapshot_t",536,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_nontp_readonly"
+	Set gtmtypes("shm_snapshot_t",536,"off")=8384
 	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_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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_nontp_readonly")=536
+	Set gtmtypes("shm_snapshot_t",537,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_nontp_blkwrite"
+	Set gtmtypes("shm_snapshot_t",537,"off")=8392
 	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_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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_nontp_blkwrite")=537
+	Set gtmtypes("shm_snapshot_t",538,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_nontp_blkread"
+	Set gtmtypes("shm_snapshot_t",538,"off")=8400
 	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_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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_nontp_blkread")=538
+	Set gtmtypes("shm_snapshot_t",539,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_nontp_retries_0"
+	Set gtmtypes("shm_snapshot_t",539,"off")=8408
 	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_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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_nontp_retries_0")=539
+	Set gtmtypes("shm_snapshot_t",540,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_nontp_retries_1"
+	Set gtmtypes("shm_snapshot_t",540,"off")=8416
 	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_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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_nontp_retries_1")=540
+	Set gtmtypes("shm_snapshot_t",541,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_nontp_retries_2"
+	Set gtmtypes("shm_snapshot_t",541,"off")=8424
 	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_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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_nontp_retries_2")=541
+	Set gtmtypes("shm_snapshot_t",542,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_nontp_retries_3"
+	Set gtmtypes("shm_snapshot_t",542,"off")=8432
 	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_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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_nontp_retries_3")=542
+	Set gtmtypes("shm_snapshot_t",543,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_tp_readwrite"
+	Set gtmtypes("shm_snapshot_t",543,"off")=8440
 	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_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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_tp_readwrite")=543
+	Set gtmtypes("shm_snapshot_t",544,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_tp_readonly"
+	Set gtmtypes("shm_snapshot_t",544,"off")=8448
 	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_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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_tp_readonly")=544
+	Set gtmtypes("shm_snapshot_t",545,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_tp_rolledback"
+	Set gtmtypes("shm_snapshot_t",545,"off")=8456
 	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_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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_tp_rolledback")=545
+	Set gtmtypes("shm_snapshot_t",546,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_tp_blkwrite"
+	Set gtmtypes("shm_snapshot_t",546,"off")=8464
 	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_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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_tp_blkwrite")=546
+	Set gtmtypes("shm_snapshot_t",547,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_tp_blkread"
+	Set gtmtypes("shm_snapshot_t",547,"off")=8472
 	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_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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_tp_blkread")=547
+	Set gtmtypes("shm_snapshot_t",548,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_tp_tot_retries_0"
+	Set gtmtypes("shm_snapshot_t",548,"off")=8480
 	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_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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_tp_tot_retries_0")=548
+	Set gtmtypes("shm_snapshot_t",549,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_tp_tot_retries_1"
+	Set gtmtypes("shm_snapshot_t",549,"off")=8488
 	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_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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_tp_tot_retries_1")=549
+	Set gtmtypes("shm_snapshot_t",550,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_tp_tot_retries_2"
+	Set gtmtypes("shm_snapshot_t",550,"off")=8496
 	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_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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_tp_tot_retries_2")=550
+	Set gtmtypes("shm_snapshot_t",551,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_tp_tot_retries_3"
+	Set gtmtypes("shm_snapshot_t",551,"off")=8504
 	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_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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_tp_tot_retries_3")=551
+	Set gtmtypes("shm_snapshot_t",552,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_tp_tot_retries_4"
+	Set gtmtypes("shm_snapshot_t",552,"off")=8512
 	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.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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_tp_tot_retries_4")=552
+	Set gtmtypes("shm_snapshot_t",553,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_tp_cnflct_retries_0"
+	Set gtmtypes("shm_snapshot_t",553,"off")=8520
 	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_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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_tp_cnflct_retries_0")=553
+	Set gtmtypes("shm_snapshot_t",554,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_tp_cnflct_retries_1"
+	Set gtmtypes("shm_snapshot_t",554,"off")=8528
 	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.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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_tp_cnflct_retries_1")=554
+	Set gtmtypes("shm_snapshot_t",555,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_tp_cnflct_retries_2"
+	Set gtmtypes("shm_snapshot_t",555,"off")=8536
 	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_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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_tp_cnflct_retries_2")=555
+	Set gtmtypes("shm_snapshot_t",556,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_tp_cnflct_retries_3"
+	Set gtmtypes("shm_snapshot_t",556,"off")=8544
 	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.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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_tp_cnflct_retries_3")=556
+	Set gtmtypes("shm_snapshot_t",557,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_tp_cnflct_retries_4"
+	Set gtmtypes("shm_snapshot_t",557,"off")=8552
 	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_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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_tp_cnflct_retries_4")=557
+	Set gtmtypes("shm_snapshot_t",558,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_ztrigger"
+	Set gtmtypes("shm_snapshot_t",558,"off")=8560
 	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_ztrigger")=558
+	Set gtmtypes("shm_snapshot_t",559,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_db_flush"
+	Set gtmtypes("shm_snapshot_t",559,"off")=8568
 	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_db_flush")=559
+	Set gtmtypes("shm_snapshot_t",560,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_db_fsync"
+	Set gtmtypes("shm_snapshot_t",560,"off")=8576
 	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.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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_db_fsync")=560
+	Set gtmtypes("shm_snapshot_t",561,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_jnl_flush"
+	Set gtmtypes("shm_snapshot_t",561,"off")=8584
 	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_jnl_flush")=561
+	Set gtmtypes("shm_snapshot_t",562,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_jnl_fsync"
+	Set gtmtypes("shm_snapshot_t",562,"off")=8592
 	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_jnl_fsync")=562
+	Set gtmtypes("shm_snapshot_t",563,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_jbuff_bytes"
+	Set gtmtypes("shm_snapshot_t",563,"off")=8600
 	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_jbuff_bytes")=563
+	Set gtmtypes("shm_snapshot_t",564,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_jfile_bytes"
+	Set gtmtypes("shm_snapshot_t",564,"off")=8608
 	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_jfile_bytes")=564
+	Set gtmtypes("shm_snapshot_t",565,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_jfile_writes"
+	Set gtmtypes("shm_snapshot_t",565,"off")=8616
 	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_jfile_writes")=565
+	Set gtmtypes("shm_snapshot_t",566,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_jrec_logical"
+	Set gtmtypes("shm_snapshot_t",566,"off")=8624
 	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_jrec_logical")=566
+	Set gtmtypes("shm_snapshot_t",567,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_jrec_pblk"
+	Set gtmtypes("shm_snapshot_t",567,"off")=8632
 	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_jrec_pblk")=567
+	Set gtmtypes("shm_snapshot_t",568,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_jrec_epoch_regular"
+	Set gtmtypes("shm_snapshot_t",568,"off")=8640
 	Set gtmtypes("shm_snapshot_t",568,"len")=8
 	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_jrec_epoch_regular")=568
+	Set gtmtypes("shm_snapshot_t",569,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_jrec_epoch_idle"
+	Set gtmtypes("shm_snapshot_t",569,"off")=8648
 	Set gtmtypes("shm_snapshot_t",569,"len")=8
 	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_jrec_epoch_idle")=569
+	Set gtmtypes("shm_snapshot_t",570,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_jrec_other"
+	Set gtmtypes("shm_snapshot_t",570,"off")=8656
 	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.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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_jrec_other")=570
+	Set gtmtypes("shm_snapshot_t",571,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_jnl_extends"
+	Set gtmtypes("shm_snapshot_t",571,"off")=8664
 	Set gtmtypes("shm_snapshot_t",571,"len")=8
 	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_jnl_extends")=571
+	Set gtmtypes("shm_snapshot_t",572,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_db_extends"
+	Set gtmtypes("shm_snapshot_t",572,"off")=8672
 	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_db_extends")=572
+	Set gtmtypes("shm_snapshot_t",573,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_crit_success"
+	Set gtmtypes("shm_snapshot_t",573,"off")=8680
 	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_crit_success")=573
+	Set gtmtypes("shm_snapshot_t",574,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_crits_in_epch"
+	Set gtmtypes("shm_snapshot_t",574,"off")=8688
 	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_crits_in_epch")=574
+	Set gtmtypes("shm_snapshot_t",575,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.sq_crit_failed"
+	Set gtmtypes("shm_snapshot_t",575,"off")=8696
 	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.sq_crit_failed")=575
+	Set gtmtypes("shm_snapshot_t",576,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_crit_failed"
+	Set gtmtypes("shm_snapshot_t",576,"off")=8704
+	Set gtmtypes("shm_snapshot_t",576,"len")=8
+	Set gtmtypes("shm_snapshot_t",576,"type")="uint64_t"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_crit_failed")=576
+	Set gtmtypes("shm_snapshot_t",577,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.sq_crit_que_slps"
+	Set gtmtypes("shm_snapshot_t",577,"off")=8712
+	Set gtmtypes("shm_snapshot_t",577,"len")=8
+	Set gtmtypes("shm_snapshot_t",577,"type")="uint64_t"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.sq_crit_que_slps")=577
+	Set gtmtypes("shm_snapshot_t",578,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_crit_que_slps"
+	Set gtmtypes("shm_snapshot_t",578,"off")=8720
+	Set gtmtypes("shm_snapshot_t",578,"len")=8
 	Set gtmtypes("shm_snapshot_t",578,"type")="uint64_t"
-	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.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")="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")="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")="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")="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")="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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_crit_que_slps")=578
+	Set gtmtypes("shm_snapshot_t",579,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.sq_crit_yields"
+	Set gtmtypes("shm_snapshot_t",579,"off")=8728
+	Set gtmtypes("shm_snapshot_t",579,"len")=8
+	Set gtmtypes("shm_snapshot_t",579,"type")="uint64_t"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.sq_crit_yields")=579
+	Set gtmtypes("shm_snapshot_t",580,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_crit_yields"
+	Set gtmtypes("shm_snapshot_t",580,"off")=8736
+	Set gtmtypes("shm_snapshot_t",580,"len")=8
+	Set gtmtypes("shm_snapshot_t",580,"type")="uint64_t"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_crit_yields")=580
+	Set gtmtypes("shm_snapshot_t",581,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_clean2dirty"
+	Set gtmtypes("shm_snapshot_t",581,"off")=8744
+	Set gtmtypes("shm_snapshot_t",581,"len")=8
+	Set gtmtypes("shm_snapshot_t",581,"type")="uint64_t"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_clean2dirty")=581
+	Set gtmtypes("shm_snapshot_t",582,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec_filler_4k_plus_512"
+	Set gtmtypes("shm_snapshot_t",582,"off")=8752
+	Set gtmtypes("shm_snapshot_t",582,"len")=40
+	Set gtmtypes("shm_snapshot_t",582,"type")="char"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec_filler_4k_plus_512")=582
+	Set gtmtypes("shm_snapshot_t",583,"name")="shm_snapshot_t.shadow_file_header.filler_4k_plus_512"
+	Set gtmtypes("shm_snapshot_t",583,"off")=8792
+	Set gtmtypes("shm_snapshot_t",583,"len")=368
+	Set gtmtypes("shm_snapshot_t",583,"type")="char"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.filler_4k_plus_512")=583
+	Set gtmtypes("shm_snapshot_t",584,"name")="shm_snapshot_t.shadow_file_header.intrpt_recov_resync_strm_seqno"
+	Set gtmtypes("shm_snapshot_t",584,"off")=9160
+	Set gtmtypes("shm_snapshot_t",584,"len")=128
+	Set gtmtypes("shm_snapshot_t",584,"type")="uint64_t"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.intrpt_recov_resync_strm_seqno")=584
+	Set gtmtypes("shm_snapshot_t",584,"dim")=16
+	Set gtmtypes("shm_snapshot_t",585,"name")="shm_snapshot_t.shadow_file_header.creation_db_ver"
+	Set gtmtypes("shm_snapshot_t",585,"off")=9288
+	Set gtmtypes("shm_snapshot_t",585,"len")=4
+	Set gtmtypes("shm_snapshot_t",585,"type")="int"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.creation_db_ver")=585
+	Set gtmtypes("shm_snapshot_t",586,"name")="shm_snapshot_t.shadow_file_header.creation_mdb_ver"
+	Set gtmtypes("shm_snapshot_t",586,"off")=9292
+	Set gtmtypes("shm_snapshot_t",586,"len")=4
+	Set gtmtypes("shm_snapshot_t",586,"type")="int"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.creation_mdb_ver")=586
+	Set gtmtypes("shm_snapshot_t",587,"name")="shm_snapshot_t.shadow_file_header.certified_for_upgrade_to"
+	Set gtmtypes("shm_snapshot_t",587,"off")=9296
+	Set gtmtypes("shm_snapshot_t",587,"len")=4
+	Set gtmtypes("shm_snapshot_t",587,"type")="int"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.certified_for_upgrade_to")=587
+	Set gtmtypes("shm_snapshot_t",588,"name")="shm_snapshot_t.shadow_file_header.filler_5k"
+	Set gtmtypes("shm_snapshot_t",588,"off")=9300
+	Set gtmtypes("shm_snapshot_t",588,"len")=4
+	Set gtmtypes("shm_snapshot_t",588,"type")="int"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.filler_5k")=588
+	Set gtmtypes("shm_snapshot_t",589,"name")="shm_snapshot_t.shadow_file_header.secshr_ops_index_filler"
+	Set gtmtypes("shm_snapshot_t",589,"off")=9304
+	Set gtmtypes("shm_snapshot_t",589,"len")=4
+	Set gtmtypes("shm_snapshot_t",589,"type")="int"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.secshr_ops_index_filler")=589
+	Set gtmtypes("shm_snapshot_t",590,"name")="shm_snapshot_t.shadow_file_header.secshr_ops_array_filler"
+	Set gtmtypes("shm_snapshot_t",590,"off")=9308
+	Set gtmtypes("shm_snapshot_t",590,"len")=1020
 	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.secshr_ops_array_filler")=590
+	Set gtmtypes("shm_snapshot_t",590,"dim")=255
+	Set gtmtypes("shm_snapshot_t",591,"name")="shm_snapshot_t.shadow_file_header.next_upgrd_warn"
+	Set gtmtypes("shm_snapshot_t",591,"off")=10328
+	Set gtmtypes("shm_snapshot_t",591,"len")=24
+	Set gtmtypes("shm_snapshot_t",591,"type")="compswap_time_field"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.next_upgrd_warn")=591
+	Set gtmtypes("shm_snapshot_t",592,"name")="shm_snapshot_t.shadow_file_header.next_upgrd_warn.time_latch"
+	Set gtmtypes("shm_snapshot_t",592,"off")=10328
+	Set gtmtypes("shm_snapshot_t",592,"len")=8
+	Set gtmtypes("shm_snapshot_t",592,"type")="global_latch_t"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.next_upgrd_warn.time_latch")=592
+	Set gtmtypes("shm_snapshot_t",593,"name")="shm_snapshot_t.shadow_file_header.next_upgrd_warn.time_latch.u"
+	Set gtmtypes("shm_snapshot_t",593,"off")=10328
+	Set gtmtypes("shm_snapshot_t",593,"len")=8
+	Set gtmtypes("shm_snapshot_t",593,"type")="union"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.next_upgrd_warn.time_latch.u")=593
+	Set gtmtypes("shm_snapshot_t",594,"name")="shm_snapshot_t.shadow_file_header.next_upgrd_warn.time_latch.u.pid_imgcnt"
+	Set gtmtypes("shm_snapshot_t",594,"off")=10328
+	Set gtmtypes("shm_snapshot_t",594,"len")=8
+	Set gtmtypes("shm_snapshot_t",594,"type")="uint64_t"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.next_upgrd_warn.time_latch.u.pid_imgcnt")=594
+	Set gtmtypes("shm_snapshot_t",595,"name")="shm_snapshot_t.shadow_file_header.next_upgrd_warn.time_latch.u.parts"
+	Set gtmtypes("shm_snapshot_t",595,"off")=10328
+	Set gtmtypes("shm_snapshot_t",595,"len")=8
+	Set gtmtypes("shm_snapshot_t",595,"type")="struct"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.next_upgrd_warn.time_latch.u.parts")=595
+	Set gtmtypes("shm_snapshot_t",596,"name")="shm_snapshot_t.shadow_file_header.next_upgrd_warn.time_latch.u.parts.latch_pid"
+	Set gtmtypes("shm_snapshot_t",596,"off")=10328
+	Set gtmtypes("shm_snapshot_t",596,"len")=4
+	Set gtmtypes("shm_snapshot_t",596,"type")="int"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.next_upgrd_warn.time_latch.u.parts.latch_pid")=596
+	Set gtmtypes("shm_snapshot_t",597,"name")="shm_snapshot_t.shadow_file_header.next_upgrd_warn.time_latch.u.parts.latch_word"
+	Set gtmtypes("shm_snapshot_t",597,"off")=10332
 	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",597,"type")="int"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.next_upgrd_warn.time_latch.u.parts.latch_word")=597
+	Set gtmtypes("shm_snapshot_t",598,"name")="shm_snapshot_t.shadow_file_header.next_upgrd_warn.hp_latch_space"
+	Set gtmtypes("shm_snapshot_t",598,"off")=10336
+	Set gtmtypes("shm_snapshot_t",598,"len")=16
+	Set gtmtypes("shm_snapshot_t",598,"type")="int"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.next_upgrd_warn.hp_latch_space")=598
+	Set gtmtypes("shm_snapshot_t",598,"dim")=4
+	Set gtmtypes("shm_snapshot_t",599,"name")="shm_snapshot_t.shadow_file_header.is_encrypted"
+	Set gtmtypes("shm_snapshot_t",599,"off")=10352
 	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",599,"type")="unsigned-int"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.is_encrypted")=599
+	Set gtmtypes("shm_snapshot_t",600,"name")="shm_snapshot_t.shadow_file_header.db_trigger_cycle"
+	Set gtmtypes("shm_snapshot_t",600,"off")=10356
 	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",600,"type")="unsigned-int"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.db_trigger_cycle")=600
+	Set gtmtypes("shm_snapshot_t",601,"name")="shm_snapshot_t.shadow_file_header.strm_reg_seqno"
+	Set gtmtypes("shm_snapshot_t",601,"off")=10360
+	Set gtmtypes("shm_snapshot_t",601,"len")=128
+	Set gtmtypes("shm_snapshot_t",601,"type")="uint64_t"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.strm_reg_seqno")=601
+	Set gtmtypes("shm_snapshot_t",601,"dim")=16
+	Set gtmtypes("shm_snapshot_t",602,"name")="shm_snapshot_t.shadow_file_header.save_strm_reg_seqno"
+	Set gtmtypes("shm_snapshot_t",602,"off")=10488
+	Set gtmtypes("shm_snapshot_t",602,"len")=128
+	Set gtmtypes("shm_snapshot_t",602,"type")="uint64_t"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.save_strm_reg_seqno")=602
+	Set gtmtypes("shm_snapshot_t",602,"dim")=16
+	Set gtmtypes("shm_snapshot_t",603,"name")="shm_snapshot_t.shadow_file_header.freeze_on_fail"
+	Set gtmtypes("shm_snapshot_t",603,"off")=10616
 	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.freeze_on_fail")=603
+	Set gtmtypes("shm_snapshot_t",604,"name")="shm_snapshot_t.shadow_file_header.span_node_absent"
+	Set gtmtypes("shm_snapshot_t",604,"off")=10620
 	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.span_node_absent")=604
+	Set gtmtypes("shm_snapshot_t",605,"name")="shm_snapshot_t.shadow_file_header.maxkeysz_assured"
+	Set gtmtypes("shm_snapshot_t",605,"off")=10624
 	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("shm_snapshot_t",605,"type")="boolean_t"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.maxkeysz_assured")=605
+	Set gtmtypes("shm_snapshot_t",606,"name")="shm_snapshot_t.shadow_file_header.hasht_upgrade_needed"
+	Set gtmtypes("shm_snapshot_t",606,"off")=10628
+	Set gtmtypes("shm_snapshot_t",606,"len")=4
+	Set gtmtypes("shm_snapshot_t",606,"type")="boolean_t"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.hasht_upgrade_needed")=606
+	Set gtmtypes("shm_snapshot_t",607,"name")="shm_snapshot_t.shadow_file_header.defer_allocate"
+	Set gtmtypes("shm_snapshot_t",607,"off")=10632
+	Set gtmtypes("shm_snapshot_t",607,"len")=4
+	Set gtmtypes("shm_snapshot_t",607,"type")="boolean_t"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.defer_allocate")=607
+	Set gtmtypes("shm_snapshot_t",608,"name")="shm_snapshot_t.shadow_file_header.filler_ftok_counter_halted"
+	Set gtmtypes("shm_snapshot_t",608,"off")=10636
+	Set gtmtypes("shm_snapshot_t",608,"len")=4
+	Set gtmtypes("shm_snapshot_t",608,"type")="boolean_t"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.filler_ftok_counter_halted")=608
+	Set gtmtypes("shm_snapshot_t",609,"name")="shm_snapshot_t.shadow_file_header.filler_access_counter_halted"
+	Set gtmtypes("shm_snapshot_t",609,"off")=10640
+	Set gtmtypes("shm_snapshot_t",609,"len")=4
+	Set gtmtypes("shm_snapshot_t",609,"type")="boolean_t"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.filler_access_counter_halted")=609
+	Set gtmtypes("shm_snapshot_t",610,"name")="shm_snapshot_t.shadow_file_header.lock_crit_with_db"
+	Set gtmtypes("shm_snapshot_t",610,"off")=10644
+	Set gtmtypes("shm_snapshot_t",610,"len")=4
+	Set gtmtypes("shm_snapshot_t",610,"type")="boolean_t"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.lock_crit_with_db")=610
+	Set gtmtypes("shm_snapshot_t",611,"name")="shm_snapshot_t.shadow_file_header.basedb_fname_len"
+	Set gtmtypes("shm_snapshot_t",611,"off")=10648
+	Set gtmtypes("shm_snapshot_t",611,"len")=4
+	Set gtmtypes("shm_snapshot_t",611,"type")="unsigned-int"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.basedb_fname_len")=611
+	Set gtmtypes("shm_snapshot_t",612,"name")="shm_snapshot_t.shadow_file_header.basedb_fname"
+	Set gtmtypes("shm_snapshot_t",612,"off")=10652
+	Set gtmtypes("shm_snapshot_t",612,"len")=256
+	Set gtmtypes("shm_snapshot_t",612,"type")="unsigned-char"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.basedb_fname")=612
+	Set gtmtypes("shm_snapshot_t",613,"name")="shm_snapshot_t.shadow_file_header.filler_7k"
+	Set gtmtypes("shm_snapshot_t",613,"off")=10908
+	Set gtmtypes("shm_snapshot_t",613,"len")=444
+	Set gtmtypes("shm_snapshot_t",613,"type")="char"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.filler_7k")=613
+	Set gtmtypes("shm_snapshot_t",614,"name")="shm_snapshot_t.shadow_file_header.filler_8k"
+	Set gtmtypes("shm_snapshot_t",614,"off")=11352
+	Set gtmtypes("shm_snapshot_t",614,"len")=1024
+	Set gtmtypes("shm_snapshot_t",614,"type")="char"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.filler_8k")=614
 	;
 	Set gtmtypes("shmpool_blk_hdr")="struct"
 	Set gtmtypes("shmpool_blk_hdr",0)=11
@@ -33477,7 +34486,7 @@ Init
 	Set gtmtypfldindx("shmpool_blk_hdr","image_count")=11
 	;
 	Set gtmtypes("shmpool_buff_hdr")="struct"
-	Set gtmtypes("shmpool_buff_hdr",0)=615
+	Set gtmtypes("shmpool_buff_hdr",0)=621
 	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
@@ -34505,11 +35514,11 @@ Init
 	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.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,"name")="shmpool_buff_hdr.shadow_file_header.wcb_gds_rundown2_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_bgtrcrec1_tn")=204
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_gds_rundown2_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
@@ -34800,11 +35809,11 @@ Init
 	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_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,"name")="shmpool_buff_hdr.shadow_file_header.wcb_wcs_flu0_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_tp_grab_crit_tn")=263
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_wcs_flu0_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
@@ -34825,11 +35834,11 @@ Init
 	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_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,"name")="shmpool_buff_hdr.shadow_file_header.wcb_gds_rundown1_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_gds_rundown_tn")=268
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_gds_rundown1_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
@@ -35185,1391 +36194,1421 @@ Init
 	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,"name")="shmpool_buff_hdr.shadow_file_header.jnlbuff_phs2cmt_array_full_tn"
 	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.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.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.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",340,"len")=8
+	Set gtmtypes("shmpool_buff_hdr",340,"type")="uint64_t"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.jnlbuff_phs2cmt_array_full_tn")=340
+	Set gtmtypes("shmpool_buff_hdr",341,"name")="shmpool_buff_hdr.shadow_file_header.jnl_phase2_cleanup_if_possible_tn"
+	Set gtmtypes("shmpool_buff_hdr",341,"off")=3576
+	Set gtmtypes("shmpool_buff_hdr",341,"len")=8
+	Set gtmtypes("shmpool_buff_hdr",341,"type")="uint64_t"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.jnl_phase2_cleanup_if_possible_tn")=341
+	Set gtmtypes("shmpool_buff_hdr",342,"name")="shmpool_buff_hdr.shadow_file_header.jnlbuff_phs2cmt_isprcalv_tn"
+	Set gtmtypes("shmpool_buff_hdr",342,"off")=3584
+	Set gtmtypes("shmpool_buff_hdr",342,"len")=8
+	Set gtmtypes("shmpool_buff_hdr",342,"type")="uint64_t"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.jnlbuff_phs2cmt_isprcalv_tn")=342
+	Set gtmtypes("shmpool_buff_hdr",343,"name")="shmpool_buff_hdr.shadow_file_header.bg_trc_rec_tn_filler"
+	Set gtmtypes("shmpool_buff_hdr",343,"off")=3592
+	Set gtmtypes("shmpool_buff_hdr",343,"len")=24
+	Set gtmtypes("shmpool_buff_hdr",343,"type")="char"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.bg_trc_rec_tn_filler")=343
+	Set gtmtypes("shmpool_buff_hdr",344,"name")="shmpool_buff_hdr.shadow_file_header.total_buffer_flush_cntr"
+	Set gtmtypes("shmpool_buff_hdr",344,"off")=3616
 	Set gtmtypes("shmpool_buff_hdr",344,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",344,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.total_buffer_flush_cntr")=344
+	Set gtmtypes("shmpool_buff_hdr",345,"name")="shmpool_buff_hdr.shadow_file_header.bufct_buffer_flush_cntr"
+	Set gtmtypes("shmpool_buff_hdr",345,"off")=3620
 	Set gtmtypes("shmpool_buff_hdr",345,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",345,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.bufct_buffer_flush_cntr")=345
+	Set gtmtypes("shmpool_buff_hdr",346,"name")="shmpool_buff_hdr.shadow_file_header.bufct_buffer_flush_loop_cntr"
+	Set gtmtypes("shmpool_buff_hdr",346,"off")=3624
 	Set gtmtypes("shmpool_buff_hdr",346,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",346,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.bufct_buffer_flush_loop_cntr")=346
+	Set gtmtypes("shmpool_buff_hdr",347,"name")="shmpool_buff_hdr.shadow_file_header.wrt_calls_cntr"
+	Set gtmtypes("shmpool_buff_hdr",347,"off")=3628
 	Set gtmtypes("shmpool_buff_hdr",347,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",347,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wrt_calls_cntr")=347
+	Set gtmtypes("shmpool_buff_hdr",348,"name")="shmpool_buff_hdr.shadow_file_header.wrt_count_cntr"
+	Set gtmtypes("shmpool_buff_hdr",348,"off")=3632
 	Set gtmtypes("shmpool_buff_hdr",348,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",348,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wrt_count_cntr")=348
+	Set gtmtypes("shmpool_buff_hdr",349,"name")="shmpool_buff_hdr.shadow_file_header.wrt_blocked_cntr"
+	Set gtmtypes("shmpool_buff_hdr",349,"off")=3636
 	Set gtmtypes("shmpool_buff_hdr",349,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",349,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wrt_blocked_cntr")=349
+	Set gtmtypes("shmpool_buff_hdr",350,"name")="shmpool_buff_hdr.shadow_file_header.wrt_busy_cntr"
+	Set gtmtypes("shmpool_buff_hdr",350,"off")=3640
 	Set gtmtypes("shmpool_buff_hdr",350,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",350,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wrt_busy_cntr")=350
+	Set gtmtypes("shmpool_buff_hdr",351,"name")="shmpool_buff_hdr.shadow_file_header.wrt_noblks_wrtn_cntr"
+	Set gtmtypes("shmpool_buff_hdr",351,"off")=3644
 	Set gtmtypes("shmpool_buff_hdr",351,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",351,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wrt_noblks_wrtn_cntr")=351
+	Set gtmtypes("shmpool_buff_hdr",352,"name")="shmpool_buff_hdr.shadow_file_header.wcb_gds_rundown2_cntr"
+	Set gtmtypes("shmpool_buff_hdr",352,"off")=3648
 	Set gtmtypes("shmpool_buff_hdr",352,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",352,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_gds_rundown2_cntr")=352
+	Set gtmtypes("shmpool_buff_hdr",353,"name")="shmpool_buff_hdr.shadow_file_header.reserved_bgtrcrec2_cntr"
+	Set gtmtypes("shmpool_buff_hdr",353,"off")=3652
 	Set gtmtypes("shmpool_buff_hdr",353,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",353,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.reserved_bgtrcrec2_cntr")=353
+	Set gtmtypes("shmpool_buff_hdr",354,"name")="shmpool_buff_hdr.shadow_file_header.reserved_bgtrcrec3_cntr"
+	Set gtmtypes("shmpool_buff_hdr",354,"off")=3656
 	Set gtmtypes("shmpool_buff_hdr",354,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",354,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.reserved_bgtrcrec3_cntr")=354
+	Set gtmtypes("shmpool_buff_hdr",355,"name")="shmpool_buff_hdr.shadow_file_header.lost_block_recovery_cntr"
+	Set gtmtypes("shmpool_buff_hdr",355,"off")=3660
 	Set gtmtypes("shmpool_buff_hdr",355,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",355,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.lost_block_recovery_cntr")=355
+	Set gtmtypes("shmpool_buff_hdr",356,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_onln_rlbk_cntr"
+	Set gtmtypes("shmpool_buff_hdr",356,"off")=3664
 	Set gtmtypes("shmpool_buff_hdr",356,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",356,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_onln_rlbk_cntr")=356
+	Set gtmtypes("shmpool_buff_hdr",357,"name")="shmpool_buff_hdr.shadow_file_header.stale_cntr"
+	Set gtmtypes("shmpool_buff_hdr",357,"off")=3668
 	Set gtmtypes("shmpool_buff_hdr",357,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",357,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.stale_cntr")=357
+	Set gtmtypes("shmpool_buff_hdr",358,"name")="shmpool_buff_hdr.shadow_file_header.starved_cntr"
+	Set gtmtypes("shmpool_buff_hdr",358,"off")=3672
 	Set gtmtypes("shmpool_buff_hdr",358,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",358,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.starved_cntr")=358
+	Set gtmtypes("shmpool_buff_hdr",359,"name")="shmpool_buff_hdr.shadow_file_header.stale_timer_started_cntr"
+	Set gtmtypes("shmpool_buff_hdr",359,"off")=3676
 	Set gtmtypes("shmpool_buff_hdr",359,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",359,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.stale_timer_started_cntr")=359
+	Set gtmtypes("shmpool_buff_hdr",360,"name")="shmpool_buff_hdr.shadow_file_header.stale_timer_pop_cntr"
+	Set gtmtypes("shmpool_buff_hdr",360,"off")=3680
 	Set gtmtypes("shmpool_buff_hdr",360,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",360,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.stale_timer_pop_cntr")=360
+	Set gtmtypes("shmpool_buff_hdr",361,"name")="shmpool_buff_hdr.shadow_file_header.stale_process_defer_cntr"
+	Set gtmtypes("shmpool_buff_hdr",361,"off")=3684
 	Set gtmtypes("shmpool_buff_hdr",361,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",361,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.stale_process_defer_cntr")=361
+	Set gtmtypes("shmpool_buff_hdr",362,"name")="shmpool_buff_hdr.shadow_file_header.stale_defer_processed_cntr"
+	Set gtmtypes("shmpool_buff_hdr",362,"off")=3688
 	Set gtmtypes("shmpool_buff_hdr",362,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",362,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.stale_defer_processed_cntr")=362
+	Set gtmtypes("shmpool_buff_hdr",363,"name")="shmpool_buff_hdr.shadow_file_header.spcfc_buffer_flush_cntr"
+	Set gtmtypes("shmpool_buff_hdr",363,"off")=3692
 	Set gtmtypes("shmpool_buff_hdr",363,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",363,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.spcfc_buffer_flush_cntr")=363
+	Set gtmtypes("shmpool_buff_hdr",364,"name")="shmpool_buff_hdr.shadow_file_header.spcfc_buffer_flush_loop_cntr"
+	Set gtmtypes("shmpool_buff_hdr",364,"off")=3696
 	Set gtmtypes("shmpool_buff_hdr",364,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",364,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.spcfc_buffer_flush_loop_cntr")=364
+	Set gtmtypes("shmpool_buff_hdr",365,"name")="shmpool_buff_hdr.shadow_file_header.spcfc_buffer_flush_retries_cntr"
+	Set gtmtypes("shmpool_buff_hdr",365,"off")=3700
 	Set gtmtypes("shmpool_buff_hdr",365,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",365,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.spcfc_buffer_flush_retries_cntr")=365
+	Set gtmtypes("shmpool_buff_hdr",366,"name")="shmpool_buff_hdr.shadow_file_header.spcfc_buffer_flushed_during_lockwait_cntr"
+	Set gtmtypes("shmpool_buff_hdr",366,"off")=3704
 	Set gtmtypes("shmpool_buff_hdr",366,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",366,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.spcfc_buffer_flushed_during_lockwait_cntr")=366
+	Set gtmtypes("shmpool_buff_hdr",367,"name")="shmpool_buff_hdr.shadow_file_header.tp_crit_retries_cntr"
+	Set gtmtypes("shmpool_buff_hdr",367,"off")=3708
 	Set gtmtypes("shmpool_buff_hdr",367,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",367,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.tp_crit_retries_cntr")=367
+	Set gtmtypes("shmpool_buff_hdr",368,"name")="shmpool_buff_hdr.shadow_file_header.db_csh_getn_flush_dirty_cntr"
+	Set gtmtypes("shmpool_buff_hdr",368,"off")=3712
 	Set gtmtypes("shmpool_buff_hdr",368,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",368,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.db_csh_getn_flush_dirty_cntr")=368
+	Set gtmtypes("shmpool_buff_hdr",369,"name")="shmpool_buff_hdr.shadow_file_header.db_csh_getn_rip_wait_cntr"
+	Set gtmtypes("shmpool_buff_hdr",369,"off")=3716
 	Set gtmtypes("shmpool_buff_hdr",369,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",369,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.db_csh_getn_rip_wait_cntr")=369
+	Set gtmtypes("shmpool_buff_hdr",370,"name")="shmpool_buff_hdr.shadow_file_header.db_csh_getn_buf_owner_stuck_cntr"
+	Set gtmtypes("shmpool_buff_hdr",370,"off")=3720
 	Set gtmtypes("shmpool_buff_hdr",370,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",370,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.db_csh_getn_buf_owner_stuck_cntr")=370
+	Set gtmtypes("shmpool_buff_hdr",371,"name")="shmpool_buff_hdr.shadow_file_header.db_csh_getn_out_of_design_cntr"
+	Set gtmtypes("shmpool_buff_hdr",371,"off")=3724
 	Set gtmtypes("shmpool_buff_hdr",371,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",371,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.db_csh_getn_out_of_design_cntr")=371
+	Set gtmtypes("shmpool_buff_hdr",372,"name")="shmpool_buff_hdr.shadow_file_header.t_qread_buf_owner_stuck_cntr"
+	Set gtmtypes("shmpool_buff_hdr",372,"off")=3728
 	Set gtmtypes("shmpool_buff_hdr",372,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",372,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.t_qread_buf_owner_stuck_cntr")=372
+	Set gtmtypes("shmpool_buff_hdr",373,"name")="shmpool_buff_hdr.shadow_file_header.t_qread_out_of_design_cntr"
+	Set gtmtypes("shmpool_buff_hdr",373,"off")=3732
 	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_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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.t_qread_out_of_design_cntr")=373
+	Set gtmtypes("shmpool_buff_hdr",374,"name")="shmpool_buff_hdr.shadow_file_header.bt_put_flush_dirty_cntr"
+	Set gtmtypes("shmpool_buff_hdr",374,"off")=3736
 	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_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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.bt_put_flush_dirty_cntr")=374
+	Set gtmtypes("shmpool_buff_hdr",375,"name")="shmpool_buff_hdr.shadow_file_header.mlock_wakeups_cntr"
+	Set gtmtypes("shmpool_buff_hdr",375,"off")=3740
 	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_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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.mlock_wakeups_cntr")=375
+	Set gtmtypes("shmpool_buff_hdr",376,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_wcs_recover_invoked_cntr"
+	Set gtmtypes("shmpool_buff_hdr",376,"off")=3744
 	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_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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_wcs_recover_invoked_cntr")=376
+	Set gtmtypes("shmpool_buff_hdr",377,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_wcs_verify_passed_cntr"
+	Set gtmtypes("shmpool_buff_hdr",377,"off")=3748
 	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_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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_wcs_verify_passed_cntr")=377
+	Set gtmtypes("shmpool_buff_hdr",378,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_t_qread_db_csh_getn_invalid_blk_cntr"
+	Set gtmtypes("shmpool_buff_hdr",378,"off")=3752
 	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_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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_t_qread_db_csh_getn_invalid_blk_cntr")=378
+	Set gtmtypes("shmpool_buff_hdr",379,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_t_qread_db_csh_get_invalid_blk_cntr"
+	Set gtmtypes("shmpool_buff_hdr",379,"off")=3756
 	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_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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_t_qread_db_csh_get_invalid_blk_cntr")=379
+	Set gtmtypes("shmpool_buff_hdr",380,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_db_csh_getn_loopexceed_cntr"
+	Set gtmtypes("shmpool_buff_hdr",380,"off")=3760
 	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_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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_db_csh_getn_loopexceed_cntr")=380
+	Set gtmtypes("shmpool_buff_hdr",381,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_db_csh_getn_wcsstarvewrt_cntr"
+	Set gtmtypes("shmpool_buff_hdr",381,"off")=3764
 	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_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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_db_csh_getn_wcsstarvewrt_cntr")=381
+	Set gtmtypes("shmpool_buff_hdr",382,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_db_csh_get_cntr"
+	Set gtmtypes("shmpool_buff_hdr",382,"off")=3768
 	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_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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_db_csh_get_cntr")=382
+	Set gtmtypes("shmpool_buff_hdr",383,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_tp_tend_wcsgetspace_cntr"
+	Set gtmtypes("shmpool_buff_hdr",383,"off")=3772
 	Set gtmtypes("shmpool_buff_hdr",383,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",383,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_tp_tend_wcsgetspace_cntr")=383
+	Set gtmtypes("shmpool_buff_hdr",384,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_tp_tend_t1_cntr"
+	Set gtmtypes("shmpool_buff_hdr",384,"off")=3776
 	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_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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_tp_tend_t1_cntr")=384
+	Set gtmtypes("shmpool_buff_hdr",385,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_tp_tend_bitmap_cntr"
+	Set gtmtypes("shmpool_buff_hdr",385,"off")=3780
 	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_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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_tp_tend_bitmap_cntr")=385
+	Set gtmtypes("shmpool_buff_hdr",386,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_tp_tend_jnl_cwset_cntr"
+	Set gtmtypes("shmpool_buff_hdr",386,"off")=3784
 	Set gtmtypes("shmpool_buff_hdr",386,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",386,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_tp_tend_jnl_cwset_cntr")=386
+	Set gtmtypes("shmpool_buff_hdr",387,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_tp_tend_jnl_wcsflu_cntr"
+	Set gtmtypes("shmpool_buff_hdr",387,"off")=3788
 	Set gtmtypes("shmpool_buff_hdr",387,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",387,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_tp_tend_jnl_wcsflu_cntr")=387
+	Set gtmtypes("shmpool_buff_hdr",388,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_t_end_hist_cntr"
+	Set gtmtypes("shmpool_buff_hdr",388,"off")=3792
 	Set gtmtypes("shmpool_buff_hdr",388,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",388,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_t_end_hist_cntr")=388
+	Set gtmtypes("shmpool_buff_hdr",389,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_t_end_hist1_nullbt_cntr"
+	Set gtmtypes("shmpool_buff_hdr",389,"off")=3796
 	Set gtmtypes("shmpool_buff_hdr",389,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",389,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_t_end_hist1_nullbt_cntr")=389
+	Set gtmtypes("shmpool_buff_hdr",390,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_t_end_hist1_nonnullbt_cntr"
+	Set gtmtypes("shmpool_buff_hdr",390,"off")=3800
 	Set gtmtypes("shmpool_buff_hdr",390,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",390,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_t_end_hist1_nonnullbt_cntr")=390
+	Set gtmtypes("shmpool_buff_hdr",391,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_t_end_bitmap_nullbt_cntr"
+	Set gtmtypes("shmpool_buff_hdr",391,"off")=3804
 	Set gtmtypes("shmpool_buff_hdr",391,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",391,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_t_end_bitmap_nullbt_cntr")=391
+	Set gtmtypes("shmpool_buff_hdr",392,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_t_end_bitmap_nonnullbt_cntr"
+	Set gtmtypes("shmpool_buff_hdr",392,"off")=3808
 	Set gtmtypes("shmpool_buff_hdr",392,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",392,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_t_end_bitmap_nonnullbt_cntr")=392
+	Set gtmtypes("shmpool_buff_hdr",393,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_t_end_jnl_cwset_cntr"
+	Set gtmtypes("shmpool_buff_hdr",393,"off")=3812
 	Set gtmtypes("shmpool_buff_hdr",393,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",393,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_t_end_jnl_cwset_cntr")=393
+	Set gtmtypes("shmpool_buff_hdr",394,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_t_end_jnl_wcsflu_cntr"
+	Set gtmtypes("shmpool_buff_hdr",394,"off")=3816
 	Set gtmtypes("shmpool_buff_hdr",394,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",394,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_t_end_jnl_wcsflu_cntr")=394
+	Set gtmtypes("shmpool_buff_hdr",395,"name")="shmpool_buff_hdr.shadow_file_header.db_csh_get_too_many_loops_cntr"
+	Set gtmtypes("shmpool_buff_hdr",395,"off")=3820
 	Set gtmtypes("shmpool_buff_hdr",395,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",395,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.db_csh_get_too_many_loops_cntr")=395
+	Set gtmtypes("shmpool_buff_hdr",396,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_tpckh_hist1_nullbt_cntr"
+	Set gtmtypes("shmpool_buff_hdr",396,"off")=3824
 	Set gtmtypes("shmpool_buff_hdr",396,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",396,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_tpckh_hist1_nullbt_cntr")=396
+	Set gtmtypes("shmpool_buff_hdr",397,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_tpckh_hist1_nonnullbt_cntr"
+	Set gtmtypes("shmpool_buff_hdr",397,"off")=3828
 	Set gtmtypes("shmpool_buff_hdr",397,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",397,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_tpckh_hist1_nonnullbt_cntr")=397
+	Set gtmtypes("shmpool_buff_hdr",398,"name")="shmpool_buff_hdr.shadow_file_header.jnl_blocked_writer_lost_cntr"
+	Set gtmtypes("shmpool_buff_hdr",398,"off")=3832
 	Set gtmtypes("shmpool_buff_hdr",398,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",398,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.jnl_blocked_writer_lost_cntr")=398
+	Set gtmtypes("shmpool_buff_hdr",399,"name")="shmpool_buff_hdr.shadow_file_header.jnl_blocked_writer_stuck_cntr"
+	Set gtmtypes("shmpool_buff_hdr",399,"off")=3836
 	Set gtmtypes("shmpool_buff_hdr",399,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",399,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.jnl_blocked_writer_stuck_cntr")=399
+	Set gtmtypes("shmpool_buff_hdr",400,"name")="shmpool_buff_hdr.shadow_file_header.jnl_blocked_writer_blocked_cntr"
+	Set gtmtypes("shmpool_buff_hdr",400,"off")=3840
 	Set gtmtypes("shmpool_buff_hdr",400,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",400,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.jnl_blocked_writer_blocked_cntr")=400
+	Set gtmtypes("shmpool_buff_hdr",401,"name")="shmpool_buff_hdr.shadow_file_header.n_jnl_fsyncs_cntr"
+	Set gtmtypes("shmpool_buff_hdr",401,"off")=3844
 	Set gtmtypes("shmpool_buff_hdr",401,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",401,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_jnl_fsyncs_cntr")=401
+	Set gtmtypes("shmpool_buff_hdr",402,"name")="shmpool_buff_hdr.shadow_file_header.n_jnl_fsync_tries_cntr"
+	Set gtmtypes("shmpool_buff_hdr",402,"off")=3848
 	Set gtmtypes("shmpool_buff_hdr",402,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",402,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_jnl_fsync_tries_cntr")=402
+	Set gtmtypes("shmpool_buff_hdr",403,"name")="shmpool_buff_hdr.shadow_file_header.n_jnl_fsync_recovers_cntr"
+	Set gtmtypes("shmpool_buff_hdr",403,"off")=3852
 	Set gtmtypes("shmpool_buff_hdr",403,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",403,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_jnl_fsync_recovers_cntr")=403
+	Set gtmtypes("shmpool_buff_hdr",404,"name")="shmpool_buff_hdr.shadow_file_header.n_db_fsyncs_cntr"
+	Set gtmtypes("shmpool_buff_hdr",404,"off")=3856
 	Set gtmtypes("shmpool_buff_hdr",404,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",404,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_db_fsyncs_cntr")=404
+	Set gtmtypes("shmpool_buff_hdr",405,"name")="shmpool_buff_hdr.shadow_file_header.n_db_fsyncs_in_crit_cntr"
+	Set gtmtypes("shmpool_buff_hdr",405,"off")=3860
 	Set gtmtypes("shmpool_buff_hdr",405,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",405,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_db_fsyncs_in_crit_cntr")=405
+	Set gtmtypes("shmpool_buff_hdr",406,"name")="shmpool_buff_hdr.shadow_file_header.n_dbsync_timers_cntr"
+	Set gtmtypes("shmpool_buff_hdr",406,"off")=3864
 	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_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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_dbsync_timers_cntr")=406
+	Set gtmtypes("shmpool_buff_hdr",407,"name")="shmpool_buff_hdr.shadow_file_header.n_dbsync_writes_cntr"
+	Set gtmtypes("shmpool_buff_hdr",407,"off")=3868
 	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_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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_dbsync_writes_cntr")=407
+	Set gtmtypes("shmpool_buff_hdr",408,"name")="shmpool_buff_hdr.shadow_file_header.mutex_queue_full_cntr"
+	Set gtmtypes("shmpool_buff_hdr",408,"off")=3872
 	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_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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.mutex_queue_full_cntr")=408
+	Set gtmtypes("shmpool_buff_hdr",409,"name")="shmpool_buff_hdr.shadow_file_header.wcb_bt_put_cntr"
+	Set gtmtypes("shmpool_buff_hdr",409,"off")=3876
 	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_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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_bt_put_cntr")=409
+	Set gtmtypes("shmpool_buff_hdr",410,"name")="shmpool_buff_hdr.shadow_file_header.wcb_mutex_salvage_cntr"
+	Set gtmtypes("shmpool_buff_hdr",410,"off")=3880
 	Set gtmtypes("shmpool_buff_hdr",410,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",410,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_mutex_salvage_cntr")=410
+	Set gtmtypes("shmpool_buff_hdr",411,"name")="shmpool_buff_hdr.shadow_file_header.wcb_wcs_flu0_cntr"
+	Set gtmtypes("shmpool_buff_hdr",411,"off")=3884
 	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_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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_wcs_flu0_cntr")=411
+	Set gtmtypes("shmpool_buff_hdr",412,"name")="shmpool_buff_hdr.shadow_file_header.wcb_t_end_sysops_nocr_invcr_cntr"
+	Set gtmtypes("shmpool_buff_hdr",412,"off")=3888
 	Set gtmtypes("shmpool_buff_hdr",412,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",412,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_t_end_sysops_nocr_invcr_cntr")=412
+	Set gtmtypes("shmpool_buff_hdr",413,"name")="shmpool_buff_hdr.shadow_file_header.wcb_t_end_sysops_cr_invcr_cntr"
+	Set gtmtypes("shmpool_buff_hdr",413,"off")=3892
 	Set gtmtypes("shmpool_buff_hdr",413,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",413,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_t_end_sysops_cr_invcr_cntr")=413
+	Set gtmtypes("shmpool_buff_hdr",414,"name")="shmpool_buff_hdr.shadow_file_header.wcb_t_end_sysops_rip_wait_cntr"
+	Set gtmtypes("shmpool_buff_hdr",414,"off")=3896
 	Set gtmtypes("shmpool_buff_hdr",414,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",414,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_t_end_sysops_rip_wait_cntr")=414
+	Set gtmtypes("shmpool_buff_hdr",415,"name")="shmpool_buff_hdr.shadow_file_header.wcb_t_end_sysops_dirtyripwait_cntr"
+	Set gtmtypes("shmpool_buff_hdr",415,"off")=3900
 	Set gtmtypes("shmpool_buff_hdr",415,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",415,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_t_end_sysops_dirtyripwait_cntr")=415
+	Set gtmtypes("shmpool_buff_hdr",416,"name")="shmpool_buff_hdr.shadow_file_header.wcb_gds_rundown1_cntr"
+	Set gtmtypes("shmpool_buff_hdr",416,"off")=3904
 	Set gtmtypes("shmpool_buff_hdr",416,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",416,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_gds_rundown1_cntr")=416
+	Set gtmtypes("shmpool_buff_hdr",417,"name")="shmpool_buff_hdr.shadow_file_header.wcb_wcs_flu1_cntr"
+	Set gtmtypes("shmpool_buff_hdr",417,"off")=3908
 	Set gtmtypes("shmpool_buff_hdr",417,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",417,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_wcs_flu1_cntr")=417
+	Set gtmtypes("shmpool_buff_hdr",418,"name")="shmpool_buff_hdr.shadow_file_header.wcb_mu_back_cntr"
+	Set gtmtypes("shmpool_buff_hdr",418,"off")=3912
 	Set gtmtypes("shmpool_buff_hdr",418,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",418,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_mu_back_cntr")=418
+	Set gtmtypes("shmpool_buff_hdr",419,"name")="shmpool_buff_hdr.shadow_file_header.wcb_t_end_sysops_dirty_invcr_cntr"
+	Set gtmtypes("shmpool_buff_hdr",419,"off")=3916
 	Set gtmtypes("shmpool_buff_hdr",419,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",419,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_t_end_sysops_dirty_invcr_cntr")=419
+	Set gtmtypes("shmpool_buff_hdr",420,"name")="shmpool_buff_hdr.shadow_file_header.wcb_t_end_sysops_wtfini_fail_cntr"
+	Set gtmtypes("shmpool_buff_hdr",420,"off")=3920
 	Set gtmtypes("shmpool_buff_hdr",420,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",420,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_t_end_sysops_wtfini_fail_cntr")=420
+	Set gtmtypes("shmpool_buff_hdr",421,"name")="shmpool_buff_hdr.shadow_file_header.wcb_t_end_sysops_twin_stuck_cntr"
+	Set gtmtypes("shmpool_buff_hdr",421,"off")=3924
 	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_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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_t_end_sysops_twin_stuck_cntr")=421
+	Set gtmtypes("shmpool_buff_hdr",422,"name")="shmpool_buff_hdr.shadow_file_header.db_csh_getn_wrt_latch_stuck_cntr"
+	Set gtmtypes("shmpool_buff_hdr",422,"off")=3928
 	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_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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.db_csh_getn_wrt_latch_stuck_cntr")=422
+	Set gtmtypes("shmpool_buff_hdr",423,"name")="shmpool_buff_hdr.shadow_file_header.wcb_secshr_db_clnup_now_crit_cntr"
+	Set gtmtypes("shmpool_buff_hdr",423,"off")=3932
 	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_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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_secshr_db_clnup_now_crit_cntr")=423
+	Set gtmtypes("shmpool_buff_hdr",424,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_t_qread_bad_bt_index1_cntr"
+	Set gtmtypes("shmpool_buff_hdr",424,"off")=3936
 	Set gtmtypes("shmpool_buff_hdr",424,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",424,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_t_qread_bad_bt_index1_cntr")=424
+	Set gtmtypes("shmpool_buff_hdr",425,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_t_qread_bad_bt_index2_cntr"
+	Set gtmtypes("shmpool_buff_hdr",425,"off")=3940
 	Set gtmtypes("shmpool_buff_hdr",425,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",425,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_t_qread_bad_bt_index2_cntr")=425
+	Set gtmtypes("shmpool_buff_hdr",426,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_t_end_crbtmismatch1_cntr"
+	Set gtmtypes("shmpool_buff_hdr",426,"off")=3944
 	Set gtmtypes("shmpool_buff_hdr",426,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",426,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_t_end_crbtmismatch1_cntr")=426
+	Set gtmtypes("shmpool_buff_hdr",427,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_t_end_crbtmismatch2_cntr"
+	Set gtmtypes("shmpool_buff_hdr",427,"off")=3948
 	Set gtmtypes("shmpool_buff_hdr",427,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",427,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_t_end_crbtmismatch2_cntr")=427
+	Set gtmtypes("shmpool_buff_hdr",428,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_t_end_crbtmismatch3_cntr"
+	Set gtmtypes("shmpool_buff_hdr",428,"off")=3952
 	Set gtmtypes("shmpool_buff_hdr",428,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",428,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_t_end_crbtmismatch3_cntr")=428
+	Set gtmtypes("shmpool_buff_hdr",429,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_tp_tend_crbtmismatch1_cntr"
+	Set gtmtypes("shmpool_buff_hdr",429,"off")=3956
 	Set gtmtypes("shmpool_buff_hdr",429,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",429,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_tp_tend_crbtmismatch1_cntr")=429
+	Set gtmtypes("shmpool_buff_hdr",430,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_tp_tend_crbtmismatch2_cntr"
+	Set gtmtypes("shmpool_buff_hdr",430,"off")=3960
 	Set gtmtypes("shmpool_buff_hdr",430,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",430,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_tp_tend_crbtmismatch2_cntr")=430
+	Set gtmtypes("shmpool_buff_hdr",431,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_tp_tend_crbtmismatch3_cntr"
+	Set gtmtypes("shmpool_buff_hdr",431,"off")=3964
 	Set gtmtypes("shmpool_buff_hdr",431,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",431,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_tp_tend_crbtmismatch3_cntr")=431
+	Set gtmtypes("shmpool_buff_hdr",432,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_wcs_wtstart_bad_cr_cntr"
+	Set gtmtypes("shmpool_buff_hdr",432,"off")=3968
 	Set gtmtypes("shmpool_buff_hdr",432,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",432,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_wcs_wtstart_bad_cr_cntr")=432
+	Set gtmtypes("shmpool_buff_hdr",433,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_wcs_wtfini_bad_cr_cntr"
+	Set gtmtypes("shmpool_buff_hdr",433,"off")=3972
 	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_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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_wcs_wtfini_bad_cr_cntr")=433
+	Set gtmtypes("shmpool_buff_hdr",434,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_bt_get_cntr"
+	Set gtmtypes("shmpool_buff_hdr",434,"off")=3976
 	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_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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_bt_get_cntr")=434
+	Set gtmtypes("shmpool_buff_hdr",435,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_wcs_cdb_sc_final_retry_cntr"
+	Set gtmtypes("shmpool_buff_hdr",435,"off")=3980
 	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_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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_wcs_cdb_sc_final_retry_cntr")=435
+	Set gtmtypes("shmpool_buff_hdr",436,"name")="shmpool_buff_hdr.shadow_file_header.wcb_bg_update_lckfail1_cntr"
+	Set gtmtypes("shmpool_buff_hdr",436,"off")=3984
 	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_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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_bg_update_lckfail1_cntr")=436
+	Set gtmtypes("shmpool_buff_hdr",437,"name")="shmpool_buff_hdr.shadow_file_header.wcb_bg_update_lckfail2_cntr"
+	Set gtmtypes("shmpool_buff_hdr",437,"off")=3988
 	Set gtmtypes("shmpool_buff_hdr",437,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",437,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_bg_update_lckfail2_cntr")=437
+	Set gtmtypes("shmpool_buff_hdr",438,"name")="shmpool_buff_hdr.shadow_file_header.wcb_wtstart_lckfail1_cntr"
+	Set gtmtypes("shmpool_buff_hdr",438,"off")=3992
 	Set gtmtypes("shmpool_buff_hdr",438,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",438,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_wtstart_lckfail1_cntr")=438
+	Set gtmtypes("shmpool_buff_hdr",439,"name")="shmpool_buff_hdr.shadow_file_header.wcb_wtstart_lckfail2_cntr"
+	Set gtmtypes("shmpool_buff_hdr",439,"off")=3996
 	Set gtmtypes("shmpool_buff_hdr",439,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",439,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_wtstart_lckfail2_cntr")=439
+	Set gtmtypes("shmpool_buff_hdr",440,"name")="shmpool_buff_hdr.shadow_file_header.wcb_wtstart_lckfail3_cntr"
+	Set gtmtypes("shmpool_buff_hdr",440,"off")=4000
 	Set gtmtypes("shmpool_buff_hdr",440,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",440,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_wtstart_lckfail3_cntr")=440
+	Set gtmtypes("shmpool_buff_hdr",441,"name")="shmpool_buff_hdr.shadow_file_header.wcb_wtstart_lckfail4_cntr"
+	Set gtmtypes("shmpool_buff_hdr",441,"off")=4004
 	Set gtmtypes("shmpool_buff_hdr",441,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",441,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_wtstart_lckfail4_cntr")=441
+	Set gtmtypes("shmpool_buff_hdr",442,"name")="shmpool_buff_hdr.shadow_file_header.wcb_wtfini_lckfail1_cntr"
+	Set gtmtypes("shmpool_buff_hdr",442,"off")=4008
 	Set gtmtypes("shmpool_buff_hdr",442,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",442,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_wtfini_lckfail1_cntr")=442
+	Set gtmtypes("shmpool_buff_hdr",443,"name")="shmpool_buff_hdr.shadow_file_header.wcb_wtfini_lckfail2_cntr"
+	Set gtmtypes("shmpool_buff_hdr",443,"off")=4012
 	Set gtmtypes("shmpool_buff_hdr",443,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",443,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_wtfini_lckfail2_cntr")=443
+	Set gtmtypes("shmpool_buff_hdr",444,"name")="shmpool_buff_hdr.shadow_file_header.wcb_wtfini_lckfail3_cntr"
+	Set gtmtypes("shmpool_buff_hdr",444,"off")=4016
 	Set gtmtypes("shmpool_buff_hdr",444,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",444,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_wtfini_lckfail3_cntr")=444
+	Set gtmtypes("shmpool_buff_hdr",445,"name")="shmpool_buff_hdr.shadow_file_header.wcb_wtfini_lckfail4_cntr"
+	Set gtmtypes("shmpool_buff_hdr",445,"off")=4020
 	Set gtmtypes("shmpool_buff_hdr",445,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",445,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_wtfini_lckfail4_cntr")=445
+	Set gtmtypes("shmpool_buff_hdr",446,"name")="shmpool_buff_hdr.shadow_file_header.wcb_t_end_sysops_dirtystuck1_cntr"
+	Set gtmtypes("shmpool_buff_hdr",446,"off")=4024
 	Set gtmtypes("shmpool_buff_hdr",446,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",446,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_t_end_sysops_dirtystuck1_cntr")=446
+	Set gtmtypes("shmpool_buff_hdr",447,"name")="shmpool_buff_hdr.shadow_file_header.wcb_t_end_sysops_dirtystuck2_cntr"
+	Set gtmtypes("shmpool_buff_hdr",447,"off")=4028
 	Set gtmtypes("shmpool_buff_hdr",447,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",447,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_t_end_sysops_dirtystuck2_cntr")=447
+	Set gtmtypes("shmpool_buff_hdr",448,"name")="shmpool_buff_hdr.shadow_file_header.wcb_secshr_db_clnup_wbuf_dqd_cntr"
+	Set gtmtypes("shmpool_buff_hdr",448,"off")=4032
 	Set gtmtypes("shmpool_buff_hdr",448,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",448,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_secshr_db_clnup_wbuf_dqd_cntr")=448
+	Set gtmtypes("shmpool_buff_hdr",449,"name")="shmpool_buff_hdr.shadow_file_header.dwngrd_refmts_syncio_cntr"
+	Set gtmtypes("shmpool_buff_hdr",449,"off")=4036
 	Set gtmtypes("shmpool_buff_hdr",449,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",449,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.dwngrd_refmts_syncio_cntr")=449
+	Set gtmtypes("shmpool_buff_hdr",450,"name")="shmpool_buff_hdr.shadow_file_header.dwngrd_refmts_asyncio_cntr"
+	Set gtmtypes("shmpool_buff_hdr",450,"off")=4040
 	Set gtmtypes("shmpool_buff_hdr",450,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",450,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.dwngrd_refmts_asyncio_cntr")=450
+	Set gtmtypes("shmpool_buff_hdr",451,"name")="shmpool_buff_hdr.shadow_file_header.shmpool_refmt_harvests_cntr"
+	Set gtmtypes("shmpool_buff_hdr",451,"off")=4044
 	Set gtmtypes("shmpool_buff_hdr",451,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",451,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.shmpool_refmt_harvests_cntr")=451
+	Set gtmtypes("shmpool_buff_hdr",452,"name")="shmpool_buff_hdr.shadow_file_header.shmpool_recovery_cntr"
+	Set gtmtypes("shmpool_buff_hdr",452,"off")=4048
 	Set gtmtypes("shmpool_buff_hdr",452,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",452,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.shmpool_recovery_cntr")=452
+	Set gtmtypes("shmpool_buff_hdr",453,"name")="shmpool_buff_hdr.shadow_file_header.shmpool_blkd_by_sdc_cntr"
+	Set gtmtypes("shmpool_buff_hdr",453,"off")=4052
 	Set gtmtypes("shmpool_buff_hdr",453,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",453,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.shmpool_blkd_by_sdc_cntr")=453
+	Set gtmtypes("shmpool_buff_hdr",454,"name")="shmpool_buff_hdr.shadow_file_header.shmpool_alloc_bbflush_cntr"
+	Set gtmtypes("shmpool_buff_hdr",454,"off")=4056
 	Set gtmtypes("shmpool_buff_hdr",454,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",454,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.shmpool_alloc_bbflush_cntr")=454
+	Set gtmtypes("shmpool_buff_hdr",455,"name")="shmpool_buff_hdr.shadow_file_header.refmt_hvst_blk_released_replaced_cntr"
+	Set gtmtypes("shmpool_buff_hdr",455,"off")=4060
 	Set gtmtypes("shmpool_buff_hdr",455,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",455,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.refmt_hvst_blk_released_replaced_cntr")=455
+	Set gtmtypes("shmpool_buff_hdr",456,"name")="shmpool_buff_hdr.shadow_file_header.refmt_hvst_blk_released_io_complete_cntr"
+	Set gtmtypes("shmpool_buff_hdr",456,"off")=4064
 	Set gtmtypes("shmpool_buff_hdr",456,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",456,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.refmt_hvst_blk_released_io_complete_cntr")=456
+	Set gtmtypes("shmpool_buff_hdr",457,"name")="shmpool_buff_hdr.shadow_file_header.refmt_hvst_blk_kept_cntr"
+	Set gtmtypes("shmpool_buff_hdr",457,"off")=4068
 	Set gtmtypes("shmpool_buff_hdr",457,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",457,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.refmt_hvst_blk_kept_cntr")=457
+	Set gtmtypes("shmpool_buff_hdr",458,"name")="shmpool_buff_hdr.shadow_file_header.refmt_hvst_blk_ignored_cntr"
+	Set gtmtypes("shmpool_buff_hdr",458,"off")=4072
 	Set gtmtypes("shmpool_buff_hdr",458,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",458,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.refmt_hvst_blk_ignored_cntr")=458
+	Set gtmtypes("shmpool_buff_hdr",459,"name")="shmpool_buff_hdr.shadow_file_header.refmt_blk_chk_blk_freed_cntr"
+	Set gtmtypes("shmpool_buff_hdr",459,"off")=4076
 	Set gtmtypes("shmpool_buff_hdr",459,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",459,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.refmt_blk_chk_blk_freed_cntr")=459
+	Set gtmtypes("shmpool_buff_hdr",460,"name")="shmpool_buff_hdr.shadow_file_header.refmt_blk_chk_blk_kept_cntr"
+	Set gtmtypes("shmpool_buff_hdr",460,"off")=4080
 	Set gtmtypes("shmpool_buff_hdr",460,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",460,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.refmt_blk_chk_blk_kept_cntr")=460
+	Set gtmtypes("shmpool_buff_hdr",461,"name")="shmpool_buff_hdr.shadow_file_header.active_lvl_trigger_cntr"
+	Set gtmtypes("shmpool_buff_hdr",461,"off")=4084
 	Set gtmtypes("shmpool_buff_hdr",461,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",461,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.active_lvl_trigger_cntr")=461
+	Set gtmtypes("shmpool_buff_hdr",462,"name")="shmpool_buff_hdr.shadow_file_header.new_buff_cntr"
+	Set gtmtypes("shmpool_buff_hdr",462,"off")=4088
 	Set gtmtypes("shmpool_buff_hdr",462,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",462,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.new_buff_cntr")=462
+	Set gtmtypes("shmpool_buff_hdr",463,"name")="shmpool_buff_hdr.shadow_file_header.phase2_commit_wait_sleep_in_crit_cntr"
+	Set gtmtypes("shmpool_buff_hdr",463,"off")=4092
 	Set gtmtypes("shmpool_buff_hdr",463,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",463,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.phase2_commit_wait_sleep_in_crit_cntr")=463
+	Set gtmtypes("shmpool_buff_hdr",464,"name")="shmpool_buff_hdr.shadow_file_header.phase2_commit_wait_sleep_no_crit_cntr"
+	Set gtmtypes("shmpool_buff_hdr",464,"off")=4096
 	Set gtmtypes("shmpool_buff_hdr",464,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",464,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.phase2_commit_wait_sleep_no_crit_cntr")=464
+	Set gtmtypes("shmpool_buff_hdr",465,"name")="shmpool_buff_hdr.shadow_file_header.phase2_commit_wait_pidcnt_cntr"
+	Set gtmtypes("shmpool_buff_hdr",465,"off")=4100
 	Set gtmtypes("shmpool_buff_hdr",465,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",465,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.phase2_commit_wait_pidcnt_cntr")=465
+	Set gtmtypes("shmpool_buff_hdr",466,"name")="shmpool_buff_hdr.shadow_file_header.wcb_t_end_sysops_intend_wait_cntr"
+	Set gtmtypes("shmpool_buff_hdr",466,"off")=4104
 	Set gtmtypes("shmpool_buff_hdr",466,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",466,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_t_end_sysops_intend_wait_cntr")=466
+	Set gtmtypes("shmpool_buff_hdr",467,"name")="shmpool_buff_hdr.shadow_file_header.wcb_secshr_db_clnup_phase2_clnup_cntr"
+	Set gtmtypes("shmpool_buff_hdr",467,"off")=4108
 	Set gtmtypes("shmpool_buff_hdr",467,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",467,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_secshr_db_clnup_phase2_clnup_cntr")=467
+	Set gtmtypes("shmpool_buff_hdr",468,"name")="shmpool_buff_hdr.shadow_file_header.wcb_phase2_commit_wait_cntr"
+	Set gtmtypes("shmpool_buff_hdr",468,"off")=4112
 	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_phase2_commit_wait_cntr")=468
+	Set gtmtypes("shmpool_buff_hdr",469,"name")="shmpool_buff_hdr.shadow_file_header.recompute_upd_array_calls_cntr"
+	Set gtmtypes("shmpool_buff_hdr",469,"off")=4116
 	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.recompute_upd_array_calls_cntr")=469
+	Set gtmtypes("shmpool_buff_hdr",470,"name")="shmpool_buff_hdr.shadow_file_header.recompute_upd_array_rip_cntr"
+	Set gtmtypes("shmpool_buff_hdr",470,"off")=4120
 	Set gtmtypes("shmpool_buff_hdr",470,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",470,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.recompute_upd_array_rip_cntr")=470
+	Set gtmtypes("shmpool_buff_hdr",471,"name")="shmpool_buff_hdr.shadow_file_header.recompute_upd_array_in_tend_cntr"
+	Set gtmtypes("shmpool_buff_hdr",471,"off")=4124
 	Set gtmtypes("shmpool_buff_hdr",471,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",471,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.recompute_upd_array_in_tend_cntr")=471
+	Set gtmtypes("shmpool_buff_hdr",472,"name")="shmpool_buff_hdr.shadow_file_header.recompute_upd_array_search_blk_cntr"
+	Set gtmtypes("shmpool_buff_hdr",472,"off")=4128
 	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.recompute_upd_array_search_blk_cntr")=472
+	Set gtmtypes("shmpool_buff_hdr",473,"name")="shmpool_buff_hdr.shadow_file_header.recompute_upd_array_new_rec_cntr"
+	Set gtmtypes("shmpool_buff_hdr",473,"off")=4132
 	Set gtmtypes("shmpool_buff_hdr",473,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",473,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.recompute_upd_array_new_rec_cntr")=473
+	Set gtmtypes("shmpool_buff_hdr",474,"name")="shmpool_buff_hdr.shadow_file_header.recompute_upd_array_rec_size_cntr"
+	Set gtmtypes("shmpool_buff_hdr",474,"off")=4136
 	Set gtmtypes("shmpool_buff_hdr",474,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",474,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.recompute_upd_array_rec_size_cntr")=474
+	Set gtmtypes("shmpool_buff_hdr",475,"name")="shmpool_buff_hdr.shadow_file_header.recompute_upd_array_rec_cmpc_cntr"
+	Set gtmtypes("shmpool_buff_hdr",475,"off")=4140
 	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.recompute_upd_array_rec_cmpc_cntr")=475
+	Set gtmtypes("shmpool_buff_hdr",476,"name")="shmpool_buff_hdr.shadow_file_header.recompute_upd_array_blk_fini_cntr"
+	Set gtmtypes("shmpool_buff_hdr",476,"off")=4144
 	Set gtmtypes("shmpool_buff_hdr",476,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",476,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.recompute_upd_array_blk_fini_cntr")=476
+	Set gtmtypes("shmpool_buff_hdr",477,"name")="shmpool_buff_hdr.shadow_file_header.recompute_upd_array_blk_split_cntr"
+	Set gtmtypes("shmpool_buff_hdr",477,"off")=4148
 	Set gtmtypes("shmpool_buff_hdr",477,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",477,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.recompute_upd_array_blk_split_cntr")=477
+	Set gtmtypes("shmpool_buff_hdr",478,"name")="shmpool_buff_hdr.shadow_file_header.t_qread_ripsleep_cnt_cntr"
+	Set gtmtypes("shmpool_buff_hdr",478,"off")=4152
 	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.t_qread_ripsleep_cnt_cntr")=478
+	Set gtmtypes("shmpool_buff_hdr",479,"name")="shmpool_buff_hdr.shadow_file_header.t_qread_ripsleep_nblks_cntr"
+	Set gtmtypes("shmpool_buff_hdr",479,"off")=4156
 	Set gtmtypes("shmpool_buff_hdr",479,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",479,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.t_qread_ripsleep_nblks_cntr")=479
+	Set gtmtypes("shmpool_buff_hdr",480,"name")="shmpool_buff_hdr.shadow_file_header.wcs_wtfini_invoked_cntr"
+	Set gtmtypes("shmpool_buff_hdr",480,"off")=4160
 	Set gtmtypes("shmpool_buff_hdr",480,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",480,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcs_wtfini_invoked_cntr")=480
+	Set gtmtypes("shmpool_buff_hdr",481,"name")="shmpool_buff_hdr.shadow_file_header.wcs_wterror_invoked_cntr"
+	Set gtmtypes("shmpool_buff_hdr",481,"off")=4164
 	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcs_wterror_invoked_cntr")=481
+	Set gtmtypes("shmpool_buff_hdr",482,"name")="shmpool_buff_hdr.shadow_file_header.wcs_wt_restart_invoked_cntr"
+	Set gtmtypes("shmpool_buff_hdr",482,"off")=4168
 	Set gtmtypes("shmpool_buff_hdr",482,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",482,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcs_wt_restart_invoked_cntr")=482
+	Set gtmtypes("shmpool_buff_hdr",483,"name")="shmpool_buff_hdr.shadow_file_header.wcs_wt_restart_eagain_cntr"
+	Set gtmtypes("shmpool_buff_hdr",483,"off")=4172
 	Set gtmtypes("shmpool_buff_hdr",483,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",483,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcs_wt_restart_eagain_cntr")=483
+	Set gtmtypes("shmpool_buff_hdr",484,"name")="shmpool_buff_hdr.shadow_file_header.wcs_wt_restart_reinsert_cntr"
+	Set gtmtypes("shmpool_buff_hdr",484,"off")=4176
 	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcs_wt_restart_reinsert_cntr")=484
+	Set gtmtypes("shmpool_buff_hdr",485,"name")="shmpool_buff_hdr.shadow_file_header.wcs_wtstart_eagain_cntr"
+	Set gtmtypes("shmpool_buff_hdr",485,"off")=4180
+	Set gtmtypes("shmpool_buff_hdr",485,"len")=4
+	Set gtmtypes("shmpool_buff_hdr",485,"type")="int"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcs_wtstart_eagain_cntr")=485
+	Set gtmtypes("shmpool_buff_hdr",486,"name")="shmpool_buff_hdr.shadow_file_header.wcs_wtstart_eagain_incrit_cntr"
+	Set gtmtypes("shmpool_buff_hdr",486,"off")=4184
+	Set gtmtypes("shmpool_buff_hdr",486,"len")=4
+	Set gtmtypes("shmpool_buff_hdr",486,"type")="int"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcs_wtstart_eagain_incrit_cntr")=486
+	Set gtmtypes("shmpool_buff_hdr",487,"name")="shmpool_buff_hdr.shadow_file_header.async_restart_eagain_cntr"
+	Set gtmtypes("shmpool_buff_hdr",487,"off")=4188
 	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.async_restart_eagain_cntr")=487
+	Set gtmtypes("shmpool_buff_hdr",488,"name")="shmpool_buff_hdr.shadow_file_header.jnlbuff_phs2cmt_array_full_cntr"
+	Set gtmtypes("shmpool_buff_hdr",488,"off")=4192
 	Set gtmtypes("shmpool_buff_hdr",488,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",488,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.jnlbuff_phs2cmt_array_full_cntr")=488
+	Set gtmtypes("shmpool_buff_hdr",489,"name")="shmpool_buff_hdr.shadow_file_header.jnl_phase2_cleanup_if_possible_cntr"
+	Set gtmtypes("shmpool_buff_hdr",489,"off")=4196
+	Set gtmtypes("shmpool_buff_hdr",489,"len")=4
+	Set gtmtypes("shmpool_buff_hdr",489,"type")="int"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.jnl_phase2_cleanup_if_possible_cntr")=489
+	Set gtmtypes("shmpool_buff_hdr",490,"name")="shmpool_buff_hdr.shadow_file_header.jnlbuff_phs2cmt_isprcalv_cntr"
+	Set gtmtypes("shmpool_buff_hdr",490,"off")=4200
 	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_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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.jnlbuff_phs2cmt_isprcalv_cntr")=490
+	Set gtmtypes("shmpool_buff_hdr",491,"name")="shmpool_buff_hdr.shadow_file_header.bg_trc_rec_cntr_filler"
+	Set gtmtypes("shmpool_buff_hdr",491,"off")=4204
+	Set gtmtypes("shmpool_buff_hdr",491,"len")=12
+	Set gtmtypes("shmpool_buff_hdr",491,"type")="char"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.bg_trc_rec_cntr_filler")=491
+	Set gtmtypes("shmpool_buff_hdr",492,"name")="shmpool_buff_hdr.shadow_file_header.n_gvcst_srches"
+	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")=4232
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_gvcst_srches")=492
+	Set gtmtypes("shmpool_buff_hdr",493,"name")="shmpool_buff_hdr.shadow_file_header.n_gvcst_srches.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")=4236
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_gvcst_srches.curr_count")=493
+	Set gtmtypes("shmpool_buff_hdr",494,"name")="shmpool_buff_hdr.shadow_file_header.n_gvcst_srches.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.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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_gvcst_srches.cumul_count")=494
+	Set gtmtypes("shmpool_buff_hdr",495,"name")="shmpool_buff_hdr.shadow_file_header.n_gvcst_srch_clues"
+	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")=4240
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_gvcst_srch_clues")=495
+	Set gtmtypes("shmpool_buff_hdr",496,"name")="shmpool_buff_hdr.shadow_file_header.n_gvcst_srch_clues.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")=4244
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_gvcst_srch_clues.curr_count")=496
+	Set gtmtypes("shmpool_buff_hdr",497,"name")="shmpool_buff_hdr.shadow_file_header.n_gvcst_srch_clues.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_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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_gvcst_srch_clues.cumul_count")=497
+	Set gtmtypes("shmpool_buff_hdr",498,"name")="shmpool_buff_hdr.shadow_file_header.n_clue_used_head"
+	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")=4248
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_clue_used_head")=498
+	Set gtmtypes("shmpool_buff_hdr",499,"name")="shmpool_buff_hdr.shadow_file_header.n_clue_used_head.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")=4252
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_clue_used_head.curr_count")=499
+	Set gtmtypes("shmpool_buff_hdr",500,"name")="shmpool_buff_hdr.shadow_file_header.n_clue_used_head.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_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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_clue_used_head.cumul_count")=500
+	Set gtmtypes("shmpool_buff_hdr",501,"name")="shmpool_buff_hdr.shadow_file_header.n_clue_used_same"
+	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")=4256
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_clue_used_same")=501
+	Set gtmtypes("shmpool_buff_hdr",502,"name")="shmpool_buff_hdr.shadow_file_header.n_clue_used_same.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")=4260
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_clue_used_same.curr_count")=502
+	Set gtmtypes("shmpool_buff_hdr",503,"name")="shmpool_buff_hdr.shadow_file_header.n_clue_used_same.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_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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_clue_used_same.cumul_count")=503
+	Set gtmtypes("shmpool_buff_hdr",504,"name")="shmpool_buff_hdr.shadow_file_header.n_clue_used_tail"
+	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")=4264
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_clue_used_tail")=504
+	Set gtmtypes("shmpool_buff_hdr",505,"name")="shmpool_buff_hdr.shadow_file_header.n_clue_used_tail.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")=4268
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_clue_used_tail.curr_count")=505
+	Set gtmtypes("shmpool_buff_hdr",506,"name")="shmpool_buff_hdr.shadow_file_header.n_clue_used_tail.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")=4272
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_clue_used_tail.cumul_count")=506
+	Set gtmtypes("shmpool_buff_hdr",507,"name")="shmpool_buff_hdr.shadow_file_header.n_t_qreads"
+	Set gtmtypes("shmpool_buff_hdr",507,"off")=4256
 	Set gtmtypes("shmpool_buff_hdr",507,"len")=8
 	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_t_qreads")=507
+	Set gtmtypes("shmpool_buff_hdr",508,"name")="shmpool_buff_hdr.shadow_file_header.n_t_qreads.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")=4276
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_t_qreads.curr_count")=508
+	Set gtmtypes("shmpool_buff_hdr",509,"name")="shmpool_buff_hdr.shadow_file_header.n_t_qreads.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")=4280
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_t_qreads.cumul_count")=509
+	Set gtmtypes("shmpool_buff_hdr",510,"name")="shmpool_buff_hdr.shadow_file_header.unused_dsk_reads"
+	Set gtmtypes("shmpool_buff_hdr",510,"off")=4264
 	Set gtmtypes("shmpool_buff_hdr",510,"len")=8
 	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.unused_dsk_reads")=510
+	Set gtmtypes("shmpool_buff_hdr",511,"name")="shmpool_buff_hdr.shadow_file_header.unused_dsk_reads.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")=4284
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.unused_dsk_reads.curr_count")=511
+	Set gtmtypes("shmpool_buff_hdr",512,"name")="shmpool_buff_hdr.shadow_file_header.unused_dsk_reads.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")=4288
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.unused_dsk_reads.cumul_count")=512
+	Set gtmtypes("shmpool_buff_hdr",513,"name")="shmpool_buff_hdr.shadow_file_header.n_bgmm_updates"
+	Set gtmtypes("shmpool_buff_hdr",513,"off")=4272
 	Set gtmtypes("shmpool_buff_hdr",513,"len")=8
 	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_bgmm_updates")=513
+	Set gtmtypes("shmpool_buff_hdr",514,"name")="shmpool_buff_hdr.shadow_file_header.n_bgmm_updates.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")=4292
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_bgmm_updates.curr_count")=514
+	Set gtmtypes("shmpool_buff_hdr",515,"name")="shmpool_buff_hdr.shadow_file_header.n_bgmm_updates.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")=4296
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_bgmm_updates.cumul_count")=515
+	Set gtmtypes("shmpool_buff_hdr",516,"name")="shmpool_buff_hdr.shadow_file_header.unused_dsk_writes"
+	Set gtmtypes("shmpool_buff_hdr",516,"off")=4280
 	Set gtmtypes("shmpool_buff_hdr",516,"len")=8
 	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.unused_dsk_writes")=516
+	Set gtmtypes("shmpool_buff_hdr",517,"name")="shmpool_buff_hdr.shadow_file_header.unused_dsk_writes.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")=4300
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.unused_dsk_writes.curr_count")=517
+	Set gtmtypes("shmpool_buff_hdr",518,"name")="shmpool_buff_hdr.shadow_file_header.unused_dsk_writes.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")=4304
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.unused_dsk_writes.cumul_count")=518
+	Set gtmtypes("shmpool_buff_hdr",519,"name")="shmpool_buff_hdr.shadow_file_header.n_bg_update_creates"
+	Set gtmtypes("shmpool_buff_hdr",519,"off")=4288
 	Set gtmtypes("shmpool_buff_hdr",519,"len")=8
 	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_bg_update_creates")=519
+	Set gtmtypes("shmpool_buff_hdr",520,"name")="shmpool_buff_hdr.shadow_file_header.n_bg_update_creates.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")=4308
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_bg_update_creates.curr_count")=520
+	Set gtmtypes("shmpool_buff_hdr",521,"name")="shmpool_buff_hdr.shadow_file_header.n_bg_update_creates.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")=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_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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_bg_update_creates.cumul_count")=521
+	Set gtmtypes("shmpool_buff_hdr",522,"name")="shmpool_buff_hdr.shadow_file_header.n_db_csh_getns"
+	Set gtmtypes("shmpool_buff_hdr",522,"off")=4296
+	Set gtmtypes("shmpool_buff_hdr",522,"len")=8
+	Set gtmtypes("shmpool_buff_hdr",522,"type")="db_csh_acct_rec"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_db_csh_getns")=522
+	Set gtmtypes("shmpool_buff_hdr",523,"name")="shmpool_buff_hdr.shadow_file_header.n_db_csh_getns.curr_count"
+	Set gtmtypes("shmpool_buff_hdr",523,"off")=4296
+	Set gtmtypes("shmpool_buff_hdr",523,"len")=4
+	Set gtmtypes("shmpool_buff_hdr",523,"type")="int"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_db_csh_getns.curr_count")=523
+	Set gtmtypes("shmpool_buff_hdr",524,"name")="shmpool_buff_hdr.shadow_file_header.n_db_csh_getns.cumul_count"
+	Set gtmtypes("shmpool_buff_hdr",524,"off")=4300
+	Set gtmtypes("shmpool_buff_hdr",524,"len")=4
+	Set gtmtypes("shmpool_buff_hdr",524,"type")="int"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_db_csh_getns.cumul_count")=524
+	Set gtmtypes("shmpool_buff_hdr",525,"name")="shmpool_buff_hdr.shadow_file_header.n_db_csh_getn_lcnt"
+	Set gtmtypes("shmpool_buff_hdr",525,"off")=4304
 	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_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_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_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_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_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",525,"type")="db_csh_acct_rec"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_db_csh_getn_lcnt")=525
+	Set gtmtypes("shmpool_buff_hdr",526,"name")="shmpool_buff_hdr.shadow_file_header.n_db_csh_getn_lcnt.curr_count"
+	Set gtmtypes("shmpool_buff_hdr",526,"off")=4304
+	Set gtmtypes("shmpool_buff_hdr",526,"len")=4
+	Set gtmtypes("shmpool_buff_hdr",526,"type")="int"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_db_csh_getn_lcnt.curr_count")=526
+	Set gtmtypes("shmpool_buff_hdr",527,"name")="shmpool_buff_hdr.shadow_file_header.n_db_csh_getn_lcnt.cumul_count"
+	Set gtmtypes("shmpool_buff_hdr",527,"off")=4308
+	Set gtmtypes("shmpool_buff_hdr",527,"len")=4
+	Set gtmtypes("shmpool_buff_hdr",527,"type")="int"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_db_csh_getn_lcnt.cumul_count")=527
+	Set gtmtypes("shmpool_buff_hdr",528,"name")="shmpool_buff_hdr.shadow_file_header.db_csh_acct_rec_filler_4k"
+	Set gtmtypes("shmpool_buff_hdr",528,"off")=4312
+	Set gtmtypes("shmpool_buff_hdr",528,"len")=152
+	Set gtmtypes("shmpool_buff_hdr",528,"type")="char"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.db_csh_acct_rec_filler_4k")=528
+	Set gtmtypes("shmpool_buff_hdr",529,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec"
+	Set gtmtypes("shmpool_buff_hdr",529,"off")=4464
+	Set gtmtypes("shmpool_buff_hdr",529,"len")=472
+	Set gtmtypes("shmpool_buff_hdr",529,"type")="gvstats_rec_t"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec")=529
+	Set gtmtypes("shmpool_buff_hdr",530,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_set"
+	Set gtmtypes("shmpool_buff_hdr",530,"off")=4464
 	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_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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_set")=530
+	Set gtmtypes("shmpool_buff_hdr",531,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_kill"
+	Set gtmtypes("shmpool_buff_hdr",531,"off")=4472
 	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_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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_kill")=531
+	Set gtmtypes("shmpool_buff_hdr",532,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_get"
+	Set gtmtypes("shmpool_buff_hdr",532,"off")=4480
 	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_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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_get")=532
+	Set gtmtypes("shmpool_buff_hdr",533,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_data"
+	Set gtmtypes("shmpool_buff_hdr",533,"off")=4488
 	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.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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_data")=533
+	Set gtmtypes("shmpool_buff_hdr",534,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_order"
+	Set gtmtypes("shmpool_buff_hdr",534,"off")=4496
 	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_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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_order")=534
+	Set gtmtypes("shmpool_buff_hdr",535,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_zprev"
+	Set gtmtypes("shmpool_buff_hdr",535,"off")=4504
 	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_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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_zprev")=535
+	Set gtmtypes("shmpool_buff_hdr",536,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_query"
+	Set gtmtypes("shmpool_buff_hdr",536,"off")=4512
 	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_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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_query")=536
+	Set gtmtypes("shmpool_buff_hdr",537,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_lock_success"
+	Set gtmtypes("shmpool_buff_hdr",537,"off")=4520
 	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_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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_lock_success")=537
+	Set gtmtypes("shmpool_buff_hdr",538,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_lock_fail"
+	Set gtmtypes("shmpool_buff_hdr",538,"off")=4528
 	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_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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_lock_fail")=538
+	Set gtmtypes("shmpool_buff_hdr",539,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.db_curr_tn"
+	Set gtmtypes("shmpool_buff_hdr",539,"off")=4536
 	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_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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.db_curr_tn")=539
+	Set gtmtypes("shmpool_buff_hdr",540,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_dsk_read"
+	Set gtmtypes("shmpool_buff_hdr",540,"off")=4544
 	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_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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_dsk_read")=540
+	Set gtmtypes("shmpool_buff_hdr",541,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_dsk_write"
+	Set gtmtypes("shmpool_buff_hdr",541,"off")=4552
 	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_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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_dsk_write")=541
+	Set gtmtypes("shmpool_buff_hdr",542,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_nontp_readwrite"
+	Set gtmtypes("shmpool_buff_hdr",542,"off")=4560
 	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_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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_nontp_readwrite")=542
+	Set gtmtypes("shmpool_buff_hdr",543,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_nontp_readonly"
+	Set gtmtypes("shmpool_buff_hdr",543,"off")=4568
 	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_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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_nontp_readonly")=543
+	Set gtmtypes("shmpool_buff_hdr",544,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_nontp_blkwrite"
+	Set gtmtypes("shmpool_buff_hdr",544,"off")=4576
 	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_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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_nontp_blkwrite")=544
+	Set gtmtypes("shmpool_buff_hdr",545,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_nontp_blkread"
+	Set gtmtypes("shmpool_buff_hdr",545,"off")=4584
 	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_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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_nontp_blkread")=545
+	Set gtmtypes("shmpool_buff_hdr",546,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_nontp_retries_0"
+	Set gtmtypes("shmpool_buff_hdr",546,"off")=4592
 	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_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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_nontp_retries_0")=546
+	Set gtmtypes("shmpool_buff_hdr",547,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_nontp_retries_1"
+	Set gtmtypes("shmpool_buff_hdr",547,"off")=4600
 	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_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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_nontp_retries_1")=547
+	Set gtmtypes("shmpool_buff_hdr",548,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_nontp_retries_2"
+	Set gtmtypes("shmpool_buff_hdr",548,"off")=4608
 	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_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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_nontp_retries_2")=548
+	Set gtmtypes("shmpool_buff_hdr",549,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_nontp_retries_3"
+	Set gtmtypes("shmpool_buff_hdr",549,"off")=4616
 	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_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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_nontp_retries_3")=549
+	Set gtmtypes("shmpool_buff_hdr",550,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_tp_readwrite"
+	Set gtmtypes("shmpool_buff_hdr",550,"off")=4624
 	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_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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_tp_readwrite")=550
+	Set gtmtypes("shmpool_buff_hdr",551,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_tp_readonly"
+	Set gtmtypes("shmpool_buff_hdr",551,"off")=4632
 	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_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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_tp_readonly")=551
+	Set gtmtypes("shmpool_buff_hdr",552,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_tp_rolledback"
+	Set gtmtypes("shmpool_buff_hdr",552,"off")=4640
 	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_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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_tp_rolledback")=552
+	Set gtmtypes("shmpool_buff_hdr",553,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_tp_blkwrite"
+	Set gtmtypes("shmpool_buff_hdr",553,"off")=4648
 	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_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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_tp_blkwrite")=553
+	Set gtmtypes("shmpool_buff_hdr",554,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_tp_blkread"
+	Set gtmtypes("shmpool_buff_hdr",554,"off")=4656
 	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_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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_tp_blkread")=554
+	Set gtmtypes("shmpool_buff_hdr",555,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_tp_tot_retries_0"
+	Set gtmtypes("shmpool_buff_hdr",555,"off")=4664
 	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_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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_tp_tot_retries_0")=555
+	Set gtmtypes("shmpool_buff_hdr",556,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_tp_tot_retries_1"
+	Set gtmtypes("shmpool_buff_hdr",556,"off")=4672
 	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_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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_tp_tot_retries_1")=556
+	Set gtmtypes("shmpool_buff_hdr",557,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_tp_tot_retries_2"
+	Set gtmtypes("shmpool_buff_hdr",557,"off")=4680
 	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_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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_tp_tot_retries_2")=557
+	Set gtmtypes("shmpool_buff_hdr",558,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_tp_tot_retries_3"
+	Set gtmtypes("shmpool_buff_hdr",558,"off")=4688
 	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_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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_tp_tot_retries_3")=558
+	Set gtmtypes("shmpool_buff_hdr",559,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_tp_tot_retries_4"
+	Set gtmtypes("shmpool_buff_hdr",559,"off")=4696
 	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.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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_tp_tot_retries_4")=559
+	Set gtmtypes("shmpool_buff_hdr",560,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_tp_cnflct_retries_0"
+	Set gtmtypes("shmpool_buff_hdr",560,"off")=4704
 	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_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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_tp_cnflct_retries_0")=560
+	Set gtmtypes("shmpool_buff_hdr",561,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_tp_cnflct_retries_1"
+	Set gtmtypes("shmpool_buff_hdr",561,"off")=4712
 	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.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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_tp_cnflct_retries_1")=561
+	Set gtmtypes("shmpool_buff_hdr",562,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_tp_cnflct_retries_2"
+	Set gtmtypes("shmpool_buff_hdr",562,"off")=4720
 	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_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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_tp_cnflct_retries_2")=562
+	Set gtmtypes("shmpool_buff_hdr",563,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_tp_cnflct_retries_3"
+	Set gtmtypes("shmpool_buff_hdr",563,"off")=4728
 	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.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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_tp_cnflct_retries_3")=563
+	Set gtmtypes("shmpool_buff_hdr",564,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_tp_cnflct_retries_4"
+	Set gtmtypes("shmpool_buff_hdr",564,"off")=4736
 	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_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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_tp_cnflct_retries_4")=564
+	Set gtmtypes("shmpool_buff_hdr",565,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_ztrigger"
+	Set gtmtypes("shmpool_buff_hdr",565,"off")=4744
 	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_ztrigger")=565
+	Set gtmtypes("shmpool_buff_hdr",566,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_db_flush"
+	Set gtmtypes("shmpool_buff_hdr",566,"off")=4752
 	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_db_flush")=566
+	Set gtmtypes("shmpool_buff_hdr",567,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_db_fsync"
+	Set gtmtypes("shmpool_buff_hdr",567,"off")=4760
 	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.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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_db_fsync")=567
+	Set gtmtypes("shmpool_buff_hdr",568,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_jnl_flush"
+	Set gtmtypes("shmpool_buff_hdr",568,"off")=4768
 	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_jnl_flush")=568
+	Set gtmtypes("shmpool_buff_hdr",569,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_jnl_fsync"
+	Set gtmtypes("shmpool_buff_hdr",569,"off")=4776
 	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_jnl_fsync")=569
+	Set gtmtypes("shmpool_buff_hdr",570,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_jbuff_bytes"
+	Set gtmtypes("shmpool_buff_hdr",570,"off")=4784
 	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_jbuff_bytes")=570
+	Set gtmtypes("shmpool_buff_hdr",571,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_jfile_bytes"
+	Set gtmtypes("shmpool_buff_hdr",571,"off")=4792
 	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_jfile_bytes")=571
+	Set gtmtypes("shmpool_buff_hdr",572,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_jfile_writes"
+	Set gtmtypes("shmpool_buff_hdr",572,"off")=4800
 	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_jfile_writes")=572
+	Set gtmtypes("shmpool_buff_hdr",573,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_jrec_logical"
+	Set gtmtypes("shmpool_buff_hdr",573,"off")=4808
 	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_jrec_logical")=573
+	Set gtmtypes("shmpool_buff_hdr",574,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_jrec_pblk"
+	Set gtmtypes("shmpool_buff_hdr",574,"off")=4816
 	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_jrec_pblk")=574
+	Set gtmtypes("shmpool_buff_hdr",575,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_jrec_epoch_regular"
+	Set gtmtypes("shmpool_buff_hdr",575,"off")=4824
 	Set gtmtypes("shmpool_buff_hdr",575,"len")=8
 	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_jrec_epoch_regular")=575
+	Set gtmtypes("shmpool_buff_hdr",576,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_jrec_epoch_idle"
+	Set gtmtypes("shmpool_buff_hdr",576,"off")=4832
 	Set gtmtypes("shmpool_buff_hdr",576,"len")=8
 	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_jrec_epoch_idle")=576
+	Set gtmtypes("shmpool_buff_hdr",577,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_jrec_other"
+	Set gtmtypes("shmpool_buff_hdr",577,"off")=4840
 	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.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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_jrec_other")=577
+	Set gtmtypes("shmpool_buff_hdr",578,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_jnl_extends"
+	Set gtmtypes("shmpool_buff_hdr",578,"off")=4848
 	Set gtmtypes("shmpool_buff_hdr",578,"len")=8
 	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_jnl_extends")=578
+	Set gtmtypes("shmpool_buff_hdr",579,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_db_extends"
+	Set gtmtypes("shmpool_buff_hdr",579,"off")=4856
 	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_db_extends")=579
+	Set gtmtypes("shmpool_buff_hdr",580,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_crit_success"
+	Set gtmtypes("shmpool_buff_hdr",580,"off")=4864
 	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_crit_success")=580
+	Set gtmtypes("shmpool_buff_hdr",581,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_crits_in_epch"
+	Set gtmtypes("shmpool_buff_hdr",581,"off")=4872
 	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_crits_in_epch")=581
+	Set gtmtypes("shmpool_buff_hdr",582,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.sq_crit_failed"
+	Set gtmtypes("shmpool_buff_hdr",582,"off")=4880
 	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.sq_crit_failed")=582
+	Set gtmtypes("shmpool_buff_hdr",583,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_crit_failed"
+	Set gtmtypes("shmpool_buff_hdr",583,"off")=4888
+	Set gtmtypes("shmpool_buff_hdr",583,"len")=8
+	Set gtmtypes("shmpool_buff_hdr",583,"type")="uint64_t"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_crit_failed")=583
+	Set gtmtypes("shmpool_buff_hdr",584,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.sq_crit_que_slps"
+	Set gtmtypes("shmpool_buff_hdr",584,"off")=4896
+	Set gtmtypes("shmpool_buff_hdr",584,"len")=8
+	Set gtmtypes("shmpool_buff_hdr",584,"type")="uint64_t"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.sq_crit_que_slps")=584
+	Set gtmtypes("shmpool_buff_hdr",585,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_crit_que_slps"
+	Set gtmtypes("shmpool_buff_hdr",585,"off")=4904
+	Set gtmtypes("shmpool_buff_hdr",585,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",585,"type")="uint64_t"
-	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.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")="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")="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")="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")="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")="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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_crit_que_slps")=585
+	Set gtmtypes("shmpool_buff_hdr",586,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.sq_crit_yields"
+	Set gtmtypes("shmpool_buff_hdr",586,"off")=4912
+	Set gtmtypes("shmpool_buff_hdr",586,"len")=8
+	Set gtmtypes("shmpool_buff_hdr",586,"type")="uint64_t"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.sq_crit_yields")=586
+	Set gtmtypes("shmpool_buff_hdr",587,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_crit_yields"
+	Set gtmtypes("shmpool_buff_hdr",587,"off")=4920
+	Set gtmtypes("shmpool_buff_hdr",587,"len")=8
+	Set gtmtypes("shmpool_buff_hdr",587,"type")="uint64_t"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_crit_yields")=587
+	Set gtmtypes("shmpool_buff_hdr",588,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_clean2dirty"
+	Set gtmtypes("shmpool_buff_hdr",588,"off")=4928
+	Set gtmtypes("shmpool_buff_hdr",588,"len")=8
+	Set gtmtypes("shmpool_buff_hdr",588,"type")="uint64_t"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_clean2dirty")=588
+	Set gtmtypes("shmpool_buff_hdr",589,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec_filler_4k_plus_512"
+	Set gtmtypes("shmpool_buff_hdr",589,"off")=4936
+	Set gtmtypes("shmpool_buff_hdr",589,"len")=40
+	Set gtmtypes("shmpool_buff_hdr",589,"type")="char"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec_filler_4k_plus_512")=589
+	Set gtmtypes("shmpool_buff_hdr",590,"name")="shmpool_buff_hdr.shadow_file_header.filler_4k_plus_512"
+	Set gtmtypes("shmpool_buff_hdr",590,"off")=4976
+	Set gtmtypes("shmpool_buff_hdr",590,"len")=368
+	Set gtmtypes("shmpool_buff_hdr",590,"type")="char"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.filler_4k_plus_512")=590
+	Set gtmtypes("shmpool_buff_hdr",591,"name")="shmpool_buff_hdr.shadow_file_header.intrpt_recov_resync_strm_seqno"
+	Set gtmtypes("shmpool_buff_hdr",591,"off")=5344
+	Set gtmtypes("shmpool_buff_hdr",591,"len")=128
+	Set gtmtypes("shmpool_buff_hdr",591,"type")="uint64_t"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.intrpt_recov_resync_strm_seqno")=591
+	Set gtmtypes("shmpool_buff_hdr",591,"dim")=16
+	Set gtmtypes("shmpool_buff_hdr",592,"name")="shmpool_buff_hdr.shadow_file_header.creation_db_ver"
+	Set gtmtypes("shmpool_buff_hdr",592,"off")=5472
+	Set gtmtypes("shmpool_buff_hdr",592,"len")=4
+	Set gtmtypes("shmpool_buff_hdr",592,"type")="int"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.creation_db_ver")=592
+	Set gtmtypes("shmpool_buff_hdr",593,"name")="shmpool_buff_hdr.shadow_file_header.creation_mdb_ver"
+	Set gtmtypes("shmpool_buff_hdr",593,"off")=5476
+	Set gtmtypes("shmpool_buff_hdr",593,"len")=4
+	Set gtmtypes("shmpool_buff_hdr",593,"type")="int"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.creation_mdb_ver")=593
+	Set gtmtypes("shmpool_buff_hdr",594,"name")="shmpool_buff_hdr.shadow_file_header.certified_for_upgrade_to"
+	Set gtmtypes("shmpool_buff_hdr",594,"off")=5480
+	Set gtmtypes("shmpool_buff_hdr",594,"len")=4
+	Set gtmtypes("shmpool_buff_hdr",594,"type")="int"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.certified_for_upgrade_to")=594
+	Set gtmtypes("shmpool_buff_hdr",595,"name")="shmpool_buff_hdr.shadow_file_header.filler_5k"
+	Set gtmtypes("shmpool_buff_hdr",595,"off")=5484
+	Set gtmtypes("shmpool_buff_hdr",595,"len")=4
+	Set gtmtypes("shmpool_buff_hdr",595,"type")="int"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.filler_5k")=595
+	Set gtmtypes("shmpool_buff_hdr",596,"name")="shmpool_buff_hdr.shadow_file_header.secshr_ops_index_filler"
+	Set gtmtypes("shmpool_buff_hdr",596,"off")=5488
+	Set gtmtypes("shmpool_buff_hdr",596,"len")=4
+	Set gtmtypes("shmpool_buff_hdr",596,"type")="int"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.secshr_ops_index_filler")=596
+	Set gtmtypes("shmpool_buff_hdr",597,"name")="shmpool_buff_hdr.shadow_file_header.secshr_ops_array_filler"
+	Set gtmtypes("shmpool_buff_hdr",597,"off")=5492
+	Set gtmtypes("shmpool_buff_hdr",597,"len")=1020
 	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.secshr_ops_array_filler")=597
+	Set gtmtypes("shmpool_buff_hdr",597,"dim")=255
+	Set gtmtypes("shmpool_buff_hdr",598,"name")="shmpool_buff_hdr.shadow_file_header.next_upgrd_warn"
+	Set gtmtypes("shmpool_buff_hdr",598,"off")=6512
+	Set gtmtypes("shmpool_buff_hdr",598,"len")=24
+	Set gtmtypes("shmpool_buff_hdr",598,"type")="compswap_time_field"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.next_upgrd_warn")=598
+	Set gtmtypes("shmpool_buff_hdr",599,"name")="shmpool_buff_hdr.shadow_file_header.next_upgrd_warn.time_latch"
+	Set gtmtypes("shmpool_buff_hdr",599,"off")=6512
+	Set gtmtypes("shmpool_buff_hdr",599,"len")=8
+	Set gtmtypes("shmpool_buff_hdr",599,"type")="global_latch_t"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.next_upgrd_warn.time_latch")=599
+	Set gtmtypes("shmpool_buff_hdr",600,"name")="shmpool_buff_hdr.shadow_file_header.next_upgrd_warn.time_latch.u"
+	Set gtmtypes("shmpool_buff_hdr",600,"off")=6512
+	Set gtmtypes("shmpool_buff_hdr",600,"len")=8
+	Set gtmtypes("shmpool_buff_hdr",600,"type")="union"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.next_upgrd_warn.time_latch.u")=600
+	Set gtmtypes("shmpool_buff_hdr",601,"name")="shmpool_buff_hdr.shadow_file_header.next_upgrd_warn.time_latch.u.pid_imgcnt"
+	Set gtmtypes("shmpool_buff_hdr",601,"off")=6512
+	Set gtmtypes("shmpool_buff_hdr",601,"len")=8
+	Set gtmtypes("shmpool_buff_hdr",601,"type")="uint64_t"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.next_upgrd_warn.time_latch.u.pid_imgcnt")=601
+	Set gtmtypes("shmpool_buff_hdr",602,"name")="shmpool_buff_hdr.shadow_file_header.next_upgrd_warn.time_latch.u.parts"
+	Set gtmtypes("shmpool_buff_hdr",602,"off")=6512
+	Set gtmtypes("shmpool_buff_hdr",602,"len")=8
+	Set gtmtypes("shmpool_buff_hdr",602,"type")="struct"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.next_upgrd_warn.time_latch.u.parts")=602
+	Set gtmtypes("shmpool_buff_hdr",603,"name")="shmpool_buff_hdr.shadow_file_header.next_upgrd_warn.time_latch.u.parts.latch_pid"
+	Set gtmtypes("shmpool_buff_hdr",603,"off")=6512
+	Set gtmtypes("shmpool_buff_hdr",603,"len")=4
+	Set gtmtypes("shmpool_buff_hdr",603,"type")="int"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.next_upgrd_warn.time_latch.u.parts.latch_pid")=603
+	Set gtmtypes("shmpool_buff_hdr",604,"name")="shmpool_buff_hdr.shadow_file_header.next_upgrd_warn.time_latch.u.parts.latch_word"
+	Set gtmtypes("shmpool_buff_hdr",604,"off")=6516
 	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",604,"type")="int"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.next_upgrd_warn.time_latch.u.parts.latch_word")=604
+	Set gtmtypes("shmpool_buff_hdr",605,"name")="shmpool_buff_hdr.shadow_file_header.next_upgrd_warn.hp_latch_space"
+	Set gtmtypes("shmpool_buff_hdr",605,"off")=6520
+	Set gtmtypes("shmpool_buff_hdr",605,"len")=16
+	Set gtmtypes("shmpool_buff_hdr",605,"type")="int"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.next_upgrd_warn.hp_latch_space")=605
+	Set gtmtypes("shmpool_buff_hdr",605,"dim")=4
+	Set gtmtypes("shmpool_buff_hdr",606,"name")="shmpool_buff_hdr.shadow_file_header.is_encrypted"
+	Set gtmtypes("shmpool_buff_hdr",606,"off")=6536
 	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",606,"type")="unsigned-int"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.is_encrypted")=606
+	Set gtmtypes("shmpool_buff_hdr",607,"name")="shmpool_buff_hdr.shadow_file_header.db_trigger_cycle"
+	Set gtmtypes("shmpool_buff_hdr",607,"off")=6540
 	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",607,"type")="unsigned-int"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.db_trigger_cycle")=607
+	Set gtmtypes("shmpool_buff_hdr",608,"name")="shmpool_buff_hdr.shadow_file_header.strm_reg_seqno"
+	Set gtmtypes("shmpool_buff_hdr",608,"off")=6544
+	Set gtmtypes("shmpool_buff_hdr",608,"len")=128
+	Set gtmtypes("shmpool_buff_hdr",608,"type")="uint64_t"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.strm_reg_seqno")=608
+	Set gtmtypes("shmpool_buff_hdr",608,"dim")=16
+	Set gtmtypes("shmpool_buff_hdr",609,"name")="shmpool_buff_hdr.shadow_file_header.save_strm_reg_seqno"
+	Set gtmtypes("shmpool_buff_hdr",609,"off")=6672
+	Set gtmtypes("shmpool_buff_hdr",609,"len")=128
+	Set gtmtypes("shmpool_buff_hdr",609,"type")="uint64_t"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.save_strm_reg_seqno")=609
+	Set gtmtypes("shmpool_buff_hdr",609,"dim")=16
+	Set gtmtypes("shmpool_buff_hdr",610,"name")="shmpool_buff_hdr.shadow_file_header.freeze_on_fail"
+	Set gtmtypes("shmpool_buff_hdr",610,"off")=6800
 	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.freeze_on_fail")=610
+	Set gtmtypes("shmpool_buff_hdr",611,"name")="shmpool_buff_hdr.shadow_file_header.span_node_absent"
+	Set gtmtypes("shmpool_buff_hdr",611,"off")=6804
 	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.span_node_absent")=611
+	Set gtmtypes("shmpool_buff_hdr",612,"name")="shmpool_buff_hdr.shadow_file_header.maxkeysz_assured"
+	Set gtmtypes("shmpool_buff_hdr",612,"off")=6808
 	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("shmpool_buff_hdr",612,"type")="boolean_t"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.maxkeysz_assured")=612
+	Set gtmtypes("shmpool_buff_hdr",613,"name")="shmpool_buff_hdr.shadow_file_header.hasht_upgrade_needed"
+	Set gtmtypes("shmpool_buff_hdr",613,"off")=6812
+	Set gtmtypes("shmpool_buff_hdr",613,"len")=4
+	Set gtmtypes("shmpool_buff_hdr",613,"type")="boolean_t"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.hasht_upgrade_needed")=613
+	Set gtmtypes("shmpool_buff_hdr",614,"name")="shmpool_buff_hdr.shadow_file_header.defer_allocate"
+	Set gtmtypes("shmpool_buff_hdr",614,"off")=6816
+	Set gtmtypes("shmpool_buff_hdr",614,"len")=4
+	Set gtmtypes("shmpool_buff_hdr",614,"type")="boolean_t"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.defer_allocate")=614
+	Set gtmtypes("shmpool_buff_hdr",615,"name")="shmpool_buff_hdr.shadow_file_header.filler_ftok_counter_halted"
+	Set gtmtypes("shmpool_buff_hdr",615,"off")=6820
+	Set gtmtypes("shmpool_buff_hdr",615,"len")=4
+	Set gtmtypes("shmpool_buff_hdr",615,"type")="boolean_t"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.filler_ftok_counter_halted")=615
+	Set gtmtypes("shmpool_buff_hdr",616,"name")="shmpool_buff_hdr.shadow_file_header.filler_access_counter_halted"
+	Set gtmtypes("shmpool_buff_hdr",616,"off")=6824
+	Set gtmtypes("shmpool_buff_hdr",616,"len")=4
+	Set gtmtypes("shmpool_buff_hdr",616,"type")="boolean_t"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.filler_access_counter_halted")=616
+	Set gtmtypes("shmpool_buff_hdr",617,"name")="shmpool_buff_hdr.shadow_file_header.lock_crit_with_db"
+	Set gtmtypes("shmpool_buff_hdr",617,"off")=6828
+	Set gtmtypes("shmpool_buff_hdr",617,"len")=4
+	Set gtmtypes("shmpool_buff_hdr",617,"type")="boolean_t"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.lock_crit_with_db")=617
+	Set gtmtypes("shmpool_buff_hdr",618,"name")="shmpool_buff_hdr.shadow_file_header.basedb_fname_len"
+	Set gtmtypes("shmpool_buff_hdr",618,"off")=6832
+	Set gtmtypes("shmpool_buff_hdr",618,"len")=4
+	Set gtmtypes("shmpool_buff_hdr",618,"type")="unsigned-int"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.basedb_fname_len")=618
+	Set gtmtypes("shmpool_buff_hdr",619,"name")="shmpool_buff_hdr.shadow_file_header.basedb_fname"
+	Set gtmtypes("shmpool_buff_hdr",619,"off")=6836
+	Set gtmtypes("shmpool_buff_hdr",619,"len")=256
+	Set gtmtypes("shmpool_buff_hdr",619,"type")="unsigned-char"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.basedb_fname")=619
+	Set gtmtypes("shmpool_buff_hdr",620,"name")="shmpool_buff_hdr.shadow_file_header.filler_7k"
+	Set gtmtypes("shmpool_buff_hdr",620,"off")=7092
+	Set gtmtypes("shmpool_buff_hdr",620,"len")=444
+	Set gtmtypes("shmpool_buff_hdr",620,"type")="char"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.filler_7k")=620
+	Set gtmtypes("shmpool_buff_hdr",621,"name")="shmpool_buff_hdr.shadow_file_header.filler_8k"
+	Set gtmtypes("shmpool_buff_hdr",621,"off")=7536
+	Set gtmtypes("shmpool_buff_hdr",621,"len")=1024
+	Set gtmtypes("shmpool_buff_hdr",621,"type")="char"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.filler_8k")=621
 	;
 	Set gtmtypes("show_reply")="struct"
 	Set gtmtypes("show_reply",0)=2
@@ -37972,43 +39011,18 @@ Init
 	Set gtmtypfldindx("stringkey","filler")=6
 	;
 	Set gtmtypes("struct_jrec_align")="struct"
-	Set gtmtypes("struct_jrec_align",0)=7
-	Set gtmtypes("struct_jrec_align","len")=32
-	Set gtmtypes("struct_jrec_align",1,"name")="struct_jrec_align.prefix"
-	Set gtmtypes("struct_jrec_align",1,"off")=0
-	Set gtmtypes("struct_jrec_align",1,"len")=24
-	Set gtmtypes("struct_jrec_align",1,"type")="jrec_prefix"
-	Set gtmtypfldindx("struct_jrec_align","prefix")=1
-	Set gtmtypes("struct_jrec_align",2,"name")="struct_jrec_align.prefix.pini_addr"
-	Set gtmtypes("struct_jrec_align",2,"off")=4
+	Set gtmtypes("struct_jrec_align",0)=2
+	Set gtmtypes("struct_jrec_align","len")=12
+	Set gtmtypes("struct_jrec_align",1,"name")="struct_jrec_align.checksum"
+	Set gtmtypes("struct_jrec_align",1,"off")=4
+	Set gtmtypes("struct_jrec_align",1,"len")=4
+	Set gtmtypes("struct_jrec_align",1,"type")="unsigned-int"
+	Set gtmtypfldindx("struct_jrec_align","checksum")=1
+	Set gtmtypes("struct_jrec_align",2,"name")="struct_jrec_align.time"
+	Set gtmtypes("struct_jrec_align",2,"off")=8
 	Set gtmtypes("struct_jrec_align",2,"len")=4
 	Set gtmtypes("struct_jrec_align",2,"type")="unsigned-int"
-	Set gtmtypfldindx("struct_jrec_align","prefix.pini_addr")=2
-	Set gtmtypes("struct_jrec_align",3,"name")="struct_jrec_align.prefix.time"
-	Set gtmtypes("struct_jrec_align",3,"off")=8
-	Set gtmtypes("struct_jrec_align",3,"len")=4
-	Set gtmtypes("struct_jrec_align",3,"type")="unsigned-int"
-	Set gtmtypfldindx("struct_jrec_align","prefix.time")=3
-	Set gtmtypes("struct_jrec_align",4,"name")="struct_jrec_align.prefix.checksum"
-	Set gtmtypes("struct_jrec_align",4,"off")=12
-	Set gtmtypes("struct_jrec_align",4,"len")=4
-	Set gtmtypes("struct_jrec_align",4,"type")="unsigned-int"
-	Set gtmtypfldindx("struct_jrec_align","prefix.checksum")=4
-	Set gtmtypes("struct_jrec_align",5,"name")="struct_jrec_align.prefix.tn"
-	Set gtmtypes("struct_jrec_align",5,"off")=16
-	Set gtmtypes("struct_jrec_align",5,"len")=8
-	Set gtmtypes("struct_jrec_align",5,"type")="uint64_t"
-	Set gtmtypfldindx("struct_jrec_align","prefix.tn")=5
-	Set gtmtypes("struct_jrec_align",6,"name")="struct_jrec_align.align_str"
-	Set gtmtypes("struct_jrec_align",6,"off")=24
-	Set gtmtypes("struct_jrec_align",6,"len")=8
-	Set gtmtypes("struct_jrec_align",6,"type")="jnl_string"
-	Set gtmtypfldindx("struct_jrec_align","align_str")=6
-	Set gtmtypes("struct_jrec_align",7,"name")="struct_jrec_align.align_str.text"
-	Set gtmtypes("struct_jrec_align",7,"off")=28
-	Set gtmtypes("struct_jrec_align",7,"len")=1
-	Set gtmtypes("struct_jrec_align",7,"type")="char"
-	Set gtmtypfldindx("struct_jrec_align","align_str.text")=7
+	Set gtmtypfldindx("struct_jrec_align","time")=2
 	;
 	Set gtmtypes("struct_jrec_blk")="struct"
 	Set gtmtypes("struct_jrec_blk",0)=10
@@ -41022,7 +42036,7 @@ Init
 	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 gtmtypes("unix_db_info",121,"type")="int"
 	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
diff --git a/sr_x86_64/GTMDefinedTypesInitRelease.m b/sr_x86_64/GTMDefinedTypesInitRelease.m
index 8a87a51..ed16ade 100644
--- a/sr_x86_64/GTMDefinedTypesInitRelease.m
+++ b/sr_x86_64/GTMDefinedTypesInitRelease.m
@@ -11,14 +11,14 @@
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
 ;
-; 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
+; Generated by scantypedefs.m at 16:01:40 on 2017-08-16
+; Build done with GT.M version: GT.M V6.3-001A Linux x86_64
 ;
 ; Environment variables during run:
-;   $gtm_dist: /usr/library/V63000A/pro
-;   $gtm_exe: /usr/library/V63001A/pro
-;   $gtm_src: /usr/library/V63001A/src
-;   $gtm_inc: /usr/library/V63001A/inc
+;   $gtm_dist: /usr/library/V63001A/pro
+;   $gtm_exe: /usr/library/V63002/pro
+;   $gtm_src: /usr/library/V63002/src
+;   $gtm_inc: /usr/library/V63002/inc
 ;
 ; Note this file should not be manually invoked
 ;
@@ -1070,11 +1070,11 @@ Init
 	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,"name")="cache_que_heads.cache_array[0].needs_first_write"
 	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 gtmtypfldindx("cache_que_heads","cache_array[0].needs_first_write")=52
 	;
 	Set gtmtypes("cache_rec")="struct"
 	Set gtmtypes("cache_rec",0)=38
@@ -1264,11 +1264,11 @@ Init
 	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,"name")="cache_rec.needs_first_write"
 	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 gtmtypfldindx("cache_rec","needs_first_write")=38
 	;
 	Set gtmtypes("cache_state_rec")="struct"
 	Set gtmtypes("cache_state_rec",0)=35
@@ -1443,11 +1443,11 @@ Init
 	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,"name")="cache_state_rec.needs_first_write"
 	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 gtmtypfldindx("cache_state_rec","needs_first_write")=35
 	;
 	Set gtmtypes("callin_entry_list")="struct"
 	Set gtmtypes("callin_entry_list",0)=14
@@ -2749,11 +2749,11 @@ Init
 	Set gtmtypes("d_rm_struct",5,"len")=4
 	Set gtmtypes("d_rm_struct",5,"type")="boolean_t"
 	Set gtmtypfldindx("d_rm_struct","fifo")=5
-	Set gtmtypes("d_rm_struct",6,"name")="d_rm_struct.gtm_pipe1"
+	Set gtmtypes("d_rm_struct",6,"name")="d_rm_struct.is_pipe"
 	Set gtmtypes("d_rm_struct",6,"off")=20
 	Set gtmtypes("d_rm_struct",6,"len")=4
 	Set gtmtypes("d_rm_struct",6,"type")="boolean_t"
-	Set gtmtypfldindx("d_rm_struct","gtm_pipe1")=6
+	Set gtmtypfldindx("d_rm_struct","is_pipe")=6
 	Set gtmtypes("d_rm_struct",7,"name")="d_rm_struct.independent"
 	Set gtmtypes("d_rm_struct",7,"off")=24
 	Set gtmtypes("d_rm_struct",7,"len")=4
@@ -6939,11 +6939,11 @@ Init
 	Set gtmtypes("gtmsource_local_struct",53,"len")=4
 	Set gtmtypes("gtmsource_local_struct",53,"type")="int"
 	Set gtmtypfldindx("gtmsource_local_struct","num_renegotiations")=53
-	Set gtmtypes("gtmsource_local_struct",54,"name")="gtmsource_local_struct.padding"
+	Set gtmtypes("gtmsource_local_struct",54,"name")="gtmsource_local_struct.filler_8byte_align"
 	Set gtmtypes("gtmsource_local_struct",54,"off")=1540
 	Set gtmtypes("gtmsource_local_struct",54,"len")=4
 	Set gtmtypes("gtmsource_local_struct",54,"type")="int"
-	Set gtmtypfldindx("gtmsource_local_struct","padding")=54
+	Set gtmtypfldindx("gtmsource_local_struct","filler_8byte_align")=54
 	;
 	Set gtmtypes("gtmsource_options_t")="struct"
 	Set gtmtypes("gtmsource_options_t",0)=34
@@ -9662,6 +9662,99 @@ Init
 	Set gtmtypes("ipcs_mesg",7,"type")="char"
 	Set gtmtypfldindx("ipcs_mesg","fn")=7
 	;
+	Set gtmtypes("jbuf_phase2_in_prog_t")="struct"
+	Set gtmtypes("jbuf_phase2_in_prog_t",0)=12
+	Set gtmtypes("jbuf_phase2_in_prog_t","len")=48
+	Set gtmtypes("jbuf_phase2_in_prog_t",1,"name")="jbuf_phase2_in_prog_t.curr_tn"
+	Set gtmtypes("jbuf_phase2_in_prog_t",1,"off")=0
+	Set gtmtypes("jbuf_phase2_in_prog_t",1,"len")=8
+	Set gtmtypes("jbuf_phase2_in_prog_t",1,"type")="uint64_t"
+	Set gtmtypfldindx("jbuf_phase2_in_prog_t","curr_tn")=1
+	Set gtmtypes("jbuf_phase2_in_prog_t",2,"name")="jbuf_phase2_in_prog_t.jnl_seqno"
+	Set gtmtypes("jbuf_phase2_in_prog_t",2,"off")=8
+	Set gtmtypes("jbuf_phase2_in_prog_t",2,"len")=8
+	Set gtmtypes("jbuf_phase2_in_prog_t",2,"type")="uint64_t"
+	Set gtmtypfldindx("jbuf_phase2_in_prog_t","jnl_seqno")=2
+	Set gtmtypes("jbuf_phase2_in_prog_t",3,"name")="jbuf_phase2_in_prog_t.strm_seqno"
+	Set gtmtypes("jbuf_phase2_in_prog_t",3,"off")=16
+	Set gtmtypes("jbuf_phase2_in_prog_t",3,"len")=8
+	Set gtmtypes("jbuf_phase2_in_prog_t",3,"type")="uint64_t"
+	Set gtmtypfldindx("jbuf_phase2_in_prog_t","strm_seqno")=3
+	Set gtmtypes("jbuf_phase2_in_prog_t",4,"name")="jbuf_phase2_in_prog_t.process_id"
+	Set gtmtypes("jbuf_phase2_in_prog_t",4,"off")=24
+	Set gtmtypes("jbuf_phase2_in_prog_t",4,"len")=4
+	Set gtmtypes("jbuf_phase2_in_prog_t",4,"type")="unsigned-int"
+	Set gtmtypfldindx("jbuf_phase2_in_prog_t","process_id")=4
+	Set gtmtypes("jbuf_phase2_in_prog_t",5,"name")="jbuf_phase2_in_prog_t.start_freeaddr"
+	Set gtmtypes("jbuf_phase2_in_prog_t",5,"off")=28
+	Set gtmtypes("jbuf_phase2_in_prog_t",5,"len")=4
+	Set gtmtypes("jbuf_phase2_in_prog_t",5,"type")="unsigned-int"
+	Set gtmtypfldindx("jbuf_phase2_in_prog_t","start_freeaddr")=5
+	Set gtmtypes("jbuf_phase2_in_prog_t",6,"name")="jbuf_phase2_in_prog_t.tot_jrec_len"
+	Set gtmtypes("jbuf_phase2_in_prog_t",6,"off")=32
+	Set gtmtypes("jbuf_phase2_in_prog_t",6,"len")=4
+	Set gtmtypes("jbuf_phase2_in_prog_t",6,"type")="unsigned-int"
+	Set gtmtypfldindx("jbuf_phase2_in_prog_t","tot_jrec_len")=6
+	Set gtmtypes("jbuf_phase2_in_prog_t",7,"name")="jbuf_phase2_in_prog_t.pini_addr"
+	Set gtmtypes("jbuf_phase2_in_prog_t",7,"off")=36
+	Set gtmtypes("jbuf_phase2_in_prog_t",7,"len")=4
+	Set gtmtypes("jbuf_phase2_in_prog_t",7,"type")="unsigned-int"
+	Set gtmtypfldindx("jbuf_phase2_in_prog_t","pini_addr")=7
+	Set gtmtypes("jbuf_phase2_in_prog_t",8,"name")="jbuf_phase2_in_prog_t.jrec_time"
+	Set gtmtypes("jbuf_phase2_in_prog_t",8,"off")=40
+	Set gtmtypes("jbuf_phase2_in_prog_t",8,"len")=4
+	Set gtmtypes("jbuf_phase2_in_prog_t",8,"type")="unsigned-int"
+	Set gtmtypfldindx("jbuf_phase2_in_prog_t","jrec_time")=8
+	Set gtmtypes("jbuf_phase2_in_prog_t",9,"name")="jbuf_phase2_in_prog_t.in_phase2"
+	Set gtmtypes("jbuf_phase2_in_prog_t",9,"off")=44
+	Set gtmtypes("jbuf_phase2_in_prog_t",9,"len")=1
+	Set gtmtypes("jbuf_phase2_in_prog_t",9,"type")="char"
+	Set gtmtypfldindx("jbuf_phase2_in_prog_t","in_phase2")=9
+	Set gtmtypes("jbuf_phase2_in_prog_t",10,"name")="jbuf_phase2_in_prog_t.replication"
+	Set gtmtypes("jbuf_phase2_in_prog_t",10,"off")=45
+	Set gtmtypes("jbuf_phase2_in_prog_t",10,"len")=1
+	Set gtmtypes("jbuf_phase2_in_prog_t",10,"type")="char"
+	Set gtmtypfldindx("jbuf_phase2_in_prog_t","replication")=10
+	Set gtmtypes("jbuf_phase2_in_prog_t",11,"name")="jbuf_phase2_in_prog_t.write_complete"
+	Set gtmtypes("jbuf_phase2_in_prog_t",11,"off")=46
+	Set gtmtypes("jbuf_phase2_in_prog_t",11,"len")=1
+	Set gtmtypes("jbuf_phase2_in_prog_t",11,"type")="char"
+	Set gtmtypfldindx("jbuf_phase2_in_prog_t","write_complete")=11
+	Set gtmtypes("jbuf_phase2_in_prog_t",12,"name")="jbuf_phase2_in_prog_t.filler_8byte_align"
+	Set gtmtypes("jbuf_phase2_in_prog_t",12,"off")=47
+	Set gtmtypes("jbuf_phase2_in_prog_t",12,"len")=1
+	Set gtmtypes("jbuf_phase2_in_prog_t",12,"type")="char"
+	Set gtmtypfldindx("jbuf_phase2_in_prog_t","filler_8byte_align")=12
+	;
+	Set gtmtypes("jbuf_rsrv_struct_t")="struct"
+	Set gtmtypes("jbuf_rsrv_struct_t",0)=5
+	Set gtmtypes("jbuf_rsrv_struct_t","len")=24
+	Set gtmtypes("jbuf_rsrv_struct_t",1,"name")="jbuf_rsrv_struct_t.alloclen"
+	Set gtmtypes("jbuf_rsrv_struct_t",1,"off")=0
+	Set gtmtypes("jbuf_rsrv_struct_t",1,"len")=4
+	Set gtmtypes("jbuf_rsrv_struct_t",1,"type")="unsigned-int"
+	Set gtmtypfldindx("jbuf_rsrv_struct_t","alloclen")=1
+	Set gtmtypes("jbuf_rsrv_struct_t",2,"name")="jbuf_rsrv_struct_t.usedlen"
+	Set gtmtypes("jbuf_rsrv_struct_t",2,"off")=4
+	Set gtmtypes("jbuf_rsrv_struct_t",2,"len")=4
+	Set gtmtypes("jbuf_rsrv_struct_t",2,"type")="unsigned-int"
+	Set gtmtypfldindx("jbuf_rsrv_struct_t","usedlen")=2
+	Set gtmtypes("jbuf_rsrv_struct_t",3,"name")="jbuf_rsrv_struct_t.tot_jrec_len"
+	Set gtmtypes("jbuf_rsrv_struct_t",3,"off")=8
+	Set gtmtypes("jbuf_rsrv_struct_t",3,"len")=4
+	Set gtmtypes("jbuf_rsrv_struct_t",3,"type")="unsigned-int"
+	Set gtmtypfldindx("jbuf_rsrv_struct_t","tot_jrec_len")=3
+	Set gtmtypes("jbuf_rsrv_struct_t",4,"name")="jbuf_rsrv_struct_t.phase2_commit_index"
+	Set gtmtypes("jbuf_rsrv_struct_t",4,"off")=12
+	Set gtmtypes("jbuf_rsrv_struct_t",4,"len")=4
+	Set gtmtypes("jbuf_rsrv_struct_t",4,"type")="unsigned-int"
+	Set gtmtypfldindx("jbuf_rsrv_struct_t","phase2_commit_index")=4
+	Set gtmtypes("jbuf_rsrv_struct_t",5,"name")="jbuf_rsrv_struct_t.jrs_array"
+	Set gtmtypes("jbuf_rsrv_struct_t",5,"off")=16
+	Set gtmtypes("jbuf_rsrv_struct_t",5,"len")=8
+	Set gtmtypes("jbuf_rsrv_struct_t",5,"type")="addr"
+	Set gtmtypfldindx("jbuf_rsrv_struct_t","jrs_array")=5
+	;
 	Set gtmtypes("jext_heap_elem_t")="struct"
 	Set gtmtypes("jext_heap_elem_t",0)=2
 	Set gtmtypes("jext_heap_elem_t","len")=16
@@ -9691,8 +9784,8 @@ Init
 	Set gtmtypfldindx("jnl_action","nodeflags")=2
 	;
 	Set gtmtypes("jnl_buffer")="struct"
-	Set gtmtypes("jnl_buffer",0)=60
-	Set gtmtypes("jnl_buffer","len")=648
+	Set gtmtypes("jnl_buffer",0)=85
+	Set gtmtypes("jnl_buffer","len")=197360
 	Set gtmtypes("jnl_buffer",1,"name")="jnl_buffer.eov_tn"
 	Set gtmtypes("jnl_buffer",1,"off")=0
 	Set gtmtypes("jnl_buffer",1,"len")=8
@@ -9749,252 +9842,379 @@ Init
 	Set gtmtypes("jnl_buffer",11,"len")=4
 	Set gtmtypes("jnl_buffer",11,"type")="int"
 	Set gtmtypfldindx("jnl_buffer","gtm_free")=11
-	Set gtmtypes("jnl_buffer",12,"name")="jnl_buffer.freeaddr"
+	Set gtmtypes("jnl_buffer",12,"name")="jnl_buffer.rsrv_free"
 	Set gtmtypes("jnl_buffer",12,"off")=188
 	Set gtmtypes("jnl_buffer",12,"len")=4
-	Set gtmtypes("jnl_buffer",12,"type")="unsigned-int"
-	Set gtmtypfldindx("jnl_buffer","freeaddr")=12
-	Set gtmtypes("jnl_buffer",13,"name")="jnl_buffer.end_of_data"
+	Set gtmtypes("jnl_buffer",12,"type")="int"
+	Set gtmtypfldindx("jnl_buffer","rsrv_free")=12
+	Set gtmtypes("jnl_buffer",13,"name")="jnl_buffer.freeaddr"
 	Set gtmtypes("jnl_buffer",13,"off")=192
 	Set gtmtypes("jnl_buffer",13,"len")=4
 	Set gtmtypes("jnl_buffer",13,"type")="unsigned-int"
-	Set gtmtypfldindx("jnl_buffer","end_of_data")=13
-	Set gtmtypes("jnl_buffer",14,"name")="jnl_buffer.filesize"
+	Set gtmtypfldindx("jnl_buffer","freeaddr")=13
+	Set gtmtypes("jnl_buffer",14,"name")="jnl_buffer.rsrv_freeaddr"
 	Set gtmtypes("jnl_buffer",14,"off")=196
 	Set gtmtypes("jnl_buffer",14,"len")=4
 	Set gtmtypes("jnl_buffer",14,"type")="unsigned-int"
-	Set gtmtypfldindx("jnl_buffer","filesize")=14
-	Set gtmtypes("jnl_buffer",15,"name")="jnl_buffer.blocked"
+	Set gtmtypfldindx("jnl_buffer","rsrv_freeaddr")=14
+	Set gtmtypes("jnl_buffer",15,"name")="jnl_buffer.next_align_addr"
 	Set gtmtypes("jnl_buffer",15,"off")=200
 	Set gtmtypes("jnl_buffer",15,"len")=4
-	Set gtmtypes("jnl_buffer",15,"type")="int"
-	Set gtmtypfldindx("jnl_buffer","blocked")=15
-	Set gtmtypes("jnl_buffer",16,"name")="jnl_buffer.fsync_dskaddr"
+	Set gtmtypes("jnl_buffer",15,"type")="unsigned-int"
+	Set gtmtypfldindx("jnl_buffer","next_align_addr")=15
+	Set gtmtypes("jnl_buffer",16,"name")="jnl_buffer.end_of_data"
 	Set gtmtypes("jnl_buffer",16,"off")=204
 	Set gtmtypes("jnl_buffer",16,"len")=4
 	Set gtmtypes("jnl_buffer",16,"type")="unsigned-int"
-	Set gtmtypfldindx("jnl_buffer","fsync_dskaddr")=16
-	Set gtmtypes("jnl_buffer",17,"name")="jnl_buffer.dsk"
+	Set gtmtypfldindx("jnl_buffer","end_of_data")=16
+	Set gtmtypes("jnl_buffer",17,"name")="jnl_buffer.filesize"
 	Set gtmtypes("jnl_buffer",17,"off")=208
 	Set gtmtypes("jnl_buffer",17,"len")=4
-	Set gtmtypes("jnl_buffer",17,"type")="int"
-	Set gtmtypfldindx("jnl_buffer","dsk")=17
-	Set gtmtypes("jnl_buffer",18,"name")="jnl_buffer.wrtsize"
+	Set gtmtypes("jnl_buffer",17,"type")="unsigned-int"
+	Set gtmtypfldindx("jnl_buffer","filesize")=17
+	Set gtmtypes("jnl_buffer",18,"name")="jnl_buffer.phase2_commit_index1"
 	Set gtmtypes("jnl_buffer",18,"off")=212
 	Set gtmtypes("jnl_buffer",18,"len")=4
-	Set gtmtypes("jnl_buffer",18,"type")="int"
-	Set gtmtypfldindx("jnl_buffer","wrtsize")=18
-	Set gtmtypes("jnl_buffer",19,"name")="jnl_buffer.dskaddr"
+	Set gtmtypes("jnl_buffer",18,"type")="unsigned-int"
+	Set gtmtypfldindx("jnl_buffer","phase2_commit_index1")=18
+	Set gtmtypes("jnl_buffer",19,"name")="jnl_buffer.phase2_commit_index2"
 	Set gtmtypes("jnl_buffer",19,"off")=216
 	Set gtmtypes("jnl_buffer",19,"len")=4
 	Set gtmtypes("jnl_buffer",19,"type")="unsigned-int"
-	Set gtmtypfldindx("jnl_buffer","dskaddr")=19
-	Set gtmtypes("jnl_buffer",20,"name")="jnl_buffer.now_writer"
-	Set gtmtypes("jnl_buffer",20,"off")=220
-	Set gtmtypes("jnl_buffer",20,"len")=4
-	Set gtmtypes("jnl_buffer",20,"type")="unsigned-int"
-	Set gtmtypfldindx("jnl_buffer","now_writer")=20
-	Set gtmtypes("jnl_buffer",21,"name")="jnl_buffer.image_count"
+	Set gtmtypfldindx("jnl_buffer","phase2_commit_index2")=19
+	Set gtmtypes("jnl_buffer",20,"name")="jnl_buffer.phase2_commit_array"
+	Set gtmtypes("jnl_buffer",20,"off")=224
+	Set gtmtypes("jnl_buffer",20,"len")=196608
+	Set gtmtypes("jnl_buffer",20,"type")="jbuf_phase2_in_prog_t"
+	Set gtmtypfldindx("jnl_buffer","phase2_commit_array")=20
+	Set gtmtypes("jnl_buffer",20,"dim")=4096
+	Set gtmtypes("jnl_buffer",21,"name")="jnl_buffer.phase2_commit_array[0].curr_tn"
 	Set gtmtypes("jnl_buffer",21,"off")=224
-	Set gtmtypes("jnl_buffer",21,"len")=4
-	Set gtmtypes("jnl_buffer",21,"type")="unsigned-int"
-	Set gtmtypfldindx("jnl_buffer","image_count")=21
-	Set gtmtypes("jnl_buffer",22,"name")="jnl_buffer.iosb"
-	Set gtmtypes("jnl_buffer",22,"off")=228
+	Set gtmtypes("jnl_buffer",21,"len")=8
+	Set gtmtypes("jnl_buffer",21,"type")="uint64_t"
+	Set gtmtypfldindx("jnl_buffer","phase2_commit_array[0].curr_tn")=21
+	Set gtmtypes("jnl_buffer",22,"name")="jnl_buffer.phase2_commit_array[0].jnl_seqno"
+	Set gtmtypes("jnl_buffer",22,"off")=232
 	Set gtmtypes("jnl_buffer",22,"len")=8
-	Set gtmtypes("jnl_buffer",22,"type")="struct"
-	Set gtmtypfldindx("jnl_buffer","iosb")=22
-	Set gtmtypes("jnl_buffer",23,"name")="jnl_buffer.iosb.cond"
-	Set gtmtypes("jnl_buffer",23,"off")=228
-	Set gtmtypes("jnl_buffer",23,"len")=2
-	Set gtmtypes("jnl_buffer",23,"type")="short"
-	Set gtmtypfldindx("jnl_buffer","iosb.cond")=23
-	Set gtmtypes("jnl_buffer",24,"name")="jnl_buffer.iosb.length"
-	Set gtmtypes("jnl_buffer",24,"off")=230
-	Set gtmtypes("jnl_buffer",24,"len")=2
-	Set gtmtypes("jnl_buffer",24,"type")="unsigned-short"
-	Set gtmtypfldindx("jnl_buffer","iosb.length")=24
-	Set gtmtypes("jnl_buffer",25,"name")="jnl_buffer.iosb.dev_specific"
-	Set gtmtypes("jnl_buffer",25,"off")=232
+	Set gtmtypes("jnl_buffer",22,"type")="uint64_t"
+	Set gtmtypfldindx("jnl_buffer","phase2_commit_array[0].jnl_seqno")=22
+	Set gtmtypes("jnl_buffer",23,"name")="jnl_buffer.phase2_commit_array[0].strm_seqno"
+	Set gtmtypes("jnl_buffer",23,"off")=240
+	Set gtmtypes("jnl_buffer",23,"len")=8
+	Set gtmtypes("jnl_buffer",23,"type")="uint64_t"
+	Set gtmtypfldindx("jnl_buffer","phase2_commit_array[0].strm_seqno")=23
+	Set gtmtypes("jnl_buffer",24,"name")="jnl_buffer.phase2_commit_array[0].process_id"
+	Set gtmtypes("jnl_buffer",24,"off")=248
+	Set gtmtypes("jnl_buffer",24,"len")=4
+	Set gtmtypes("jnl_buffer",24,"type")="unsigned-int"
+	Set gtmtypfldindx("jnl_buffer","phase2_commit_array[0].process_id")=24
+	Set gtmtypes("jnl_buffer",25,"name")="jnl_buffer.phase2_commit_array[0].start_freeaddr"
+	Set gtmtypes("jnl_buffer",25,"off")=252
 	Set gtmtypes("jnl_buffer",25,"len")=4
-	Set gtmtypes("jnl_buffer",25,"type")="int"
-	Set gtmtypfldindx("jnl_buffer","iosb.dev_specific")=25
-	Set gtmtypes("jnl_buffer",26,"name")="jnl_buffer.log2_of_alignsize"
-	Set gtmtypes("jnl_buffer",26,"off")=236
+	Set gtmtypes("jnl_buffer",25,"type")="unsigned-int"
+	Set gtmtypfldindx("jnl_buffer","phase2_commit_array[0].start_freeaddr")=25
+	Set gtmtypes("jnl_buffer",26,"name")="jnl_buffer.phase2_commit_array[0].tot_jrec_len"
+	Set gtmtypes("jnl_buffer",26,"off")=256
 	Set gtmtypes("jnl_buffer",26,"len")=4
 	Set gtmtypes("jnl_buffer",26,"type")="unsigned-int"
-	Set gtmtypfldindx("jnl_buffer","log2_of_alignsize")=26
-	Set gtmtypes("jnl_buffer",27,"name")="jnl_buffer.eov_timestamp"
-	Set gtmtypes("jnl_buffer",27,"off")=240
+	Set gtmtypfldindx("jnl_buffer","phase2_commit_array[0].tot_jrec_len")=26
+	Set gtmtypes("jnl_buffer",27,"name")="jnl_buffer.phase2_commit_array[0].pini_addr"
+	Set gtmtypes("jnl_buffer",27,"off")=260
 	Set gtmtypes("jnl_buffer",27,"len")=4
 	Set gtmtypes("jnl_buffer",27,"type")="unsigned-int"
-	Set gtmtypfldindx("jnl_buffer","eov_timestamp")=27
-	Set gtmtypes("jnl_buffer",28,"name")="jnl_buffer.cycle"
-	Set gtmtypes("jnl_buffer",28,"off")=244
+	Set gtmtypfldindx("jnl_buffer","phase2_commit_array[0].pini_addr")=27
+	Set gtmtypes("jnl_buffer",28,"name")="jnl_buffer.phase2_commit_array[0].jrec_time"
+	Set gtmtypes("jnl_buffer",28,"off")=264
 	Set gtmtypes("jnl_buffer",28,"len")=4
 	Set gtmtypes("jnl_buffer",28,"type")="unsigned-int"
-	Set gtmtypfldindx("jnl_buffer","cycle")=28
-	Set gtmtypes("jnl_buffer",29,"name")="jnl_buffer.qiocnt"
-	Set gtmtypes("jnl_buffer",29,"off")=248
-	Set gtmtypes("jnl_buffer",29,"len")=4
-	Set gtmtypes("jnl_buffer",29,"type")="int"
-	Set gtmtypfldindx("jnl_buffer","qiocnt")=29
-	Set gtmtypes("jnl_buffer",30,"name")="jnl_buffer.bytcnt"
-	Set gtmtypes("jnl_buffer",30,"off")=252
-	Set gtmtypes("jnl_buffer",30,"len")=4
-	Set gtmtypes("jnl_buffer",30,"type")="int"
-	Set gtmtypfldindx("jnl_buffer","bytcnt")=30
-	Set gtmtypes("jnl_buffer",31,"name")="jnl_buffer.errcnt"
-	Set gtmtypes("jnl_buffer",31,"off")=256
-	Set gtmtypes("jnl_buffer",31,"len")=4
-	Set gtmtypes("jnl_buffer",31,"type")="int"
-	Set gtmtypfldindx("jnl_buffer","errcnt")=31
-	Set gtmtypes("jnl_buffer",32,"name")="jnl_buffer.reccnt"
-	Set gtmtypes("jnl_buffer",32,"off")=260
-	Set gtmtypes("jnl_buffer",32,"len")=144
-	Set gtmtypes("jnl_buffer",32,"type")="int"
-	Set gtmtypfldindx("jnl_buffer","reccnt")=32
-	Set gtmtypes("jnl_buffer",32,"dim")=36
-	Set gtmtypes("jnl_buffer",33,"name")="jnl_buffer.filler_align"
-	Set gtmtypes("jnl_buffer",33,"off")=404
+	Set gtmtypfldindx("jnl_buffer","phase2_commit_array[0].jrec_time")=28
+	Set gtmtypes("jnl_buffer",29,"name")="jnl_buffer.phase2_commit_array[0].in_phase2"
+	Set gtmtypes("jnl_buffer",29,"off")=268
+	Set gtmtypes("jnl_buffer",29,"len")=1
+	Set gtmtypes("jnl_buffer",29,"type")="char"
+	Set gtmtypfldindx("jnl_buffer","phase2_commit_array[0].in_phase2")=29
+	Set gtmtypes("jnl_buffer",30,"name")="jnl_buffer.phase2_commit_array[0].replication"
+	Set gtmtypes("jnl_buffer",30,"off")=269
+	Set gtmtypes("jnl_buffer",30,"len")=1
+	Set gtmtypes("jnl_buffer",30,"type")="char"
+	Set gtmtypfldindx("jnl_buffer","phase2_commit_array[0].replication")=30
+	Set gtmtypes("jnl_buffer",31,"name")="jnl_buffer.phase2_commit_array[0].write_complete"
+	Set gtmtypes("jnl_buffer",31,"off")=270
+	Set gtmtypes("jnl_buffer",31,"len")=1
+	Set gtmtypes("jnl_buffer",31,"type")="char"
+	Set gtmtypfldindx("jnl_buffer","phase2_commit_array[0].write_complete")=31
+	Set gtmtypes("jnl_buffer",32,"name")="jnl_buffer.phase2_commit_array[0].filler_8byte_align"
+	Set gtmtypes("jnl_buffer",32,"off")=271
+	Set gtmtypes("jnl_buffer",32,"len")=1
+	Set gtmtypes("jnl_buffer",32,"type")="char"
+	Set gtmtypfldindx("jnl_buffer","phase2_commit_array[0].filler_8byte_align")=32
+	Set gtmtypes("jnl_buffer",33,"name")="jnl_buffer.blocked"
+	Set gtmtypes("jnl_buffer",33,"off")=196832
 	Set gtmtypes("jnl_buffer",33,"len")=4
 	Set gtmtypes("jnl_buffer",33,"type")="int"
-	Set gtmtypfldindx("jnl_buffer","filler_align")=33
-	Set gtmtypes("jnl_buffer",34,"name")="jnl_buffer.prev_jrec_time"
-	Set gtmtypes("jnl_buffer",34,"off")=408
+	Set gtmtypfldindx("jnl_buffer","blocked")=33
+	Set gtmtypes("jnl_buffer",34,"name")="jnl_buffer.fsync_dskaddr"
+	Set gtmtypes("jnl_buffer",34,"off")=196836
 	Set gtmtypes("jnl_buffer",34,"len")=4
 	Set gtmtypes("jnl_buffer",34,"type")="unsigned-int"
-	Set gtmtypfldindx("jnl_buffer","prev_jrec_time")=34
-	Set gtmtypes("jnl_buffer",35,"name")="jnl_buffer.free_update_pid"
-	Set gtmtypes("jnl_buffer",35,"off")=412
+	Set gtmtypfldindx("jnl_buffer","fsync_dskaddr")=34
+	Set gtmtypes("jnl_buffer",35,"name")="jnl_buffer.dsk"
+	Set gtmtypes("jnl_buffer",35,"off")=196840
 	Set gtmtypes("jnl_buffer",35,"len")=4
 	Set gtmtypes("jnl_buffer",35,"type")="int"
-	Set gtmtypfldindx("jnl_buffer","free_update_pid")=35
-	Set gtmtypes("jnl_buffer",36,"name")="jnl_buffer.next_epoch_time"
-	Set gtmtypes("jnl_buffer",36,"off")=416
+	Set gtmtypfldindx("jnl_buffer","dsk")=35
+	Set gtmtypes("jnl_buffer",36,"name")="jnl_buffer.wrtsize"
+	Set gtmtypes("jnl_buffer",36,"off")=196844
 	Set gtmtypes("jnl_buffer",36,"len")=4
-	Set gtmtypes("jnl_buffer",36,"type")="unsigned-int"
-	Set gtmtypfldindx("jnl_buffer","next_epoch_time")=36
-	Set gtmtypes("jnl_buffer",37,"name")="jnl_buffer.need_db_fsync"
-	Set gtmtypes("jnl_buffer",37,"off")=420
+	Set gtmtypes("jnl_buffer",36,"type")="int"
+	Set gtmtypfldindx("jnl_buffer","wrtsize")=36
+	Set gtmtypes("jnl_buffer",37,"name")="jnl_buffer.dskaddr"
+	Set gtmtypes("jnl_buffer",37,"off")=196848
 	Set gtmtypes("jnl_buffer",37,"len")=4
-	Set gtmtypes("jnl_buffer",37,"type")="boolean_t"
-	Set gtmtypfldindx("jnl_buffer","need_db_fsync")=37
-	Set gtmtypes("jnl_buffer",38,"name")="jnl_buffer.io_in_prog"
-	Set gtmtypes("jnl_buffer",38,"off")=424
+	Set gtmtypes("jnl_buffer",37,"type")="unsigned-int"
+	Set gtmtypfldindx("jnl_buffer","dskaddr")=37
+	Set gtmtypes("jnl_buffer",38,"name")="jnl_buffer.now_writer"
+	Set gtmtypes("jnl_buffer",38,"off")=196852
 	Set gtmtypes("jnl_buffer",38,"len")=4
-	Set gtmtypes("jnl_buffer",38,"type")="int"
-	Set gtmtypfldindx("jnl_buffer","io_in_prog")=38
-	Set gtmtypes("jnl_buffer",39,"name")="jnl_buffer.enospc_errcnt"
-	Set gtmtypes("jnl_buffer",39,"off")=428
+	Set gtmtypes("jnl_buffer",38,"type")="unsigned-int"
+	Set gtmtypfldindx("jnl_buffer","now_writer")=38
+	Set gtmtypes("jnl_buffer",39,"name")="jnl_buffer.image_count"
+	Set gtmtypes("jnl_buffer",39,"off")=196856
 	Set gtmtypes("jnl_buffer",39,"len")=4
 	Set gtmtypes("jnl_buffer",39,"type")="unsigned-int"
-	Set gtmtypfldindx("jnl_buffer","enospc_errcnt")=39
-	Set gtmtypes("jnl_buffer",40,"name")="jnl_buffer.max_jrec_len"
-	Set gtmtypes("jnl_buffer",40,"off")=432
-	Set gtmtypes("jnl_buffer",40,"len")=4
-	Set gtmtypes("jnl_buffer",40,"type")="unsigned-int"
-	Set gtmtypfldindx("jnl_buffer","max_jrec_len")=40
-	Set gtmtypes("jnl_buffer",41,"name")="jnl_buffer.fs_block_size"
-	Set gtmtypes("jnl_buffer",41,"off")=436
-	Set gtmtypes("jnl_buffer",41,"len")=4
-	Set gtmtypes("jnl_buffer",41,"type")="unsigned-int"
-	Set gtmtypfldindx("jnl_buffer","fs_block_size")=41
-	Set gtmtypes("jnl_buffer",42,"name")="jnl_buffer.post_epoch_freeaddr"
-	Set gtmtypes("jnl_buffer",42,"off")=440
-	Set gtmtypes("jnl_buffer",42,"len")=4
-	Set gtmtypes("jnl_buffer",42,"type")="unsigned-int"
-	Set gtmtypfldindx("jnl_buffer","post_epoch_freeaddr")=42
-	Set gtmtypes("jnl_buffer",43,"name")="jnl_buffer.last_eof_written"
-	Set gtmtypes("jnl_buffer",43,"off")=444
+	Set gtmtypfldindx("jnl_buffer","image_count")=39
+	Set gtmtypes("jnl_buffer",40,"name")="jnl_buffer.iosb"
+	Set gtmtypes("jnl_buffer",40,"off")=196860
+	Set gtmtypes("jnl_buffer",40,"len")=8
+	Set gtmtypes("jnl_buffer",40,"type")="struct"
+	Set gtmtypfldindx("jnl_buffer","iosb")=40
+	Set gtmtypes("jnl_buffer",41,"name")="jnl_buffer.iosb.cond"
+	Set gtmtypes("jnl_buffer",41,"off")=196860
+	Set gtmtypes("jnl_buffer",41,"len")=2
+	Set gtmtypes("jnl_buffer",41,"type")="short"
+	Set gtmtypfldindx("jnl_buffer","iosb.cond")=41
+	Set gtmtypes("jnl_buffer",42,"name")="jnl_buffer.iosb.length"
+	Set gtmtypes("jnl_buffer",42,"off")=196862
+	Set gtmtypes("jnl_buffer",42,"len")=2
+	Set gtmtypes("jnl_buffer",42,"type")="unsigned-short"
+	Set gtmtypfldindx("jnl_buffer","iosb.length")=42
+	Set gtmtypes("jnl_buffer",43,"name")="jnl_buffer.iosb.dev_specific"
+	Set gtmtypes("jnl_buffer",43,"off")=196864
 	Set gtmtypes("jnl_buffer",43,"len")=4
-	Set gtmtypes("jnl_buffer",43,"type")="boolean_t"
-	Set gtmtypfldindx("jnl_buffer","last_eof_written")=43
-	Set gtmtypes("jnl_buffer",44,"name")="jnl_buffer.end_of_data_at_open"
-	Set gtmtypes("jnl_buffer",44,"off")=448
+	Set gtmtypes("jnl_buffer",43,"type")="int"
+	Set gtmtypfldindx("jnl_buffer","iosb.dev_specific")=43
+	Set gtmtypes("jnl_buffer",44,"name")="jnl_buffer.alignsize"
+	Set gtmtypes("jnl_buffer",44,"off")=196868
 	Set gtmtypes("jnl_buffer",44,"len")=4
 	Set gtmtypes("jnl_buffer",44,"type")="unsigned-int"
-	Set gtmtypfldindx("jnl_buffer","end_of_data_at_open")=44
-	Set gtmtypes("jnl_buffer",45,"name")="jnl_buffer.fill_cacheline0"
-	Set gtmtypes("jnl_buffer",45,"off")=452
-	Set gtmtypes("jnl_buffer",45,"len")=56
-	Set gtmtypes("jnl_buffer",45,"type")="char"
-	Set gtmtypfldindx("jnl_buffer","fill_cacheline0")=45
-	Set gtmtypes("jnl_buffer",46,"name")="jnl_buffer.io_in_prog_latch"
-	Set gtmtypes("jnl_buffer",46,"off")=512
-	Set gtmtypes("jnl_buffer",46,"len")=8
-	Set gtmtypes("jnl_buffer",46,"type")="global_latch_t"
-	Set gtmtypfldindx("jnl_buffer","io_in_prog_latch")=46
-	Set gtmtypes("jnl_buffer",47,"name")="jnl_buffer.io_in_prog_latch.u"
-	Set gtmtypes("jnl_buffer",47,"off")=512
-	Set gtmtypes("jnl_buffer",47,"len")=8
-	Set gtmtypes("jnl_buffer",47,"type")="union"
-	Set gtmtypfldindx("jnl_buffer","io_in_prog_latch.u")=47
-	Set gtmtypes("jnl_buffer",48,"name")="jnl_buffer.io_in_prog_latch.u.pid_imgcnt"
-	Set gtmtypes("jnl_buffer",48,"off")=512
-	Set gtmtypes("jnl_buffer",48,"len")=8
-	Set gtmtypes("jnl_buffer",48,"type")="uint64_t"
-	Set gtmtypfldindx("jnl_buffer","io_in_prog_latch.u.pid_imgcnt")=48
-	Set gtmtypes("jnl_buffer",49,"name")="jnl_buffer.io_in_prog_latch.u.parts"
-	Set gtmtypes("jnl_buffer",49,"off")=512
-	Set gtmtypes("jnl_buffer",49,"len")=8
-	Set gtmtypes("jnl_buffer",49,"type")="struct"
-	Set gtmtypfldindx("jnl_buffer","io_in_prog_latch.u.parts")=49
-	Set gtmtypes("jnl_buffer",50,"name")="jnl_buffer.io_in_prog_latch.u.parts.latch_pid"
-	Set gtmtypes("jnl_buffer",50,"off")=512
-	Set gtmtypes("jnl_buffer",50,"len")=4
+	Set gtmtypfldindx("jnl_buffer","alignsize")=44
+	Set gtmtypes("jnl_buffer",45,"name")="jnl_buffer.eov_timestamp"
+	Set gtmtypes("jnl_buffer",45,"off")=196872
+	Set gtmtypes("jnl_buffer",45,"len")=4
+	Set gtmtypes("jnl_buffer",45,"type")="unsigned-int"
+	Set gtmtypfldindx("jnl_buffer","eov_timestamp")=45
+	Set gtmtypes("jnl_buffer",46,"name")="jnl_buffer.cycle"
+	Set gtmtypes("jnl_buffer",46,"off")=196876
+	Set gtmtypes("jnl_buffer",46,"len")=4
+	Set gtmtypes("jnl_buffer",46,"type")="unsigned-int"
+	Set gtmtypfldindx("jnl_buffer","cycle")=46
+	Set gtmtypes("jnl_buffer",47,"name")="jnl_buffer.qiocnt"
+	Set gtmtypes("jnl_buffer",47,"off")=196880
+	Set gtmtypes("jnl_buffer",47,"len")=4
+	Set gtmtypes("jnl_buffer",47,"type")="int"
+	Set gtmtypfldindx("jnl_buffer","qiocnt")=47
+	Set gtmtypes("jnl_buffer",48,"name")="jnl_buffer.bytcnt"
+	Set gtmtypes("jnl_buffer",48,"off")=196884
+	Set gtmtypes("jnl_buffer",48,"len")=4
+	Set gtmtypes("jnl_buffer",48,"type")="int"
+	Set gtmtypfldindx("jnl_buffer","bytcnt")=48
+	Set gtmtypes("jnl_buffer",49,"name")="jnl_buffer.errcnt"
+	Set gtmtypes("jnl_buffer",49,"off")=196888
+	Set gtmtypes("jnl_buffer",49,"len")=4
+	Set gtmtypes("jnl_buffer",49,"type")="int"
+	Set gtmtypfldindx("jnl_buffer","errcnt")=49
+	Set gtmtypes("jnl_buffer",50,"name")="jnl_buffer.reccnt"
+	Set gtmtypes("jnl_buffer",50,"off")=196892
+	Set gtmtypes("jnl_buffer",50,"len")=144
 	Set gtmtypes("jnl_buffer",50,"type")="int"
-	Set gtmtypfldindx("jnl_buffer","io_in_prog_latch.u.parts.latch_pid")=50
-	Set gtmtypes("jnl_buffer",51,"name")="jnl_buffer.io_in_prog_latch.u.parts.latch_word"
-	Set gtmtypes("jnl_buffer",51,"off")=516
-	Set gtmtypes("jnl_buffer",51,"len")=4
+	Set gtmtypfldindx("jnl_buffer","reccnt")=50
+	Set gtmtypes("jnl_buffer",50,"dim")=36
+	Set gtmtypes("jnl_buffer",51,"name")="jnl_buffer.filler_align"
+	Set gtmtypes("jnl_buffer",51,"off")=197036
+	Set gtmtypes("jnl_buffer",51,"len")=24
 	Set gtmtypes("jnl_buffer",51,"type")="int"
-	Set gtmtypfldindx("jnl_buffer","io_in_prog_latch.u.parts.latch_word")=51
-	Set gtmtypes("jnl_buffer",52,"name")="jnl_buffer.fill_cacheline1"
-	Set gtmtypes("jnl_buffer",52,"off")=520
-	Set gtmtypes("jnl_buffer",52,"len")=56
-	Set gtmtypes("jnl_buffer",52,"type")="char"
-	Set gtmtypfldindx("jnl_buffer","fill_cacheline1")=52
-	Set gtmtypes("jnl_buffer",53,"name")="jnl_buffer.fsync_in_prog_latch"
-	Set gtmtypes("jnl_buffer",53,"off")=576
-	Set gtmtypes("jnl_buffer",53,"len")=8
-	Set gtmtypes("jnl_buffer",53,"type")="global_latch_t"
-	Set gtmtypfldindx("jnl_buffer","fsync_in_prog_latch")=53
-	Set gtmtypes("jnl_buffer",54,"name")="jnl_buffer.fsync_in_prog_latch.u"
-	Set gtmtypes("jnl_buffer",54,"off")=576
-	Set gtmtypes("jnl_buffer",54,"len")=8
-	Set gtmtypes("jnl_buffer",54,"type")="union"
-	Set gtmtypfldindx("jnl_buffer","fsync_in_prog_latch.u")=54
-	Set gtmtypes("jnl_buffer",55,"name")="jnl_buffer.fsync_in_prog_latch.u.pid_imgcnt"
-	Set gtmtypes("jnl_buffer",55,"off")=576
-	Set gtmtypes("jnl_buffer",55,"len")=8
-	Set gtmtypes("jnl_buffer",55,"type")="uint64_t"
-	Set gtmtypfldindx("jnl_buffer","fsync_in_prog_latch.u.pid_imgcnt")=55
-	Set gtmtypes("jnl_buffer",56,"name")="jnl_buffer.fsync_in_prog_latch.u.parts"
-	Set gtmtypes("jnl_buffer",56,"off")=576
-	Set gtmtypes("jnl_buffer",56,"len")=8
-	Set gtmtypes("jnl_buffer",56,"type")="struct"
-	Set gtmtypfldindx("jnl_buffer","fsync_in_prog_latch.u.parts")=56
-	Set gtmtypes("jnl_buffer",57,"name")="jnl_buffer.fsync_in_prog_latch.u.parts.latch_pid"
-	Set gtmtypes("jnl_buffer",57,"off")=576
+	Set gtmtypfldindx("jnl_buffer","filler_align")=51
+	Set gtmtypes("jnl_buffer",51,"dim")=6
+	Set gtmtypes("jnl_buffer",52,"name")="jnl_buffer.prev_jrec_time"
+	Set gtmtypes("jnl_buffer",52,"off")=197060
+	Set gtmtypes("jnl_buffer",52,"len")=4
+	Set gtmtypes("jnl_buffer",52,"type")="unsigned-int"
+	Set gtmtypfldindx("jnl_buffer","prev_jrec_time")=52
+	Set gtmtypes("jnl_buffer",53,"name")="jnl_buffer.next_epoch_time"
+	Set gtmtypes("jnl_buffer",53,"off")=197064
+	Set gtmtypes("jnl_buffer",53,"len")=4
+	Set gtmtypes("jnl_buffer",53,"type")="unsigned-int"
+	Set gtmtypfldindx("jnl_buffer","next_epoch_time")=53
+	Set gtmtypes("jnl_buffer",54,"name")="jnl_buffer.need_db_fsync"
+	Set gtmtypes("jnl_buffer",54,"off")=197068
+	Set gtmtypes("jnl_buffer",54,"len")=4
+	Set gtmtypes("jnl_buffer",54,"type")="boolean_t"
+	Set gtmtypfldindx("jnl_buffer","need_db_fsync")=54
+	Set gtmtypes("jnl_buffer",55,"name")="jnl_buffer.io_in_prog"
+	Set gtmtypes("jnl_buffer",55,"off")=197072
+	Set gtmtypes("jnl_buffer",55,"len")=4
+	Set gtmtypes("jnl_buffer",55,"type")="int"
+	Set gtmtypfldindx("jnl_buffer","io_in_prog")=55
+	Set gtmtypes("jnl_buffer",56,"name")="jnl_buffer.enospc_errcnt"
+	Set gtmtypes("jnl_buffer",56,"off")=197076
+	Set gtmtypes("jnl_buffer",56,"len")=4
+	Set gtmtypes("jnl_buffer",56,"type")="unsigned-int"
+	Set gtmtypfldindx("jnl_buffer","enospc_errcnt")=56
+	Set gtmtypes("jnl_buffer",57,"name")="jnl_buffer.max_jrec_len"
+	Set gtmtypes("jnl_buffer",57,"off")=197080
 	Set gtmtypes("jnl_buffer",57,"len")=4
-	Set gtmtypes("jnl_buffer",57,"type")="int"
-	Set gtmtypfldindx("jnl_buffer","fsync_in_prog_latch.u.parts.latch_pid")=57
-	Set gtmtypes("jnl_buffer",58,"name")="jnl_buffer.fsync_in_prog_latch.u.parts.latch_word"
-	Set gtmtypes("jnl_buffer",58,"off")=580
+	Set gtmtypes("jnl_buffer",57,"type")="unsigned-int"
+	Set gtmtypfldindx("jnl_buffer","max_jrec_len")=57
+	Set gtmtypes("jnl_buffer",58,"name")="jnl_buffer.fs_block_size"
+	Set gtmtypes("jnl_buffer",58,"off")=197084
 	Set gtmtypes("jnl_buffer",58,"len")=4
-	Set gtmtypes("jnl_buffer",58,"type")="int"
-	Set gtmtypfldindx("jnl_buffer","fsync_in_prog_latch.u.parts.latch_word")=58
-	Set gtmtypes("jnl_buffer",59,"name")="jnl_buffer.fill_cacheline2"
-	Set gtmtypes("jnl_buffer",59,"off")=584
-	Set gtmtypes("jnl_buffer",59,"len")=56
-	Set gtmtypes("jnl_buffer",59,"type")="char"
-	Set gtmtypfldindx("jnl_buffer","fill_cacheline2")=59
-	Set gtmtypes("jnl_buffer",60,"name")="jnl_buffer.buff"
-	Set gtmtypes("jnl_buffer",60,"off")=640
-	Set gtmtypes("jnl_buffer",60,"len")=1
-	Set gtmtypes("jnl_buffer",60,"type")="unsigned-char"
-	Set gtmtypfldindx("jnl_buffer","buff")=60
+	Set gtmtypes("jnl_buffer",58,"type")="unsigned-int"
+	Set gtmtypfldindx("jnl_buffer","fs_block_size")=58
+	Set gtmtypes("jnl_buffer",59,"name")="jnl_buffer.post_epoch_freeaddr"
+	Set gtmtypes("jnl_buffer",59,"off")=197088
+	Set gtmtypes("jnl_buffer",59,"len")=4
+	Set gtmtypes("jnl_buffer",59,"type")="unsigned-int"
+	Set gtmtypfldindx("jnl_buffer","post_epoch_freeaddr")=59
+	Set gtmtypes("jnl_buffer",60,"name")="jnl_buffer.last_eof_written"
+	Set gtmtypes("jnl_buffer",60,"off")=197092
+	Set gtmtypes("jnl_buffer",60,"len")=4
+	Set gtmtypes("jnl_buffer",60,"type")="boolean_t"
+	Set gtmtypfldindx("jnl_buffer","last_eof_written")=60
+	Set gtmtypes("jnl_buffer",61,"name")="jnl_buffer.end_of_data_at_open"
+	Set gtmtypes("jnl_buffer",61,"off")=197096
+	Set gtmtypes("jnl_buffer",61,"len")=4
+	Set gtmtypes("jnl_buffer",61,"type")="unsigned-int"
+	Set gtmtypfldindx("jnl_buffer","end_of_data_at_open")=61
+	Set gtmtypes("jnl_buffer",62,"name")="jnl_buffer.re_read_dskaddr"
+	Set gtmtypes("jnl_buffer",62,"off")=197100
+	Set gtmtypes("jnl_buffer",62,"len")=4
+	Set gtmtypes("jnl_buffer",62,"type")="unsigned-int"
+	Set gtmtypfldindx("jnl_buffer","re_read_dskaddr")=62
+	Set gtmtypes("jnl_buffer",63,"name")="jnl_buffer.fill_cacheline0"
+	Set gtmtypes("jnl_buffer",63,"off")=197104
+	Set gtmtypes("jnl_buffer",63,"len")=56
+	Set gtmtypes("jnl_buffer",63,"type")="char"
+	Set gtmtypfldindx("jnl_buffer","fill_cacheline0")=63
+	Set gtmtypes("jnl_buffer",64,"name")="jnl_buffer.io_in_prog_latch"
+	Set gtmtypes("jnl_buffer",64,"off")=197160
+	Set gtmtypes("jnl_buffer",64,"len")=8
+	Set gtmtypes("jnl_buffer",64,"type")="global_latch_t"
+	Set gtmtypfldindx("jnl_buffer","io_in_prog_latch")=64
+	Set gtmtypes("jnl_buffer",65,"name")="jnl_buffer.io_in_prog_latch.u"
+	Set gtmtypes("jnl_buffer",65,"off")=197160
+	Set gtmtypes("jnl_buffer",65,"len")=8
+	Set gtmtypes("jnl_buffer",65,"type")="union"
+	Set gtmtypfldindx("jnl_buffer","io_in_prog_latch.u")=65
+	Set gtmtypes("jnl_buffer",66,"name")="jnl_buffer.io_in_prog_latch.u.pid_imgcnt"
+	Set gtmtypes("jnl_buffer",66,"off")=197160
+	Set gtmtypes("jnl_buffer",66,"len")=8
+	Set gtmtypes("jnl_buffer",66,"type")="uint64_t"
+	Set gtmtypfldindx("jnl_buffer","io_in_prog_latch.u.pid_imgcnt")=66
+	Set gtmtypes("jnl_buffer",67,"name")="jnl_buffer.io_in_prog_latch.u.parts"
+	Set gtmtypes("jnl_buffer",67,"off")=197160
+	Set gtmtypes("jnl_buffer",67,"len")=8
+	Set gtmtypes("jnl_buffer",67,"type")="struct"
+	Set gtmtypfldindx("jnl_buffer","io_in_prog_latch.u.parts")=67
+	Set gtmtypes("jnl_buffer",68,"name")="jnl_buffer.io_in_prog_latch.u.parts.latch_pid"
+	Set gtmtypes("jnl_buffer",68,"off")=197160
+	Set gtmtypes("jnl_buffer",68,"len")=4
+	Set gtmtypes("jnl_buffer",68,"type")="int"
+	Set gtmtypfldindx("jnl_buffer","io_in_prog_latch.u.parts.latch_pid")=68
+	Set gtmtypes("jnl_buffer",69,"name")="jnl_buffer.io_in_prog_latch.u.parts.latch_word"
+	Set gtmtypes("jnl_buffer",69,"off")=197164
+	Set gtmtypes("jnl_buffer",69,"len")=4
+	Set gtmtypes("jnl_buffer",69,"type")="int"
+	Set gtmtypfldindx("jnl_buffer","io_in_prog_latch.u.parts.latch_word")=69
+	Set gtmtypes("jnl_buffer",70,"name")="jnl_buffer.fill_cacheline1"
+	Set gtmtypes("jnl_buffer",70,"off")=197168
+	Set gtmtypes("jnl_buffer",70,"len")=56
+	Set gtmtypes("jnl_buffer",70,"type")="char"
+	Set gtmtypfldindx("jnl_buffer","fill_cacheline1")=70
+	Set gtmtypes("jnl_buffer",71,"name")="jnl_buffer.fsync_in_prog_latch"
+	Set gtmtypes("jnl_buffer",71,"off")=197224
+	Set gtmtypes("jnl_buffer",71,"len")=8
+	Set gtmtypes("jnl_buffer",71,"type")="global_latch_t"
+	Set gtmtypfldindx("jnl_buffer","fsync_in_prog_latch")=71
+	Set gtmtypes("jnl_buffer",72,"name")="jnl_buffer.fsync_in_prog_latch.u"
+	Set gtmtypes("jnl_buffer",72,"off")=197224
+	Set gtmtypes("jnl_buffer",72,"len")=8
+	Set gtmtypes("jnl_buffer",72,"type")="union"
+	Set gtmtypfldindx("jnl_buffer","fsync_in_prog_latch.u")=72
+	Set gtmtypes("jnl_buffer",73,"name")="jnl_buffer.fsync_in_prog_latch.u.pid_imgcnt"
+	Set gtmtypes("jnl_buffer",73,"off")=197224
+	Set gtmtypes("jnl_buffer",73,"len")=8
+	Set gtmtypes("jnl_buffer",73,"type")="uint64_t"
+	Set gtmtypfldindx("jnl_buffer","fsync_in_prog_latch.u.pid_imgcnt")=73
+	Set gtmtypes("jnl_buffer",74,"name")="jnl_buffer.fsync_in_prog_latch.u.parts"
+	Set gtmtypes("jnl_buffer",74,"off")=197224
+	Set gtmtypes("jnl_buffer",74,"len")=8
+	Set gtmtypes("jnl_buffer",74,"type")="struct"
+	Set gtmtypfldindx("jnl_buffer","fsync_in_prog_latch.u.parts")=74
+	Set gtmtypes("jnl_buffer",75,"name")="jnl_buffer.fsync_in_prog_latch.u.parts.latch_pid"
+	Set gtmtypes("jnl_buffer",75,"off")=197224
+	Set gtmtypes("jnl_buffer",75,"len")=4
+	Set gtmtypes("jnl_buffer",75,"type")="int"
+	Set gtmtypfldindx("jnl_buffer","fsync_in_prog_latch.u.parts.latch_pid")=75
+	Set gtmtypes("jnl_buffer",76,"name")="jnl_buffer.fsync_in_prog_latch.u.parts.latch_word"
+	Set gtmtypes("jnl_buffer",76,"off")=197228
+	Set gtmtypes("jnl_buffer",76,"len")=4
+	Set gtmtypes("jnl_buffer",76,"type")="int"
+	Set gtmtypfldindx("jnl_buffer","fsync_in_prog_latch.u.parts.latch_word")=76
+	Set gtmtypes("jnl_buffer",77,"name")="jnl_buffer.fill_cacheline2"
+	Set gtmtypes("jnl_buffer",77,"off")=197232
+	Set gtmtypes("jnl_buffer",77,"len")=56
+	Set gtmtypes("jnl_buffer",77,"type")="char"
+	Set gtmtypfldindx("jnl_buffer","fill_cacheline2")=77
+	Set gtmtypes("jnl_buffer",78,"name")="jnl_buffer.phase2_commit_latch"
+	Set gtmtypes("jnl_buffer",78,"off")=197288
+	Set gtmtypes("jnl_buffer",78,"len")=8
+	Set gtmtypes("jnl_buffer",78,"type")="global_latch_t"
+	Set gtmtypfldindx("jnl_buffer","phase2_commit_latch")=78
+	Set gtmtypes("jnl_buffer",79,"name")="jnl_buffer.phase2_commit_latch.u"
+	Set gtmtypes("jnl_buffer",79,"off")=197288
+	Set gtmtypes("jnl_buffer",79,"len")=8
+	Set gtmtypes("jnl_buffer",79,"type")="union"
+	Set gtmtypfldindx("jnl_buffer","phase2_commit_latch.u")=79
+	Set gtmtypes("jnl_buffer",80,"name")="jnl_buffer.phase2_commit_latch.u.pid_imgcnt"
+	Set gtmtypes("jnl_buffer",80,"off")=197288
+	Set gtmtypes("jnl_buffer",80,"len")=8
+	Set gtmtypes("jnl_buffer",80,"type")="uint64_t"
+	Set gtmtypfldindx("jnl_buffer","phase2_commit_latch.u.pid_imgcnt")=80
+	Set gtmtypes("jnl_buffer",81,"name")="jnl_buffer.phase2_commit_latch.u.parts"
+	Set gtmtypes("jnl_buffer",81,"off")=197288
+	Set gtmtypes("jnl_buffer",81,"len")=8
+	Set gtmtypes("jnl_buffer",81,"type")="struct"
+	Set gtmtypfldindx("jnl_buffer","phase2_commit_latch.u.parts")=81
+	Set gtmtypes("jnl_buffer",82,"name")="jnl_buffer.phase2_commit_latch.u.parts.latch_pid"
+	Set gtmtypes("jnl_buffer",82,"off")=197288
+	Set gtmtypes("jnl_buffer",82,"len")=4
+	Set gtmtypes("jnl_buffer",82,"type")="int"
+	Set gtmtypfldindx("jnl_buffer","phase2_commit_latch.u.parts.latch_pid")=82
+	Set gtmtypes("jnl_buffer",83,"name")="jnl_buffer.phase2_commit_latch.u.parts.latch_word"
+	Set gtmtypes("jnl_buffer",83,"off")=197292
+	Set gtmtypes("jnl_buffer",83,"len")=4
+	Set gtmtypes("jnl_buffer",83,"type")="int"
+	Set gtmtypfldindx("jnl_buffer","phase2_commit_latch.u.parts.latch_word")=83
+	Set gtmtypes("jnl_buffer",84,"name")="jnl_buffer.fill_cacheline3"
+	Set gtmtypes("jnl_buffer",84,"off")=197296
+	Set gtmtypes("jnl_buffer",84,"len")=56
+	Set gtmtypes("jnl_buffer",84,"type")="char"
+	Set gtmtypfldindx("jnl_buffer","fill_cacheline3")=84
+	Set gtmtypes("jnl_buffer",85,"name")="jnl_buffer.buff"
+	Set gtmtypes("jnl_buffer",85,"off")=197352
+	Set gtmtypes("jnl_buffer",85,"len")=1
+	Set gtmtypes("jnl_buffer",85,"type")="unsigned-char"
+	Set gtmtypfldindx("jnl_buffer","buff")=85
 	;
 	Set gtmtypes("jnl_create_info")="struct"
 	Set gtmtypes("jnl_create_info",0)=35
@@ -10416,7 +10636,7 @@ Init
 	Set gtmtypfldindx("jnl_ctl_list","turn_around_fullyupgraded")=47
 	;
 	Set gtmtypes("jnl_fence_control")="struct"
-	Set gtmtypes("jnl_fence_control",0)=4
+	Set gtmtypes("jnl_fence_control",0)=5
 	Set gtmtypes("jnl_fence_control","len")=32
 	Set gtmtypes("jnl_fence_control",1,"name")="jnl_fence_control.fence_list"
 	Set gtmtypes("jnl_fence_control",1,"off")=0
@@ -10428,16 +10648,21 @@ Init
 	Set gtmtypes("jnl_fence_control",2,"len")=4
 	Set gtmtypes("jnl_fence_control",2,"type")="int"
 	Set gtmtypfldindx("jnl_fence_control","level")=2
-	Set gtmtypes("jnl_fence_control",3,"name")="jnl_fence_control.token"
-	Set gtmtypes("jnl_fence_control",3,"off")=16
-	Set gtmtypes("jnl_fence_control",3,"len")=8
-	Set gtmtypes("jnl_fence_control",3,"type")="uint64_t"
-	Set gtmtypfldindx("jnl_fence_control","token")=3
-	Set gtmtypes("jnl_fence_control",4,"name")="jnl_fence_control.strm_seqno"
-	Set gtmtypes("jnl_fence_control",4,"off")=24
+	Set gtmtypes("jnl_fence_control",3,"name")="jnl_fence_control.replication"
+	Set gtmtypes("jnl_fence_control",3,"off")=12
+	Set gtmtypes("jnl_fence_control",3,"len")=4
+	Set gtmtypes("jnl_fence_control",3,"type")="boolean_t"
+	Set gtmtypfldindx("jnl_fence_control","replication")=3
+	Set gtmtypes("jnl_fence_control",4,"name")="jnl_fence_control.token"
+	Set gtmtypes("jnl_fence_control",4,"off")=16
 	Set gtmtypes("jnl_fence_control",4,"len")=8
 	Set gtmtypes("jnl_fence_control",4,"type")="uint64_t"
-	Set gtmtypfldindx("jnl_fence_control","strm_seqno")=4
+	Set gtmtypfldindx("jnl_fence_control","token")=4
+	Set gtmtypes("jnl_fence_control",5,"name")="jnl_fence_control.strm_seqno"
+	Set gtmtypes("jnl_fence_control",5,"off")=24
+	Set gtmtypes("jnl_fence_control",5,"len")=8
+	Set gtmtypes("jnl_fence_control",5,"type")="uint64_t"
+	Set gtmtypfldindx("jnl_fence_control","strm_seqno")=5
 	;
 	Set gtmtypes("jnl_file_header")="struct"
 	Set gtmtypes("jnl_file_header",0)=67
@@ -10964,8 +11189,8 @@ Init
 	Set gtmtypfldindx("jnl_gbls_t","mur_update")=21
 	;
 	Set gtmtypes("jnl_private_control")="struct"
-	Set gtmtypes("jnl_private_control",0)=24
-	Set gtmtypes("jnl_private_control","len")=128
+	Set gtmtypes("jnl_private_control",0)=22
+	Set gtmtypes("jnl_private_control","len")=112
 	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
@@ -11006,86 +11231,76 @@ Init
 	Set gtmtypes("jnl_private_control",8,"len")=4
 	Set gtmtypes("jnl_private_control",8,"type")="unsigned-int"
 	Set gtmtypfldindx("jnl_private_control","fileid.st_gen")=8
-	Set gtmtypes("jnl_private_control",9,"name")="jnl_private_control.jnllsb"
+	Set gtmtypes("jnl_private_control",9,"name")="jnl_private_control.pini_addr"
 	Set gtmtypes("jnl_private_control",9,"off")=48
-	Set gtmtypes("jnl_private_control",9,"len")=8
-	Set gtmtypes("jnl_private_control",9,"type")="addr"
-	Set gtmtypfldindx("jnl_private_control","jnllsb")=9
-	Set gtmtypes("jnl_private_control",10,"name")="jnl_private_control.pini_addr"
-	Set gtmtypes("jnl_private_control",10,"off")=56
+	Set gtmtypes("jnl_private_control",9,"len")=4
+	Set gtmtypes("jnl_private_control",9,"type")="unsigned-int"
+	Set gtmtypfldindx("jnl_private_control","pini_addr")=9
+	Set gtmtypes("jnl_private_control",10,"name")="jnl_private_control.new_freeaddr"
+	Set gtmtypes("jnl_private_control",10,"off")=52
 	Set gtmtypes("jnl_private_control",10,"len")=4
 	Set gtmtypes("jnl_private_control",10,"type")="unsigned-int"
-	Set gtmtypfldindx("jnl_private_control","pini_addr")=10
-	Set gtmtypes("jnl_private_control",11,"name")="jnl_private_control.new_freeaddr"
-	Set gtmtypes("jnl_private_control",11,"off")=60
+	Set gtmtypfldindx("jnl_private_control","new_freeaddr")=10
+	Set gtmtypes("jnl_private_control",11,"name")="jnl_private_control.phase2_freeaddr"
+	Set gtmtypes("jnl_private_control",11,"off")=56
 	Set gtmtypes("jnl_private_control",11,"len")=4
 	Set gtmtypes("jnl_private_control",11,"type")="unsigned-int"
-	Set gtmtypfldindx("jnl_private_control","new_freeaddr")=11
-	Set gtmtypes("jnl_private_control",12,"name")="jnl_private_control.temp_free"
-	Set gtmtypes("jnl_private_control",12,"off")=64
+	Set gtmtypfldindx("jnl_private_control","phase2_freeaddr")=11
+	Set gtmtypes("jnl_private_control",12,"name")="jnl_private_control.phase2_free"
+	Set gtmtypes("jnl_private_control",12,"off")=60
 	Set gtmtypes("jnl_private_control",12,"len")=4
-	Set gtmtypes("jnl_private_control",12,"type")="int"
-	Set gtmtypfldindx("jnl_private_control","temp_free")=12
-	Set gtmtypes("jnl_private_control",13,"name")="jnl_private_control.filler_q0"
-	Set gtmtypes("jnl_private_control",13,"off")=72
-	Set gtmtypes("jnl_private_control",13,"len")=8
-	Set gtmtypes("jnl_private_control",13,"type")="double"
-	Set gtmtypfldindx("jnl_private_control","filler_q0")=13
-	Set gtmtypes("jnl_private_control",14,"name")="jnl_private_control.new_dsk"
-	Set gtmtypes("jnl_private_control",14,"off")=80
+	Set gtmtypes("jnl_private_control",12,"type")="unsigned-int"
+	Set gtmtypfldindx("jnl_private_control","phase2_free")=12
+	Set gtmtypes("jnl_private_control",13,"name")="jnl_private_control.in_jnl_phase2_salvage"
+	Set gtmtypes("jnl_private_control",13,"off")=64
+	Set gtmtypes("jnl_private_control",13,"len")=4
+	Set gtmtypes("jnl_private_control",13,"type")="boolean_t"
+	Set gtmtypfldindx("jnl_private_control","in_jnl_phase2_salvage")=13
+	Set gtmtypes("jnl_private_control",14,"name")="jnl_private_control.status"
+	Set gtmtypes("jnl_private_control",14,"off")=68
 	Set gtmtypes("jnl_private_control",14,"len")=4
 	Set gtmtypes("jnl_private_control",14,"type")="int"
-	Set gtmtypfldindx("jnl_private_control","new_dsk")=14
-	Set gtmtypes("jnl_private_control",15,"name")="jnl_private_control.new_dskaddr"
-	Set gtmtypes("jnl_private_control",15,"off")=84
+	Set gtmtypfldindx("jnl_private_control","status")=14
+	Set gtmtypes("jnl_private_control",15,"name")="jnl_private_control.qio_active"
+	Set gtmtypes("jnl_private_control",15,"off")=72
 	Set gtmtypes("jnl_private_control",15,"len")=4
-	Set gtmtypes("jnl_private_control",15,"type")="unsigned-int"
-	Set gtmtypfldindx("jnl_private_control","new_dskaddr")=15
-	Set gtmtypes("jnl_private_control",16,"name")="jnl_private_control.status"
-	Set gtmtypes("jnl_private_control",16,"off")=88
+	Set gtmtypes("jnl_private_control",15,"type")="boolean_t"
+	Set gtmtypfldindx("jnl_private_control","qio_active")=15
+	Set gtmtypes("jnl_private_control",16,"name")="jnl_private_control.fd_mismatch"
+	Set gtmtypes("jnl_private_control",16,"off")=76
 	Set gtmtypes("jnl_private_control",16,"len")=4
-	Set gtmtypes("jnl_private_control",16,"type")="int"
-	Set gtmtypfldindx("jnl_private_control","status")=16
-	Set gtmtypes("jnl_private_control",17,"name")="jnl_private_control.dsk_update_inprog"
-	Set gtmtypes("jnl_private_control",17,"off")=92
+	Set gtmtypes("jnl_private_control",16,"type")="boolean_t"
+	Set gtmtypfldindx("jnl_private_control","fd_mismatch")=16
+	Set gtmtypes("jnl_private_control",17,"name")="jnl_private_control.sync_io"
+	Set gtmtypes("jnl_private_control",17,"off")=80
 	Set gtmtypes("jnl_private_control",17,"len")=4
 	Set gtmtypes("jnl_private_control",17,"type")="boolean_t"
-	Set gtmtypfldindx("jnl_private_control","dsk_update_inprog")=17
-	Set gtmtypes("jnl_private_control",18,"name")="jnl_private_control.qio_active"
-	Set gtmtypes("jnl_private_control",18,"off")=96
+	Set gtmtypfldindx("jnl_private_control","sync_io")=17
+	Set gtmtypes("jnl_private_control",18,"name")="jnl_private_control.error_reported"
+	Set gtmtypes("jnl_private_control",18,"off")=84
 	Set gtmtypes("jnl_private_control",18,"len")=4
 	Set gtmtypes("jnl_private_control",18,"type")="boolean_t"
-	Set gtmtypfldindx("jnl_private_control","qio_active")=18
-	Set gtmtypes("jnl_private_control",19,"name")="jnl_private_control.fd_mismatch"
-	Set gtmtypes("jnl_private_control",19,"off")=100
+	Set gtmtypfldindx("jnl_private_control","error_reported")=18
+	Set gtmtypes("jnl_private_control",19,"name")="jnl_private_control.status2"
+	Set gtmtypes("jnl_private_control",19,"off")=88
 	Set gtmtypes("jnl_private_control",19,"len")=4
-	Set gtmtypes("jnl_private_control",19,"type")="boolean_t"
-	Set gtmtypfldindx("jnl_private_control","fd_mismatch")=19
-	Set gtmtypes("jnl_private_control",20,"name")="jnl_private_control.sync_io"
-	Set gtmtypes("jnl_private_control",20,"off")=104
+	Set gtmtypes("jnl_private_control",19,"type")="unsigned-int"
+	Set gtmtypfldindx("jnl_private_control","status2")=19
+	Set gtmtypes("jnl_private_control",20,"name")="jnl_private_control.cycle"
+	Set gtmtypes("jnl_private_control",20,"off")=92
 	Set gtmtypes("jnl_private_control",20,"len")=4
-	Set gtmtypes("jnl_private_control",20,"type")="boolean_t"
-	Set gtmtypfldindx("jnl_private_control","sync_io")=20
-	Set gtmtypes("jnl_private_control",21,"name")="jnl_private_control.error_reported"
-	Set gtmtypes("jnl_private_control",21,"off")=108
-	Set gtmtypes("jnl_private_control",21,"len")=4
-	Set gtmtypes("jnl_private_control",21,"type")="boolean_t"
-	Set gtmtypfldindx("jnl_private_control","error_reported")=21
-	Set gtmtypes("jnl_private_control",22,"name")="jnl_private_control.status2"
-	Set gtmtypes("jnl_private_control",22,"off")=112
-	Set gtmtypes("jnl_private_control",22,"len")=4
-	Set gtmtypes("jnl_private_control",22,"type")="unsigned-int"
-	Set gtmtypfldindx("jnl_private_control","status2")=22
-	Set gtmtypes("jnl_private_control",23,"name")="jnl_private_control.cycle"
-	Set gtmtypes("jnl_private_control",23,"off")=116
-	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_private_control",20,"type")="unsigned-int"
+	Set gtmtypfldindx("jnl_private_control","cycle")=20
+	Set gtmtypes("jnl_private_control",21,"name")="jnl_private_control.err_str"
+	Set gtmtypes("jnl_private_control",21,"off")=96
+	Set gtmtypes("jnl_private_control",21,"len")=8
+	Set gtmtypes("jnl_private_control",21,"type")="addr"
+	Set gtmtypfldindx("jnl_private_control","err_str")=21
+	Set gtmtypes("jnl_private_control",22,"name")="jnl_private_control.curr_tn"
+	Set gtmtypes("jnl_private_control",22,"off")=104
+	Set gtmtypes("jnl_private_control",22,"len")=8
+	Set gtmtypes("jnl_private_control",22,"type")="uint64_t"
+	Set gtmtypfldindx("jnl_private_control","curr_tn")=22
 	;
 	Set gtmtypes("jnl_process_vector")="struct"
 	Set gtmtypes("jnl_process_vector",0)=10
@@ -11361,19 +11576,19 @@ Init
 	Set gtmtypfldindx("jnl_record","jrec_aimg.blk_contents")=43
 	Set gtmtypes("jnl_record",44,"name")="jnl_record.jrec_align"
 	Set gtmtypes("jnl_record",44,"off")=0
-	Set gtmtypes("jnl_record",44,"len")=32
+	Set gtmtypes("jnl_record",44,"len")=12
 	Set gtmtypes("jnl_record",44,"type")="struct_jrec_align"
 	Set gtmtypfldindx("jnl_record","jrec_align")=44
-	Set gtmtypes("jnl_record",45,"name")="jnl_record.jrec_align.prefix"
-	Set gtmtypes("jnl_record",45,"off")=0
-	Set gtmtypes("jnl_record",45,"len")=24
-	Set gtmtypes("jnl_record",45,"type")="jrec_prefix"
-	Set gtmtypfldindx("jnl_record","jrec_align.prefix")=45
-	Set gtmtypes("jnl_record",46,"name")="jnl_record.jrec_align.align_str"
-	Set gtmtypes("jnl_record",46,"off")=24
-	Set gtmtypes("jnl_record",46,"len")=8
-	Set gtmtypes("jnl_record",46,"type")="jnl_string"
-	Set gtmtypfldindx("jnl_record","jrec_align.align_str")=46
+	Set gtmtypes("jnl_record",45,"name")="jnl_record.jrec_align.checksum"
+	Set gtmtypes("jnl_record",45,"off")=4
+	Set gtmtypes("jnl_record",45,"len")=4
+	Set gtmtypes("jnl_record",45,"type")="unsigned-int"
+	Set gtmtypfldindx("jnl_record","jrec_align.checksum")=45
+	Set gtmtypes("jnl_record",46,"name")="jnl_record.jrec_align.time"
+	Set gtmtypes("jnl_record",46,"off")=8
+	Set gtmtypes("jnl_record",46,"len")=4
+	Set gtmtypes("jnl_record",46,"type")="unsigned-int"
+	Set gtmtypfldindx("jnl_record","jrec_align.time")=46
 	Set gtmtypes("jnl_record",47,"name")="jnl_record.jrec_tcom"
 	Set gtmtypes("jnl_record",47,"off")=0
 	Set gtmtypes("jnl_record",47,"len")=56
@@ -11710,8 +11925,8 @@ Init
 	Set gtmtypfldindx("jnlext_multi_t","size")=7
 	;
 	Set gtmtypes("jnlpool_addrs")="struct"
-	Set gtmtypes("jnlpool_addrs",0)=7
-	Set gtmtypes("jnlpool_addrs","len")=56
+	Set gtmtypes("jnlpool_addrs",0)=16
+	Set gtmtypes("jnlpool_addrs","len")=96
 	Set gtmtypes("jnlpool_addrs",1,"name")="jnlpool_addrs.jnlpool_ctl"
 	Set gtmtypes("jnlpool_addrs",1,"off")=0
 	Set gtmtypes("jnlpool_addrs",1,"len")=8
@@ -11747,10 +11962,55 @@ Init
 	Set gtmtypes("jnlpool_addrs",7,"len")=8
 	Set gtmtypes("jnlpool_addrs",7,"type")="addr"
 	Set gtmtypfldindx("jnlpool_addrs","jnldata_base")=7
+	Set gtmtypes("jnlpool_addrs",8,"name")="jnlpool_addrs.jrs"
+	Set gtmtypes("jnlpool_addrs",8,"off")=56
+	Set gtmtypes("jnlpool_addrs",8,"len")=40
+	Set gtmtypes("jnlpool_addrs",8,"type")="jpl_rsrv_struct_t"
+	Set gtmtypfldindx("jnlpool_addrs","jrs")=8
+	Set gtmtypes("jnlpool_addrs",9,"name")="jnlpool_addrs.jrs.start_write_addr"
+	Set gtmtypes("jnlpool_addrs",9,"off")=56
+	Set gtmtypes("jnlpool_addrs",9,"len")=8
+	Set gtmtypes("jnlpool_addrs",9,"type")="uint64_t"
+	Set gtmtypfldindx("jnlpool_addrs","jrs.start_write_addr")=9
+	Set gtmtypes("jnlpool_addrs",10,"name")="jnlpool_addrs.jrs.cur_write_addr"
+	Set gtmtypes("jnlpool_addrs",10,"off")=64
+	Set gtmtypes("jnlpool_addrs",10,"len")=8
+	Set gtmtypes("jnlpool_addrs",10,"type")="uint64_t"
+	Set gtmtypfldindx("jnlpool_addrs","jrs.cur_write_addr")=10
+	Set gtmtypes("jnlpool_addrs",11,"name")="jnlpool_addrs.jrs.tot_jrec_len"
+	Set gtmtypes("jnlpool_addrs",11,"off")=72
+	Set gtmtypes("jnlpool_addrs",11,"len")=4
+	Set gtmtypes("jnlpool_addrs",11,"type")="unsigned-int"
+	Set gtmtypfldindx("jnlpool_addrs","jrs.tot_jrec_len")=11
+	Set gtmtypes("jnlpool_addrs",12,"name")="jnlpool_addrs.jrs.write_total"
+	Set gtmtypes("jnlpool_addrs",12,"off")=76
+	Set gtmtypes("jnlpool_addrs",12,"len")=4
+	Set gtmtypes("jnlpool_addrs",12,"type")="unsigned-int"
+	Set gtmtypfldindx("jnlpool_addrs","jrs.write_total")=12
+	Set gtmtypes("jnlpool_addrs",13,"name")="jnlpool_addrs.jrs.memcpy_skipped"
+	Set gtmtypes("jnlpool_addrs",13,"off")=80
+	Set gtmtypes("jnlpool_addrs",13,"len")=4
+	Set gtmtypes("jnlpool_addrs",13,"type")="boolean_t"
+	Set gtmtypfldindx("jnlpool_addrs","jrs.memcpy_skipped")=13
+	Set gtmtypes("jnlpool_addrs",14,"name")="jnlpool_addrs.jrs.phase2_commit_index"
+	Set gtmtypes("jnlpool_addrs",14,"off")=84
+	Set gtmtypes("jnlpool_addrs",14,"len")=4
+	Set gtmtypes("jnlpool_addrs",14,"type")="unsigned-int"
+	Set gtmtypfldindx("jnlpool_addrs","jrs.phase2_commit_index")=14
+	Set gtmtypes("jnlpool_addrs",15,"name")="jnlpool_addrs.jrs.num_tcoms"
+	Set gtmtypes("jnlpool_addrs",15,"off")=88
+	Set gtmtypes("jnlpool_addrs",15,"len")=4
+	Set gtmtypes("jnlpool_addrs",15,"type")="unsigned-int"
+	Set gtmtypfldindx("jnlpool_addrs","jrs.num_tcoms")=15
+	Set gtmtypes("jnlpool_addrs",16,"name")="jnlpool_addrs.jrs.filler_8byte_align"
+	Set gtmtypes("jnlpool_addrs",16,"off")=92
+	Set gtmtypes("jnlpool_addrs",16,"len")=4
+	Set gtmtypes("jnlpool_addrs",16,"type")="char"
+	Set gtmtypfldindx("jnlpool_addrs","jrs.filler_8byte_align")=16
 	;
 	Set gtmtypes("jnlpool_ctl_struct")="struct"
-	Set gtmtypes("jnlpool_ctl_struct",0)=48
-	Set gtmtypes("jnlpool_ctl_struct","len")=3728
+	Set gtmtypes("jnlpool_ctl_struct",0)=72
+	Set gtmtypes("jnlpool_ctl_struct","len")=659200
 	Set gtmtypes("jnlpool_ctl_struct",1,"name")="jnlpool_ctl_struct.jnlpool_id"
 	Set gtmtypes("jnlpool_ctl_struct",1,"off")=0
 	Set gtmtypes("jnlpool_ctl_struct",1,"len")=312
@@ -11831,181 +12091,288 @@ Init
 	Set gtmtypes("jnlpool_ctl_struct",16,"len")=8
 	Set gtmtypes("jnlpool_ctl_struct",16,"type")="uint64_t"
 	Set gtmtypfldindx("jnlpool_ctl_struct","max_zqgblmod_seqno")=16
-	Set gtmtypes("jnlpool_ctl_struct",17,"name")="jnlpool_ctl_struct.early_write_addr"
+	Set gtmtypes("jnlpool_ctl_struct",17,"name")="jnlpool_ctl_struct.strm_seqno"
 	Set gtmtypes("jnlpool_ctl_struct",17,"off")=384
-	Set gtmtypes("jnlpool_ctl_struct",17,"len")=8
+	Set gtmtypes("jnlpool_ctl_struct",17,"len")=128
 	Set gtmtypes("jnlpool_ctl_struct",17,"type")="uint64_t"
-	Set gtmtypfldindx("jnlpool_ctl_struct","early_write_addr")=17
-	Set gtmtypes("jnlpool_ctl_struct",18,"name")="jnlpool_ctl_struct.write_addr"
-	Set gtmtypes("jnlpool_ctl_struct",18,"off")=392
-	Set gtmtypes("jnlpool_ctl_struct",18,"len")=8
-	Set gtmtypes("jnlpool_ctl_struct",18,"type")="uint64_t"
-	Set gtmtypfldindx("jnlpool_ctl_struct","write_addr")=18
-	Set gtmtypes("jnlpool_ctl_struct",19,"name")="jnlpool_ctl_struct.write"
-	Set gtmtypes("jnlpool_ctl_struct",19,"off")=400
+	Set gtmtypfldindx("jnlpool_ctl_struct","strm_seqno")=17
+	Set gtmtypes("jnlpool_ctl_struct",17,"dim")=16
+	Set gtmtypes("jnlpool_ctl_struct",18,"name")="jnlpool_ctl_struct.this_side"
+	Set gtmtypes("jnlpool_ctl_struct",18,"off")=512
+	Set gtmtypes("jnlpool_ctl_struct",18,"len")=48
+	Set gtmtypes("jnlpool_ctl_struct",18,"type")="repl_conn_info_t"
+	Set gtmtypfldindx("jnlpool_ctl_struct","this_side")=18
+	Set gtmtypes("jnlpool_ctl_struct",19,"name")="jnlpool_ctl_struct.this_side.proto_ver"
+	Set gtmtypes("jnlpool_ctl_struct",19,"off")=512
 	Set gtmtypes("jnlpool_ctl_struct",19,"len")=4
-	Set gtmtypes("jnlpool_ctl_struct",19,"type")="unsigned-int"
-	Set gtmtypfldindx("jnlpool_ctl_struct","write")=19
-	Set gtmtypes("jnlpool_ctl_struct",20,"name")="jnlpool_ctl_struct.upd_disabled"
-	Set gtmtypes("jnlpool_ctl_struct",20,"off")=404
+	Set gtmtypes("jnlpool_ctl_struct",19,"type")="int"
+	Set gtmtypfldindx("jnlpool_ctl_struct","this_side.proto_ver")=19
+	Set gtmtypes("jnlpool_ctl_struct",20,"name")="jnlpool_ctl_struct.this_side.jnl_ver"
+	Set gtmtypes("jnlpool_ctl_struct",20,"off")=516
 	Set gtmtypes("jnlpool_ctl_struct",20,"len")=4
-	Set gtmtypes("jnlpool_ctl_struct",20,"type")="boolean_t"
-	Set gtmtypfldindx("jnlpool_ctl_struct","upd_disabled")=20
-	Set gtmtypes("jnlpool_ctl_struct",21,"name")="jnlpool_ctl_struct.lastwrite_len"
-	Set gtmtypes("jnlpool_ctl_struct",21,"off")=408
+	Set gtmtypes("jnlpool_ctl_struct",20,"type")="unsigned-int"
+	Set gtmtypfldindx("jnlpool_ctl_struct","this_side.jnl_ver")=20
+	Set gtmtypes("jnlpool_ctl_struct",21,"name")="jnlpool_ctl_struct.this_side.is_std_null_coll"
+	Set gtmtypes("jnlpool_ctl_struct",21,"off")=520
 	Set gtmtypes("jnlpool_ctl_struct",21,"len")=4
-	Set gtmtypes("jnlpool_ctl_struct",21,"type")="unsigned-int"
-	Set gtmtypfldindx("jnlpool_ctl_struct","lastwrite_len")=21
-	Set gtmtypes("jnlpool_ctl_struct",22,"name")="jnlpool_ctl_struct.send_losttn_complete"
-	Set gtmtypes("jnlpool_ctl_struct",22,"off")=412
+	Set gtmtypes("jnlpool_ctl_struct",21,"type")="boolean_t"
+	Set gtmtypfldindx("jnlpool_ctl_struct","this_side.is_std_null_coll")=21
+	Set gtmtypes("jnlpool_ctl_struct",22,"name")="jnlpool_ctl_struct.this_side.trigger_supported"
+	Set gtmtypes("jnlpool_ctl_struct",22,"off")=524
 	Set gtmtypes("jnlpool_ctl_struct",22,"len")=4
 	Set gtmtypes("jnlpool_ctl_struct",22,"type")="boolean_t"
-	Set gtmtypfldindx("jnlpool_ctl_struct","send_losttn_complete")=22
-	Set gtmtypes("jnlpool_ctl_struct",23,"name")="jnlpool_ctl_struct.primary_instname"
-	Set gtmtypes("jnlpool_ctl_struct",23,"off")=416
-	Set gtmtypes("jnlpool_ctl_struct",23,"len")=16
-	Set gtmtypes("jnlpool_ctl_struct",23,"type")="unsigned-char"
-	Set gtmtypfldindx("jnlpool_ctl_struct","primary_instname")=23
-	Set gtmtypes("jnlpool_ctl_struct",24,"name")="jnlpool_ctl_struct.gtmrecv_pid"
-	Set gtmtypes("jnlpool_ctl_struct",24,"off")=432
+	Set gtmtypfldindx("jnlpool_ctl_struct","this_side.trigger_supported")=22
+	Set gtmtypes("jnlpool_ctl_struct",23,"name")="jnlpool_ctl_struct.this_side.cross_endian"
+	Set gtmtypes("jnlpool_ctl_struct",23,"off")=528
+	Set gtmtypes("jnlpool_ctl_struct",23,"len")=4
+	Set gtmtypes("jnlpool_ctl_struct",23,"type")="boolean_t"
+	Set gtmtypfldindx("jnlpool_ctl_struct","this_side.cross_endian")=23
+	Set gtmtypes("jnlpool_ctl_struct",24,"name")="jnlpool_ctl_struct.this_side.endianness_known"
+	Set gtmtypes("jnlpool_ctl_struct",24,"off")=532
 	Set gtmtypes("jnlpool_ctl_struct",24,"len")=4
-	Set gtmtypes("jnlpool_ctl_struct",24,"type")="unsigned-int"
-	Set gtmtypfldindx("jnlpool_ctl_struct","gtmrecv_pid")=24
-	Set gtmtypes("jnlpool_ctl_struct",25,"name")="jnlpool_ctl_struct.prev_jnlseqno_time"
-	Set gtmtypes("jnlpool_ctl_struct",25,"off")=436
+	Set gtmtypes("jnlpool_ctl_struct",24,"type")="boolean_t"
+	Set gtmtypfldindx("jnlpool_ctl_struct","this_side.endianness_known")=24
+	Set gtmtypes("jnlpool_ctl_struct",25,"name")="jnlpool_ctl_struct.this_side.null_subs_xform"
+	Set gtmtypes("jnlpool_ctl_struct",25,"off")=536
 	Set gtmtypes("jnlpool_ctl_struct",25,"len")=4
-	Set gtmtypes("jnlpool_ctl_struct",25,"type")="unsigned-int"
-	Set gtmtypfldindx("jnlpool_ctl_struct","prev_jnlseqno_time")=25
-	Set gtmtypes("jnlpool_ctl_struct",26,"name")="jnlpool_ctl_struct.pool_initialized"
-	Set gtmtypes("jnlpool_ctl_struct",26,"off")=440
+	Set gtmtypes("jnlpool_ctl_struct",25,"type")="boolean_t"
+	Set gtmtypfldindx("jnlpool_ctl_struct","this_side.null_subs_xform")=25
+	Set gtmtypes("jnlpool_ctl_struct",26,"name")="jnlpool_ctl_struct.this_side.is_supplementary"
+	Set gtmtypes("jnlpool_ctl_struct",26,"off")=540
 	Set gtmtypes("jnlpool_ctl_struct",26,"len")=4
 	Set gtmtypes("jnlpool_ctl_struct",26,"type")="boolean_t"
-	Set gtmtypfldindx("jnlpool_ctl_struct","pool_initialized")=26
-	Set gtmtypes("jnlpool_ctl_struct",27,"name")="jnlpool_ctl_struct.jnlpool_creator_pid"
-	Set gtmtypes("jnlpool_ctl_struct",27,"off")=444
+	Set gtmtypfldindx("jnlpool_ctl_struct","this_side.is_supplementary")=26
+	Set gtmtypes("jnlpool_ctl_struct",27,"name")="jnlpool_ctl_struct.this_side.tls_requested"
+	Set gtmtypes("jnlpool_ctl_struct",27,"off")=544
 	Set gtmtypes("jnlpool_ctl_struct",27,"len")=4
-	Set gtmtypes("jnlpool_ctl_struct",27,"type")="unsigned-int"
-	Set gtmtypfldindx("jnlpool_ctl_struct","jnlpool_creator_pid")=27
-	Set gtmtypes("jnlpool_ctl_struct",28,"name")="jnlpool_ctl_struct.this_side"
-	Set gtmtypes("jnlpool_ctl_struct",28,"off")=448
-	Set gtmtypes("jnlpool_ctl_struct",28,"len")=48
-	Set gtmtypes("jnlpool_ctl_struct",28,"type")="repl_conn_info_t"
-	Set gtmtypfldindx("jnlpool_ctl_struct","this_side")=28
-	Set gtmtypes("jnlpool_ctl_struct",29,"name")="jnlpool_ctl_struct.this_side.proto_ver"
-	Set gtmtypes("jnlpool_ctl_struct",29,"off")=448
-	Set gtmtypes("jnlpool_ctl_struct",29,"len")=4
-	Set gtmtypes("jnlpool_ctl_struct",29,"type")="int"
-	Set gtmtypfldindx("jnlpool_ctl_struct","this_side.proto_ver")=29
-	Set gtmtypes("jnlpool_ctl_struct",30,"name")="jnlpool_ctl_struct.this_side.jnl_ver"
-	Set gtmtypes("jnlpool_ctl_struct",30,"off")=452
-	Set gtmtypes("jnlpool_ctl_struct",30,"len")=4
-	Set gtmtypes("jnlpool_ctl_struct",30,"type")="unsigned-int"
-	Set gtmtypfldindx("jnlpool_ctl_struct","this_side.jnl_ver")=30
-	Set gtmtypes("jnlpool_ctl_struct",31,"name")="jnlpool_ctl_struct.this_side.is_std_null_coll"
-	Set gtmtypes("jnlpool_ctl_struct",31,"off")=456
+	Set gtmtypes("jnlpool_ctl_struct",27,"type")="boolean_t"
+	Set gtmtypfldindx("jnlpool_ctl_struct","this_side.tls_requested")=27
+	Set gtmtypes("jnlpool_ctl_struct",28,"name")="jnlpool_ctl_struct.this_side.filler_16"
+	Set gtmtypes("jnlpool_ctl_struct",28,"off")=548
+	Set gtmtypes("jnlpool_ctl_struct",28,"len")=12
+	Set gtmtypes("jnlpool_ctl_struct",28,"type")="char"
+	Set gtmtypfldindx("jnlpool_ctl_struct","this_side.filler_16")=28
+	Set gtmtypes("jnlpool_ctl_struct",29,"name")="jnlpool_ctl_struct.write_addr"
+	Set gtmtypes("jnlpool_ctl_struct",29,"off")=560
+	Set gtmtypes("jnlpool_ctl_struct",29,"len")=8
+	Set gtmtypes("jnlpool_ctl_struct",29,"type")="uint64_t"
+	Set gtmtypfldindx("jnlpool_ctl_struct","write_addr")=29
+	Set gtmtypes("jnlpool_ctl_struct",30,"name")="jnlpool_ctl_struct.rsrv_write_addr"
+	Set gtmtypes("jnlpool_ctl_struct",30,"off")=568
+	Set gtmtypes("jnlpool_ctl_struct",30,"len")=8
+	Set gtmtypes("jnlpool_ctl_struct",30,"type")="uint64_t"
+	Set gtmtypfldindx("jnlpool_ctl_struct","rsrv_write_addr")=30
+	Set gtmtypes("jnlpool_ctl_struct",31,"name")="jnlpool_ctl_struct.upd_disabled"
+	Set gtmtypes("jnlpool_ctl_struct",31,"off")=576
 	Set gtmtypes("jnlpool_ctl_struct",31,"len")=4
 	Set gtmtypes("jnlpool_ctl_struct",31,"type")="boolean_t"
-	Set gtmtypfldindx("jnlpool_ctl_struct","this_side.is_std_null_coll")=31
-	Set gtmtypes("jnlpool_ctl_struct",32,"name")="jnlpool_ctl_struct.this_side.trigger_supported"
-	Set gtmtypes("jnlpool_ctl_struct",32,"off")=460
+	Set gtmtypfldindx("jnlpool_ctl_struct","upd_disabled")=31
+	Set gtmtypes("jnlpool_ctl_struct",32,"name")="jnlpool_ctl_struct.lastwrite_len"
+	Set gtmtypes("jnlpool_ctl_struct",32,"off")=580
 	Set gtmtypes("jnlpool_ctl_struct",32,"len")=4
-	Set gtmtypes("jnlpool_ctl_struct",32,"type")="boolean_t"
-	Set gtmtypfldindx("jnlpool_ctl_struct","this_side.trigger_supported")=32
-	Set gtmtypes("jnlpool_ctl_struct",33,"name")="jnlpool_ctl_struct.this_side.cross_endian"
-	Set gtmtypes("jnlpool_ctl_struct",33,"off")=464
+	Set gtmtypes("jnlpool_ctl_struct",32,"type")="unsigned-int"
+	Set gtmtypfldindx("jnlpool_ctl_struct","lastwrite_len")=32
+	Set gtmtypes("jnlpool_ctl_struct",33,"name")="jnlpool_ctl_struct.send_losttn_complete"
+	Set gtmtypes("jnlpool_ctl_struct",33,"off")=584
 	Set gtmtypes("jnlpool_ctl_struct",33,"len")=4
 	Set gtmtypes("jnlpool_ctl_struct",33,"type")="boolean_t"
-	Set gtmtypfldindx("jnlpool_ctl_struct","this_side.cross_endian")=33
-	Set gtmtypes("jnlpool_ctl_struct",34,"name")="jnlpool_ctl_struct.this_side.endianness_known"
-	Set gtmtypes("jnlpool_ctl_struct",34,"off")=468
-	Set gtmtypes("jnlpool_ctl_struct",34,"len")=4
-	Set gtmtypes("jnlpool_ctl_struct",34,"type")="boolean_t"
-	Set gtmtypfldindx("jnlpool_ctl_struct","this_side.endianness_known")=34
-	Set gtmtypes("jnlpool_ctl_struct",35,"name")="jnlpool_ctl_struct.this_side.null_subs_xform"
-	Set gtmtypes("jnlpool_ctl_struct",35,"off")=472
+	Set gtmtypfldindx("jnlpool_ctl_struct","send_losttn_complete")=33
+	Set gtmtypes("jnlpool_ctl_struct",34,"name")="jnlpool_ctl_struct.primary_instname"
+	Set gtmtypes("jnlpool_ctl_struct",34,"off")=588
+	Set gtmtypes("jnlpool_ctl_struct",34,"len")=16
+	Set gtmtypes("jnlpool_ctl_struct",34,"type")="unsigned-char"
+	Set gtmtypfldindx("jnlpool_ctl_struct","primary_instname")=34
+	Set gtmtypes("jnlpool_ctl_struct",35,"name")="jnlpool_ctl_struct.gtmrecv_pid"
+	Set gtmtypes("jnlpool_ctl_struct",35,"off")=604
 	Set gtmtypes("jnlpool_ctl_struct",35,"len")=4
-	Set gtmtypes("jnlpool_ctl_struct",35,"type")="boolean_t"
-	Set gtmtypfldindx("jnlpool_ctl_struct","this_side.null_subs_xform")=35
-	Set gtmtypes("jnlpool_ctl_struct",36,"name")="jnlpool_ctl_struct.this_side.is_supplementary"
-	Set gtmtypes("jnlpool_ctl_struct",36,"off")=476
+	Set gtmtypes("jnlpool_ctl_struct",35,"type")="unsigned-int"
+	Set gtmtypfldindx("jnlpool_ctl_struct","gtmrecv_pid")=35
+	Set gtmtypes("jnlpool_ctl_struct",36,"name")="jnlpool_ctl_struct.prev_jnlseqno_time"
+	Set gtmtypes("jnlpool_ctl_struct",36,"off")=608
 	Set gtmtypes("jnlpool_ctl_struct",36,"len")=4
-	Set gtmtypes("jnlpool_ctl_struct",36,"type")="boolean_t"
-	Set gtmtypfldindx("jnlpool_ctl_struct","this_side.is_supplementary")=36
-	Set gtmtypes("jnlpool_ctl_struct",37,"name")="jnlpool_ctl_struct.this_side.tls_requested"
-	Set gtmtypes("jnlpool_ctl_struct",37,"off")=480
+	Set gtmtypes("jnlpool_ctl_struct",36,"type")="unsigned-int"
+	Set gtmtypfldindx("jnlpool_ctl_struct","prev_jnlseqno_time")=36
+	Set gtmtypes("jnlpool_ctl_struct",37,"name")="jnlpool_ctl_struct.pool_initialized"
+	Set gtmtypes("jnlpool_ctl_struct",37,"off")=612
 	Set gtmtypes("jnlpool_ctl_struct",37,"len")=4
 	Set gtmtypes("jnlpool_ctl_struct",37,"type")="boolean_t"
-	Set gtmtypfldindx("jnlpool_ctl_struct","this_side.tls_requested")=37
-	Set gtmtypes("jnlpool_ctl_struct",38,"name")="jnlpool_ctl_struct.this_side.filler_16"
-	Set gtmtypes("jnlpool_ctl_struct",38,"off")=484
-	Set gtmtypes("jnlpool_ctl_struct",38,"len")=12
-	Set gtmtypes("jnlpool_ctl_struct",38,"type")="char"
-	Set gtmtypfldindx("jnlpool_ctl_struct","this_side.filler_16")=38
-	Set gtmtypes("jnlpool_ctl_struct",39,"name")="jnlpool_ctl_struct.strm_seqno"
-	Set gtmtypes("jnlpool_ctl_struct",39,"off")=496
-	Set gtmtypes("jnlpool_ctl_struct",39,"len")=128
-	Set gtmtypes("jnlpool_ctl_struct",39,"type")="uint64_t"
-	Set gtmtypfldindx("jnlpool_ctl_struct","strm_seqno")=39
-	Set gtmtypes("jnlpool_ctl_struct",39,"dim")=16
-	Set gtmtypes("jnlpool_ctl_struct",40,"name")="jnlpool_ctl_struct.onln_rlbk_pid"
+	Set gtmtypfldindx("jnlpool_ctl_struct","pool_initialized")=37
+	Set gtmtypes("jnlpool_ctl_struct",38,"name")="jnlpool_ctl_struct.jnlpool_creator_pid"
+	Set gtmtypes("jnlpool_ctl_struct",38,"off")=616
+	Set gtmtypes("jnlpool_ctl_struct",38,"len")=4
+	Set gtmtypes("jnlpool_ctl_struct",38,"type")="unsigned-int"
+	Set gtmtypfldindx("jnlpool_ctl_struct","jnlpool_creator_pid")=38
+	Set gtmtypes("jnlpool_ctl_struct",39,"name")="jnlpool_ctl_struct.onln_rlbk_pid"
+	Set gtmtypes("jnlpool_ctl_struct",39,"off")=620
+	Set gtmtypes("jnlpool_ctl_struct",39,"len")=4
+	Set gtmtypes("jnlpool_ctl_struct",39,"type")="unsigned-int"
+	Set gtmtypfldindx("jnlpool_ctl_struct","onln_rlbk_pid")=39
+	Set gtmtypes("jnlpool_ctl_struct",40,"name")="jnlpool_ctl_struct.onln_rlbk_cycle"
 	Set gtmtypes("jnlpool_ctl_struct",40,"off")=624
 	Set gtmtypes("jnlpool_ctl_struct",40,"len")=4
 	Set gtmtypes("jnlpool_ctl_struct",40,"type")="unsigned-int"
-	Set gtmtypfldindx("jnlpool_ctl_struct","onln_rlbk_pid")=40
-	Set gtmtypes("jnlpool_ctl_struct",41,"name")="jnlpool_ctl_struct.onln_rlbk_cycle"
+	Set gtmtypfldindx("jnlpool_ctl_struct","onln_rlbk_cycle")=40
+	Set gtmtypes("jnlpool_ctl_struct",41,"name")="jnlpool_ctl_struct.freeze"
 	Set gtmtypes("jnlpool_ctl_struct",41,"off")=628
 	Set gtmtypes("jnlpool_ctl_struct",41,"len")=4
-	Set gtmtypes("jnlpool_ctl_struct",41,"type")="unsigned-int"
-	Set gtmtypfldindx("jnlpool_ctl_struct","onln_rlbk_cycle")=41
-	Set gtmtypes("jnlpool_ctl_struct",42,"name")="jnlpool_ctl_struct.freeze"
+	Set gtmtypes("jnlpool_ctl_struct",41,"type")="boolean_t"
+	Set gtmtypfldindx("jnlpool_ctl_struct","freeze")=41
+	Set gtmtypes("jnlpool_ctl_struct",42,"name")="jnlpool_ctl_struct.freeze_comment"
 	Set gtmtypes("jnlpool_ctl_struct",42,"off")=632
-	Set gtmtypes("jnlpool_ctl_struct",42,"len")=4
-	Set gtmtypes("jnlpool_ctl_struct",42,"type")="boolean_t"
-	Set gtmtypfldindx("jnlpool_ctl_struct","freeze")=42
-	Set gtmtypes("jnlpool_ctl_struct",43,"name")="jnlpool_ctl_struct.freeze_comment"
-	Set gtmtypes("jnlpool_ctl_struct",43,"off")=636
-	Set gtmtypes("jnlpool_ctl_struct",43,"len")=1024
-	Set gtmtypes("jnlpool_ctl_struct",43,"type")="char"
-	Set gtmtypfldindx("jnlpool_ctl_struct","freeze_comment")=43
-	Set gtmtypes("jnlpool_ctl_struct",44,"name")="jnlpool_ctl_struct.instfreeze_environ_inited"
+	Set gtmtypes("jnlpool_ctl_struct",42,"len")=1024
+	Set gtmtypes("jnlpool_ctl_struct",42,"type")="char"
+	Set gtmtypfldindx("jnlpool_ctl_struct","freeze_comment")=42
+	Set gtmtypes("jnlpool_ctl_struct",43,"name")="jnlpool_ctl_struct.instfreeze_environ_inited"
+	Set gtmtypes("jnlpool_ctl_struct",43,"off")=1656
+	Set gtmtypes("jnlpool_ctl_struct",43,"len")=4
+	Set gtmtypes("jnlpool_ctl_struct",43,"type")="boolean_t"
+	Set gtmtypfldindx("jnlpool_ctl_struct","instfreeze_environ_inited")=43
+	Set gtmtypes("jnlpool_ctl_struct",44,"name")="jnlpool_ctl_struct.merrors_array"
 	Set gtmtypes("jnlpool_ctl_struct",44,"off")=1660
-	Set gtmtypes("jnlpool_ctl_struct",44,"len")=4
-	Set gtmtypes("jnlpool_ctl_struct",44,"type")="boolean_t"
-	Set gtmtypfldindx("jnlpool_ctl_struct","instfreeze_environ_inited")=44
-	Set gtmtypes("jnlpool_ctl_struct",45,"name")="jnlpool_ctl_struct.merrors_array"
-	Set gtmtypes("jnlpool_ctl_struct",45,"off")=1664
-	Set gtmtypes("jnlpool_ctl_struct",45,"len")=2048
-	Set gtmtypes("jnlpool_ctl_struct",45,"type")="unsigned-char"
-	Set gtmtypfldindx("jnlpool_ctl_struct","merrors_array")=45
-	Set gtmtypes("jnlpool_ctl_struct",46,"name")="jnlpool_ctl_struct.outofsync_core_generated"
+	Set gtmtypes("jnlpool_ctl_struct",44,"len")=2048
+	Set gtmtypes("jnlpool_ctl_struct",44,"type")="unsigned-char"
+	Set gtmtypfldindx("jnlpool_ctl_struct","merrors_array")=44
+	Set gtmtypes("jnlpool_ctl_struct",45,"name")="jnlpool_ctl_struct.ftok_counter_halted"
+	Set gtmtypes("jnlpool_ctl_struct",45,"off")=3708
+	Set gtmtypes("jnlpool_ctl_struct",45,"len")=4
+	Set gtmtypes("jnlpool_ctl_struct",45,"type")="boolean_t"
+	Set gtmtypfldindx("jnlpool_ctl_struct","ftok_counter_halted")=45
+	Set gtmtypes("jnlpool_ctl_struct",46,"name")="jnlpool_ctl_struct.phase2_commit_index1"
 	Set gtmtypes("jnlpool_ctl_struct",46,"off")=3712
 	Set gtmtypes("jnlpool_ctl_struct",46,"len")=4
-	Set gtmtypes("jnlpool_ctl_struct",46,"type")="boolean_t"
-	Set gtmtypfldindx("jnlpool_ctl_struct","outofsync_core_generated")=46
-	Set gtmtypes("jnlpool_ctl_struct",47,"name")="jnlpool_ctl_struct.ftok_counter_halted"
+	Set gtmtypes("jnlpool_ctl_struct",46,"type")="unsigned-int"
+	Set gtmtypfldindx("jnlpool_ctl_struct","phase2_commit_index1")=46
+	Set gtmtypes("jnlpool_ctl_struct",47,"name")="jnlpool_ctl_struct.phase2_commit_index2"
 	Set gtmtypes("jnlpool_ctl_struct",47,"off")=3716
 	Set gtmtypes("jnlpool_ctl_struct",47,"len")=4
-	Set gtmtypes("jnlpool_ctl_struct",47,"type")="boolean_t"
-	Set gtmtypfldindx("jnlpool_ctl_struct","ftok_counter_halted")=47
-	Set gtmtypes("jnlpool_ctl_struct",48,"name")="jnlpool_ctl_struct.filler_16bytealign"
+	Set gtmtypes("jnlpool_ctl_struct",47,"type")="unsigned-int"
+	Set gtmtypfldindx("jnlpool_ctl_struct","phase2_commit_index2")=47
+	Set gtmtypes("jnlpool_ctl_struct",48,"name")="jnlpool_ctl_struct.filler_16bytealign1"
 	Set gtmtypes("jnlpool_ctl_struct",48,"off")=3720
 	Set gtmtypes("jnlpool_ctl_struct",48,"len")=8
 	Set gtmtypes("jnlpool_ctl_struct",48,"type")="char"
-	Set gtmtypfldindx("jnlpool_ctl_struct","filler_16bytealign")=48
-	;
-	Set gtmtypes("jnlpool_write_ctx_t")="struct"
-	Set gtmtypes("jnlpool_write_ctx_t",0)=2
-	Set gtmtypes("jnlpool_write_ctx_t","len")=8
-	Set gtmtypes("jnlpool_write_ctx_t",1,"name")="jnlpool_write_ctx_t.write"
-	Set gtmtypes("jnlpool_write_ctx_t",1,"off")=0
-	Set gtmtypes("jnlpool_write_ctx_t",1,"len")=4
-	Set gtmtypes("jnlpool_write_ctx_t",1,"type")="unsigned-int"
-	Set gtmtypfldindx("jnlpool_write_ctx_t","write")=1
-	Set gtmtypes("jnlpool_write_ctx_t",2,"name")="jnlpool_write_ctx_t.write_total"
-	Set gtmtypes("jnlpool_write_ctx_t",2,"off")=4
-	Set gtmtypes("jnlpool_write_ctx_t",2,"len")=4
-	Set gtmtypes("jnlpool_write_ctx_t",2,"type")="unsigned-int"
-	Set gtmtypfldindx("jnlpool_write_ctx_t","write_total")=2
+	Set gtmtypfldindx("jnlpool_ctl_struct","filler_16bytealign1")=48
+	Set gtmtypes("jnlpool_ctl_struct",49,"name")="jnlpool_ctl_struct.jnl_pool_write_sleep"
+	Set gtmtypes("jnlpool_ctl_struct",49,"off")=3728
+	Set gtmtypes("jnlpool_ctl_struct",49,"len")=16
+	Set gtmtypes("jnlpool_ctl_struct",49,"type")="jpl_trc_rec_t"
+	Set gtmtypfldindx("jnlpool_ctl_struct","jnl_pool_write_sleep")=49
+	Set gtmtypes("jnlpool_ctl_struct",50,"name")="jnlpool_ctl_struct.jnl_pool_write_sleep.cntr"
+	Set gtmtypes("jnlpool_ctl_struct",50,"off")=3728
+	Set gtmtypes("jnlpool_ctl_struct",50,"len")=8
+	Set gtmtypes("jnlpool_ctl_struct",50,"type")="uint64_t"
+	Set gtmtypfldindx("jnlpool_ctl_struct","jnl_pool_write_sleep.cntr")=50
+	Set gtmtypes("jnlpool_ctl_struct",51,"name")="jnlpool_ctl_struct.jnl_pool_write_sleep.seqno"
+	Set gtmtypes("jnlpool_ctl_struct",51,"off")=3736
+	Set gtmtypes("jnlpool_ctl_struct",51,"len")=8
+	Set gtmtypes("jnlpool_ctl_struct",51,"type")="uint64_t"
+	Set gtmtypfldindx("jnlpool_ctl_struct","jnl_pool_write_sleep.seqno")=51
+	Set gtmtypes("jnlpool_ctl_struct",52,"name")="jnlpool_ctl_struct.repl_phs2cmt_arrayfull_sleep"
+	Set gtmtypes("jnlpool_ctl_struct",52,"off")=3744
+	Set gtmtypes("jnlpool_ctl_struct",52,"len")=16
+	Set gtmtypes("jnlpool_ctl_struct",52,"type")="jpl_trc_rec_t"
+	Set gtmtypfldindx("jnlpool_ctl_struct","repl_phs2cmt_arrayfull_sleep")=52
+	Set gtmtypes("jnlpool_ctl_struct",53,"name")="jnlpool_ctl_struct.repl_phs2cmt_arrayfull_sleep.cntr"
+	Set gtmtypes("jnlpool_ctl_struct",53,"off")=3744
+	Set gtmtypes("jnlpool_ctl_struct",53,"len")=8
+	Set gtmtypes("jnlpool_ctl_struct",53,"type")="uint64_t"
+	Set gtmtypfldindx("jnlpool_ctl_struct","repl_phs2cmt_arrayfull_sleep.cntr")=53
+	Set gtmtypes("jnlpool_ctl_struct",54,"name")="jnlpool_ctl_struct.repl_phs2cmt_arrayfull_sleep.seqno"
+	Set gtmtypes("jnlpool_ctl_struct",54,"off")=3752
+	Set gtmtypes("jnlpool_ctl_struct",54,"len")=8
+	Set gtmtypes("jnlpool_ctl_struct",54,"type")="uint64_t"
+	Set gtmtypfldindx("jnlpool_ctl_struct","repl_phs2cmt_arrayfull_sleep.seqno")=54
+	Set gtmtypes("jnlpool_ctl_struct",55,"name")="jnlpool_ctl_struct.repl_phase2_cleanup_isprcalv"
+	Set gtmtypes("jnlpool_ctl_struct",55,"off")=3760
+	Set gtmtypes("jnlpool_ctl_struct",55,"len")=16
+	Set gtmtypes("jnlpool_ctl_struct",55,"type")="jpl_trc_rec_t"
+	Set gtmtypfldindx("jnlpool_ctl_struct","repl_phase2_cleanup_isprcalv")=55
+	Set gtmtypes("jnlpool_ctl_struct",56,"name")="jnlpool_ctl_struct.repl_phase2_cleanup_isprcalv.cntr"
+	Set gtmtypes("jnlpool_ctl_struct",56,"off")=3760
+	Set gtmtypes("jnlpool_ctl_struct",56,"len")=8
+	Set gtmtypes("jnlpool_ctl_struct",56,"type")="uint64_t"
+	Set gtmtypfldindx("jnlpool_ctl_struct","repl_phase2_cleanup_isprcalv.cntr")=56
+	Set gtmtypes("jnlpool_ctl_struct",57,"name")="jnlpool_ctl_struct.repl_phase2_cleanup_isprcalv.seqno"
+	Set gtmtypes("jnlpool_ctl_struct",57,"off")=3768
+	Set gtmtypes("jnlpool_ctl_struct",57,"len")=8
+	Set gtmtypes("jnlpool_ctl_struct",57,"type")="uint64_t"
+	Set gtmtypfldindx("jnlpool_ctl_struct","repl_phase2_cleanup_isprcalv.seqno")=57
+	Set gtmtypes("jnlpool_ctl_struct",58,"name")="jnlpool_ctl_struct.phase2_commit_array"
+	Set gtmtypes("jnlpool_ctl_struct",58,"off")=3776
+	Set gtmtypes("jnlpool_ctl_struct",58,"len")=655360
+	Set gtmtypes("jnlpool_ctl_struct",58,"type")="jpl_phase2_in_prog_t"
+	Set gtmtypfldindx("jnlpool_ctl_struct","phase2_commit_array")=58
+	Set gtmtypes("jnlpool_ctl_struct",58,"dim")=16384
+	Set gtmtypes("jnlpool_ctl_struct",59,"name")="jnlpool_ctl_struct.phase2_commit_array[0].jnl_seqno"
+	Set gtmtypes("jnlpool_ctl_struct",59,"off")=3776
+	Set gtmtypes("jnlpool_ctl_struct",59,"len")=8
+	Set gtmtypes("jnlpool_ctl_struct",59,"type")="uint64_t"
+	Set gtmtypfldindx("jnlpool_ctl_struct","phase2_commit_array[0].jnl_seqno")=59
+	Set gtmtypes("jnlpool_ctl_struct",60,"name")="jnlpool_ctl_struct.phase2_commit_array[0].strm_seqno"
+	Set gtmtypes("jnlpool_ctl_struct",60,"off")=3784
+	Set gtmtypes("jnlpool_ctl_struct",60,"len")=8
+	Set gtmtypes("jnlpool_ctl_struct",60,"type")="uint64_t"
+	Set gtmtypfldindx("jnlpool_ctl_struct","phase2_commit_array[0].strm_seqno")=60
+	Set gtmtypes("jnlpool_ctl_struct",61,"name")="jnlpool_ctl_struct.phase2_commit_array[0].start_write_addr"
+	Set gtmtypes("jnlpool_ctl_struct",61,"off")=3792
+	Set gtmtypes("jnlpool_ctl_struct",61,"len")=8
+	Set gtmtypes("jnlpool_ctl_struct",61,"type")="uint64_t"
+	Set gtmtypfldindx("jnlpool_ctl_struct","phase2_commit_array[0].start_write_addr")=61
+	Set gtmtypes("jnlpool_ctl_struct",62,"name")="jnlpool_ctl_struct.phase2_commit_array[0].process_id"
+	Set gtmtypes("jnlpool_ctl_struct",62,"off")=3800
+	Set gtmtypes("jnlpool_ctl_struct",62,"len")=4
+	Set gtmtypes("jnlpool_ctl_struct",62,"type")="unsigned-int"
+	Set gtmtypfldindx("jnlpool_ctl_struct","phase2_commit_array[0].process_id")=62
+	Set gtmtypes("jnlpool_ctl_struct",63,"name")="jnlpool_ctl_struct.phase2_commit_array[0].tot_jrec_len"
+	Set gtmtypes("jnlpool_ctl_struct",63,"off")=3804
+	Set gtmtypes("jnlpool_ctl_struct",63,"len")=4
+	Set gtmtypes("jnlpool_ctl_struct",63,"type")="unsigned-int"
+	Set gtmtypfldindx("jnlpool_ctl_struct","phase2_commit_array[0].tot_jrec_len")=63
+	Set gtmtypes("jnlpool_ctl_struct",64,"name")="jnlpool_ctl_struct.phase2_commit_array[0].prev_jrec_len"
+	Set gtmtypes("jnlpool_ctl_struct",64,"off")=3808
+	Set gtmtypes("jnlpool_ctl_struct",64,"len")=4
+	Set gtmtypes("jnlpool_ctl_struct",64,"type")="unsigned-int"
+	Set gtmtypfldindx("jnlpool_ctl_struct","phase2_commit_array[0].prev_jrec_len")=64
+	Set gtmtypes("jnlpool_ctl_struct",65,"name")="jnlpool_ctl_struct.phase2_commit_array[0].write_complete"
+	Set gtmtypes("jnlpool_ctl_struct",65,"off")=3812
+	Set gtmtypes("jnlpool_ctl_struct",65,"len")=4
+	Set gtmtypes("jnlpool_ctl_struct",65,"type")="boolean_t"
+	Set gtmtypfldindx("jnlpool_ctl_struct","phase2_commit_array[0].write_complete")=65
+	Set gtmtypes("jnlpool_ctl_struct",66,"name")="jnlpool_ctl_struct.fill_cacheline0"
+	Set gtmtypes("jnlpool_ctl_struct",66,"off")=659136
+	Set gtmtypes("jnlpool_ctl_struct",66,"len")=56
+	Set gtmtypes("jnlpool_ctl_struct",66,"type")="char"
+	Set gtmtypfldindx("jnlpool_ctl_struct","fill_cacheline0")=66
+	Set gtmtypes("jnlpool_ctl_struct",67,"name")="jnlpool_ctl_struct.phase2_commit_latch"
+	Set gtmtypes("jnlpool_ctl_struct",67,"off")=659192
+	Set gtmtypes("jnlpool_ctl_struct",67,"len")=8
+	Set gtmtypes("jnlpool_ctl_struct",67,"type")="global_latch_t"
+	Set gtmtypfldindx("jnlpool_ctl_struct","phase2_commit_latch")=67
+	Set gtmtypes("jnlpool_ctl_struct",68,"name")="jnlpool_ctl_struct.phase2_commit_latch.u"
+	Set gtmtypes("jnlpool_ctl_struct",68,"off")=659192
+	Set gtmtypes("jnlpool_ctl_struct",68,"len")=8
+	Set gtmtypes("jnlpool_ctl_struct",68,"type")="union"
+	Set gtmtypfldindx("jnlpool_ctl_struct","phase2_commit_latch.u")=68
+	Set gtmtypes("jnlpool_ctl_struct",69,"name")="jnlpool_ctl_struct.phase2_commit_latch.u.pid_imgcnt"
+	Set gtmtypes("jnlpool_ctl_struct",69,"off")=659192
+	Set gtmtypes("jnlpool_ctl_struct",69,"len")=8
+	Set gtmtypes("jnlpool_ctl_struct",69,"type")="uint64_t"
+	Set gtmtypfldindx("jnlpool_ctl_struct","phase2_commit_latch.u.pid_imgcnt")=69
+	Set gtmtypes("jnlpool_ctl_struct",70,"name")="jnlpool_ctl_struct.phase2_commit_latch.u.parts"
+	Set gtmtypes("jnlpool_ctl_struct",70,"off")=659192
+	Set gtmtypes("jnlpool_ctl_struct",70,"len")=8
+	Set gtmtypes("jnlpool_ctl_struct",70,"type")="struct"
+	Set gtmtypfldindx("jnlpool_ctl_struct","phase2_commit_latch.u.parts")=70
+	Set gtmtypes("jnlpool_ctl_struct",71,"name")="jnlpool_ctl_struct.phase2_commit_latch.u.parts.latch_pid"
+	Set gtmtypes("jnlpool_ctl_struct",71,"off")=659192
+	Set gtmtypes("jnlpool_ctl_struct",71,"len")=4
+	Set gtmtypes("jnlpool_ctl_struct",71,"type")="int"
+	Set gtmtypfldindx("jnlpool_ctl_struct","phase2_commit_latch.u.parts.latch_pid")=71
+	Set gtmtypes("jnlpool_ctl_struct",72,"name")="jnlpool_ctl_struct.phase2_commit_latch.u.parts.latch_word"
+	Set gtmtypes("jnlpool_ctl_struct",72,"off")=659196
+	Set gtmtypes("jnlpool_ctl_struct",72,"len")=4
+	Set gtmtypes("jnlpool_ctl_struct",72,"type")="int"
+	Set gtmtypfldindx("jnlpool_ctl_struct","phase2_commit_latch.u.parts.latch_word")=72
 	;
 	Set gtmtypes("job_arg_msg")="struct"
 	Set gtmtypes("job_arg_msg",0)=2
@@ -12357,6 +12724,103 @@ Init
 	Set gtmtypes("joberr_msg",2,"type")="int"
 	Set gtmtypfldindx("joberr_msg","len")=2
 	;
+	Set gtmtypes("jpl_phase2_in_prog_t")="struct"
+	Set gtmtypes("jpl_phase2_in_prog_t",0)=7
+	Set gtmtypes("jpl_phase2_in_prog_t","len")=40
+	Set gtmtypes("jpl_phase2_in_prog_t",1,"name")="jpl_phase2_in_prog_t.jnl_seqno"
+	Set gtmtypes("jpl_phase2_in_prog_t",1,"off")=0
+	Set gtmtypes("jpl_phase2_in_prog_t",1,"len")=8
+	Set gtmtypes("jpl_phase2_in_prog_t",1,"type")="uint64_t"
+	Set gtmtypfldindx("jpl_phase2_in_prog_t","jnl_seqno")=1
+	Set gtmtypes("jpl_phase2_in_prog_t",2,"name")="jpl_phase2_in_prog_t.strm_seqno"
+	Set gtmtypes("jpl_phase2_in_prog_t",2,"off")=8
+	Set gtmtypes("jpl_phase2_in_prog_t",2,"len")=8
+	Set gtmtypes("jpl_phase2_in_prog_t",2,"type")="uint64_t"
+	Set gtmtypfldindx("jpl_phase2_in_prog_t","strm_seqno")=2
+	Set gtmtypes("jpl_phase2_in_prog_t",3,"name")="jpl_phase2_in_prog_t.start_write_addr"
+	Set gtmtypes("jpl_phase2_in_prog_t",3,"off")=16
+	Set gtmtypes("jpl_phase2_in_prog_t",3,"len")=8
+	Set gtmtypes("jpl_phase2_in_prog_t",3,"type")="uint64_t"
+	Set gtmtypfldindx("jpl_phase2_in_prog_t","start_write_addr")=3
+	Set gtmtypes("jpl_phase2_in_prog_t",4,"name")="jpl_phase2_in_prog_t.process_id"
+	Set gtmtypes("jpl_phase2_in_prog_t",4,"off")=24
+	Set gtmtypes("jpl_phase2_in_prog_t",4,"len")=4
+	Set gtmtypes("jpl_phase2_in_prog_t",4,"type")="unsigned-int"
+	Set gtmtypfldindx("jpl_phase2_in_prog_t","process_id")=4
+	Set gtmtypes("jpl_phase2_in_prog_t",5,"name")="jpl_phase2_in_prog_t.tot_jrec_len"
+	Set gtmtypes("jpl_phase2_in_prog_t",5,"off")=28
+	Set gtmtypes("jpl_phase2_in_prog_t",5,"len")=4
+	Set gtmtypes("jpl_phase2_in_prog_t",5,"type")="unsigned-int"
+	Set gtmtypfldindx("jpl_phase2_in_prog_t","tot_jrec_len")=5
+	Set gtmtypes("jpl_phase2_in_prog_t",6,"name")="jpl_phase2_in_prog_t.prev_jrec_len"
+	Set gtmtypes("jpl_phase2_in_prog_t",6,"off")=32
+	Set gtmtypes("jpl_phase2_in_prog_t",6,"len")=4
+	Set gtmtypes("jpl_phase2_in_prog_t",6,"type")="unsigned-int"
+	Set gtmtypfldindx("jpl_phase2_in_prog_t","prev_jrec_len")=6
+	Set gtmtypes("jpl_phase2_in_prog_t",7,"name")="jpl_phase2_in_prog_t.write_complete"
+	Set gtmtypes("jpl_phase2_in_prog_t",7,"off")=36
+	Set gtmtypes("jpl_phase2_in_prog_t",7,"len")=4
+	Set gtmtypes("jpl_phase2_in_prog_t",7,"type")="boolean_t"
+	Set gtmtypfldindx("jpl_phase2_in_prog_t","write_complete")=7
+	;
+	Set gtmtypes("jpl_rsrv_struct_t")="struct"
+	Set gtmtypes("jpl_rsrv_struct_t",0)=8
+	Set gtmtypes("jpl_rsrv_struct_t","len")=40
+	Set gtmtypes("jpl_rsrv_struct_t",1,"name")="jpl_rsrv_struct_t.start_write_addr"
+	Set gtmtypes("jpl_rsrv_struct_t",1,"off")=0
+	Set gtmtypes("jpl_rsrv_struct_t",1,"len")=8
+	Set gtmtypes("jpl_rsrv_struct_t",1,"type")="uint64_t"
+	Set gtmtypfldindx("jpl_rsrv_struct_t","start_write_addr")=1
+	Set gtmtypes("jpl_rsrv_struct_t",2,"name")="jpl_rsrv_struct_t.cur_write_addr"
+	Set gtmtypes("jpl_rsrv_struct_t",2,"off")=8
+	Set gtmtypes("jpl_rsrv_struct_t",2,"len")=8
+	Set gtmtypes("jpl_rsrv_struct_t",2,"type")="uint64_t"
+	Set gtmtypfldindx("jpl_rsrv_struct_t","cur_write_addr")=2
+	Set gtmtypes("jpl_rsrv_struct_t",3,"name")="jpl_rsrv_struct_t.tot_jrec_len"
+	Set gtmtypes("jpl_rsrv_struct_t",3,"off")=16
+	Set gtmtypes("jpl_rsrv_struct_t",3,"len")=4
+	Set gtmtypes("jpl_rsrv_struct_t",3,"type")="unsigned-int"
+	Set gtmtypfldindx("jpl_rsrv_struct_t","tot_jrec_len")=3
+	Set gtmtypes("jpl_rsrv_struct_t",4,"name")="jpl_rsrv_struct_t.write_total"
+	Set gtmtypes("jpl_rsrv_struct_t",4,"off")=20
+	Set gtmtypes("jpl_rsrv_struct_t",4,"len")=4
+	Set gtmtypes("jpl_rsrv_struct_t",4,"type")="unsigned-int"
+	Set gtmtypfldindx("jpl_rsrv_struct_t","write_total")=4
+	Set gtmtypes("jpl_rsrv_struct_t",5,"name")="jpl_rsrv_struct_t.memcpy_skipped"
+	Set gtmtypes("jpl_rsrv_struct_t",5,"off")=24
+	Set gtmtypes("jpl_rsrv_struct_t",5,"len")=4
+	Set gtmtypes("jpl_rsrv_struct_t",5,"type")="boolean_t"
+	Set gtmtypfldindx("jpl_rsrv_struct_t","memcpy_skipped")=5
+	Set gtmtypes("jpl_rsrv_struct_t",6,"name")="jpl_rsrv_struct_t.phase2_commit_index"
+	Set gtmtypes("jpl_rsrv_struct_t",6,"off")=28
+	Set gtmtypes("jpl_rsrv_struct_t",6,"len")=4
+	Set gtmtypes("jpl_rsrv_struct_t",6,"type")="unsigned-int"
+	Set gtmtypfldindx("jpl_rsrv_struct_t","phase2_commit_index")=6
+	Set gtmtypes("jpl_rsrv_struct_t",7,"name")="jpl_rsrv_struct_t.num_tcoms"
+	Set gtmtypes("jpl_rsrv_struct_t",7,"off")=32
+	Set gtmtypes("jpl_rsrv_struct_t",7,"len")=4
+	Set gtmtypes("jpl_rsrv_struct_t",7,"type")="unsigned-int"
+	Set gtmtypfldindx("jpl_rsrv_struct_t","num_tcoms")=7
+	Set gtmtypes("jpl_rsrv_struct_t",8,"name")="jpl_rsrv_struct_t.filler_8byte_align"
+	Set gtmtypes("jpl_rsrv_struct_t",8,"off")=36
+	Set gtmtypes("jpl_rsrv_struct_t",8,"len")=4
+	Set gtmtypes("jpl_rsrv_struct_t",8,"type")="char"
+	Set gtmtypfldindx("jpl_rsrv_struct_t","filler_8byte_align")=8
+	;
+	Set gtmtypes("jpl_trc_rec_t")="struct"
+	Set gtmtypes("jpl_trc_rec_t",0)=2
+	Set gtmtypes("jpl_trc_rec_t","len")=16
+	Set gtmtypes("jpl_trc_rec_t",1,"name")="jpl_trc_rec_t.cntr"
+	Set gtmtypes("jpl_trc_rec_t",1,"off")=0
+	Set gtmtypes("jpl_trc_rec_t",1,"len")=8
+	Set gtmtypes("jpl_trc_rec_t",1,"type")="uint64_t"
+	Set gtmtypfldindx("jpl_trc_rec_t","cntr")=1
+	Set gtmtypes("jpl_trc_rec_t",2,"name")="jpl_trc_rec_t.seqno"
+	Set gtmtypes("jpl_trc_rec_t",2,"off")=8
+	Set gtmtypes("jpl_trc_rec_t",2,"len")=8
+	Set gtmtypes("jpl_trc_rec_t",2,"type")="uint64_t"
+	Set gtmtypfldindx("jpl_trc_rec_t","seqno")=2
+	;
 	Set gtmtypes("jrec_prefix")="struct"
 	Set gtmtypes("jrec_prefix",0)=4
 	Set gtmtypes("jrec_prefix","len")=24
@@ -12381,6 +12845,25 @@ Init
 	Set gtmtypes("jrec_prefix",4,"type")="uint64_t"
 	Set gtmtypfldindx("jrec_prefix","tn")=4
 	;
+	Set gtmtypes("jrec_rsrv_elem_t")="struct"
+	Set gtmtypes("jrec_rsrv_elem_t",0)=3
+	Set gtmtypes("jrec_rsrv_elem_t","len")=16
+	Set gtmtypes("jrec_rsrv_elem_t",1,"name")="jrec_rsrv_elem_t.rectype"
+	Set gtmtypes("jrec_rsrv_elem_t",1,"off")=0
+	Set gtmtypes("jrec_rsrv_elem_t",1,"len")=4
+	Set gtmtypes("jrec_rsrv_elem_t",1,"type")="int"
+	Set gtmtypfldindx("jrec_rsrv_elem_t","rectype")=1
+	Set gtmtypes("jrec_rsrv_elem_t",2,"name")="jrec_rsrv_elem_t.reclen"
+	Set gtmtypes("jrec_rsrv_elem_t",2,"off")=4
+	Set gtmtypes("jrec_rsrv_elem_t",2,"len")=4
+	Set gtmtypes("jrec_rsrv_elem_t",2,"type")="unsigned-int"
+	Set gtmtypfldindx("jrec_rsrv_elem_t","reclen")=2
+	Set gtmtypes("jrec_rsrv_elem_t",3,"name")="jrec_rsrv_elem_t.param1"
+	Set gtmtypes("jrec_rsrv_elem_t",3,"off")=8
+	Set gtmtypes("jrec_rsrv_elem_t",3,"len")=8
+	Set gtmtypes("jrec_rsrv_elem_t",3,"type")="addr"
+	Set gtmtypfldindx("jrec_rsrv_elem_t","param1")=3
+	;
 	Set gtmtypes("key_cum_value")="struct"
 	Set gtmtypes("key_cum_value",0)=11
 	Set gtmtypes("key_cum_value","len")=1088
@@ -13158,6 +13641,362 @@ Init
 	Set gtmtypes("lv_xnew_var",6,"type")="addr"
 	Set gtmtypfldindx("lv_xnew_var","lvval")=6
 	;
+	Set gtmtypes("lvmon_value_ent")="struct"
+	Set gtmtypes("lvmon_value_ent",0)=31
+	Set gtmtypes("lvmon_value_ent","len")=104
+	Set gtmtypes("lvmon_value_ent",1,"name")="lvmon_value_ent.varlvval"
+	Set gtmtypes("lvmon_value_ent",1,"off")=0
+	Set gtmtypes("lvmon_value_ent",1,"len")=80
+	Set gtmtypes("lvmon_value_ent",1,"type")="lv_val"
+	Set gtmtypfldindx("lvmon_value_ent","varlvval")=1
+	Set gtmtypes("lvmon_value_ent",2,"name")="lvmon_value_ent.varlvval.v"
+	Set gtmtypes("lvmon_value_ent",2,"off")=0
+	Set gtmtypes("lvmon_value_ent",2,"len")=32
+	Set gtmtypes("lvmon_value_ent",2,"type")="mval"
+	Set gtmtypfldindx("lvmon_value_ent","varlvval.v")=2
+	Set gtmtypes("lvmon_value_ent",3,"name")="lvmon_value_ent.varlvval.v.mvtype"
+	Set gtmtypes("lvmon_value_ent",3,"off")=0
+	Set gtmtypes("lvmon_value_ent",3,"len")=2
+	Set gtmtypes("lvmon_value_ent",3,"type")="unsigned-short"
+	Set gtmtypfldindx("lvmon_value_ent","varlvval.v.mvtype")=3
+	Set gtmtypes("lvmon_value_ent",4,"name")="lvmon_value_ent.varlvval.v.fnpc_indx"
+	Set gtmtypes("lvmon_value_ent",4,"off")=3
+	Set gtmtypes("lvmon_value_ent",4,"len")=1
+	Set gtmtypes("lvmon_value_ent",4,"type")="unsigned-char"
+	Set gtmtypfldindx("lvmon_value_ent","varlvval.v.fnpc_indx")=4
+	Set gtmtypes("lvmon_value_ent",5,"name")="lvmon_value_ent.varlvval.v.utfcgr_indx"
+	Set gtmtypes("lvmon_value_ent",5,"off")=4
+	Set gtmtypes("lvmon_value_ent",5,"len")=4
+	Set gtmtypes("lvmon_value_ent",5,"type")="unsigned-int"
+	Set gtmtypfldindx("lvmon_value_ent","varlvval.v.utfcgr_indx")=5
+	Set gtmtypes("lvmon_value_ent",6,"name")="lvmon_value_ent.varlvval.v.m"
+	Set gtmtypes("lvmon_value_ent",6,"off")=8
+	Set gtmtypes("lvmon_value_ent",6,"len")=8
+	Set gtmtypes("lvmon_value_ent",6,"type")="int"
+	Set gtmtypfldindx("lvmon_value_ent","varlvval.v.m")=6
+	Set gtmtypes("lvmon_value_ent",6,"dim")=2
+	Set gtmtypes("lvmon_value_ent",7,"name")="lvmon_value_ent.varlvval.v.str"
+	Set gtmtypes("lvmon_value_ent",7,"off")=16
+	Set gtmtypes("lvmon_value_ent",7,"len")=16
+	Set gtmtypes("lvmon_value_ent",7,"type")="mstr"
+	Set gtmtypfldindx("lvmon_value_ent","varlvval.v.str")=7
+	Set gtmtypes("lvmon_value_ent",8,"name")="lvmon_value_ent.varlvval.ptrs"
+	Set gtmtypes("lvmon_value_ent",8,"off")=32
+	Set gtmtypes("lvmon_value_ent",8,"len")=16
+	Set gtmtypes("lvmon_value_ent",8,"type")="union"
+	Set gtmtypfldindx("lvmon_value_ent","varlvval.ptrs")=8
+	Set gtmtypes("lvmon_value_ent",9,"name")="lvmon_value_ent.varlvval.ptrs.val_ent"
+	Set gtmtypes("lvmon_value_ent",9,"off")=32
+	Set gtmtypes("lvmon_value_ent",9,"len")=16
+	Set gtmtypes("lvmon_value_ent",9,"type")="struct"
+	Set gtmtypfldindx("lvmon_value_ent","varlvval.ptrs.val_ent")=9
+	Set gtmtypes("lvmon_value_ent",10,"name")="lvmon_value_ent.varlvval.ptrs.val_ent.children"
+	Set gtmtypes("lvmon_value_ent",10,"off")=32
+	Set gtmtypes("lvmon_value_ent",10,"len")=8
+	Set gtmtypes("lvmon_value_ent",10,"type")="addr"
+	Set gtmtypfldindx("lvmon_value_ent","varlvval.ptrs.val_ent.children")=10
+	Set gtmtypes("lvmon_value_ent",11,"name")="lvmon_value_ent.varlvval.ptrs.val_ent.parent"
+	Set gtmtypes("lvmon_value_ent",11,"off")=40
+	Set gtmtypes("lvmon_value_ent",11,"len")=8
+	Set gtmtypes("lvmon_value_ent",11,"type")="union"
+	Set gtmtypfldindx("lvmon_value_ent","varlvval.ptrs.val_ent.parent")=11
+	Set gtmtypes("lvmon_value_ent",12,"name")="lvmon_value_ent.varlvval.ptrs.val_ent.parent.sym"
+	Set gtmtypes("lvmon_value_ent",12,"off")=40
+	Set gtmtypes("lvmon_value_ent",12,"len")=8
+	Set gtmtypes("lvmon_value_ent",12,"type")="addr"
+	Set gtmtypfldindx("lvmon_value_ent","varlvval.ptrs.val_ent.parent.sym")=12
+	Set gtmtypes("lvmon_value_ent",13,"name")="lvmon_value_ent.varlvval.ptrs.val_ent.parent.sbs_tree"
+	Set gtmtypes("lvmon_value_ent",13,"off")=40
+	Set gtmtypes("lvmon_value_ent",13,"len")=8
+	Set gtmtypes("lvmon_value_ent",13,"type")="addr"
+	Set gtmtypfldindx("lvmon_value_ent","varlvval.ptrs.val_ent.parent.sbs_tree")=13
+	Set gtmtypes("lvmon_value_ent",14,"name")="lvmon_value_ent.varlvval.ptrs.free_ent"
+	Set gtmtypes("lvmon_value_ent",14,"off")=32
+	Set gtmtypes("lvmon_value_ent",14,"len")=8
+	Set gtmtypes("lvmon_value_ent",14,"type")="struct"
+	Set gtmtypfldindx("lvmon_value_ent","varlvval.ptrs.free_ent")=14
+	Set gtmtypes("lvmon_value_ent",15,"name")="lvmon_value_ent.varlvval.ptrs.free_ent.next_free"
+	Set gtmtypes("lvmon_value_ent",15,"off")=32
+	Set gtmtypes("lvmon_value_ent",15,"len")=8
+	Set gtmtypes("lvmon_value_ent",15,"type")="addr"
+	Set gtmtypfldindx("lvmon_value_ent","varlvval.ptrs.free_ent.next_free")=15
+	Set gtmtypes("lvmon_value_ent",16,"name")="lvmon_value_ent.varlvval.ptrs.copy_loc"
+	Set gtmtypes("lvmon_value_ent",16,"off")=32
+	Set gtmtypes("lvmon_value_ent",16,"len")=8
+	Set gtmtypes("lvmon_value_ent",16,"type")="struct"
+	Set gtmtypfldindx("lvmon_value_ent","varlvval.ptrs.copy_loc")=16
+	Set gtmtypes("lvmon_value_ent",17,"name")="lvmon_value_ent.varlvval.ptrs.copy_loc.newtablv"
+	Set gtmtypes("lvmon_value_ent",17,"off")=32
+	Set gtmtypes("lvmon_value_ent",17,"len")=8
+	Set gtmtypes("lvmon_value_ent",17,"type")="addr"
+	Set gtmtypfldindx("lvmon_value_ent","varlvval.ptrs.copy_loc.newtablv")=17
+	Set gtmtypes("lvmon_value_ent",18,"name")="lvmon_value_ent.varlvval.stats"
+	Set gtmtypes("lvmon_value_ent",18,"off")=48
+	Set gtmtypes("lvmon_value_ent",18,"len")=16
+	Set gtmtypes("lvmon_value_ent",18,"type")="struct"
+	Set gtmtypfldindx("lvmon_value_ent","varlvval.stats")=18
+	Set gtmtypes("lvmon_value_ent",19,"name")="lvmon_value_ent.varlvval.stats.trefcnt"
+	Set gtmtypes("lvmon_value_ent",19,"off")=48
+	Set gtmtypes("lvmon_value_ent",19,"len")=4
+	Set gtmtypes("lvmon_value_ent",19,"type")="int"
+	Set gtmtypfldindx("lvmon_value_ent","varlvval.stats.trefcnt")=19
+	Set gtmtypes("lvmon_value_ent",20,"name")="lvmon_value_ent.varlvval.stats.crefcnt"
+	Set gtmtypes("lvmon_value_ent",20,"off")=52
+	Set gtmtypes("lvmon_value_ent",20,"len")=4
+	Set gtmtypes("lvmon_value_ent",20,"type")="int"
+	Set gtmtypfldindx("lvmon_value_ent","varlvval.stats.crefcnt")=20
+	Set gtmtypes("lvmon_value_ent",21,"name")="lvmon_value_ent.varlvval.stats.tstartcycle"
+	Set gtmtypes("lvmon_value_ent",21,"off")=56
+	Set gtmtypes("lvmon_value_ent",21,"len")=4
+	Set gtmtypes("lvmon_value_ent",21,"type")="unsigned-int"
+	Set gtmtypfldindx("lvmon_value_ent","varlvval.stats.tstartcycle")=21
+	Set gtmtypes("lvmon_value_ent",22,"name")="lvmon_value_ent.varlvval.stats.lvtaskcycle"
+	Set gtmtypes("lvmon_value_ent",22,"off")=60
+	Set gtmtypes("lvmon_value_ent",22,"len")=4
+	Set gtmtypes("lvmon_value_ent",22,"type")="unsigned-int"
+	Set gtmtypfldindx("lvmon_value_ent","varlvval.stats.lvtaskcycle")=22
+	Set gtmtypes("lvmon_value_ent",23,"name")="lvmon_value_ent.varlvval.has_aliascont"
+	Set gtmtypes("lvmon_value_ent",23,"off")=64
+	Set gtmtypes("lvmon_value_ent",23,"len")=4
+	Set gtmtypes("lvmon_value_ent",23,"type")="boolean_t"
+	Set gtmtypfldindx("lvmon_value_ent","varlvval.has_aliascont")=23
+	Set gtmtypes("lvmon_value_ent",24,"name")="lvmon_value_ent.varlvval.lvmon_mark"
+	Set gtmtypes("lvmon_value_ent",24,"off")=68
+	Set gtmtypes("lvmon_value_ent",24,"len")=4
+	Set gtmtypes("lvmon_value_ent",24,"type")="boolean_t"
+	Set gtmtypfldindx("lvmon_value_ent","varlvval.lvmon_mark")=24
+	Set gtmtypes("lvmon_value_ent",25,"name")="lvmon_value_ent.varlvval.tp_var"
+	Set gtmtypes("lvmon_value_ent",25,"off")=72
+	Set gtmtypes("lvmon_value_ent",25,"len")=8
+	Set gtmtypes("lvmon_value_ent",25,"type")="addr"
+	Set gtmtypfldindx("lvmon_value_ent","varlvval.tp_var")=25
+	Set gtmtypes("lvmon_value_ent",26,"name")="lvmon_value_ent.varvalue"
+	Set gtmtypes("lvmon_value_ent",26,"off")=80
+	Set gtmtypes("lvmon_value_ent",26,"len")=16
+	Set gtmtypes("lvmon_value_ent",26,"type")="mstr"
+	Set gtmtypfldindx("lvmon_value_ent","varvalue")=26
+	Set gtmtypes("lvmon_value_ent",27,"name")="lvmon_value_ent.varvalue.char_len"
+	Set gtmtypes("lvmon_value_ent",27,"off")=80
+	Set gtmtypes("lvmon_value_ent",27,"len")=4
+	Set gtmtypes("lvmon_value_ent",27,"type")="unsigned-int"
+	Set gtmtypfldindx("lvmon_value_ent","varvalue.char_len")=27
+	Set gtmtypes("lvmon_value_ent",28,"name")="lvmon_value_ent.varvalue.len"
+	Set gtmtypes("lvmon_value_ent",28,"off")=84
+	Set gtmtypes("lvmon_value_ent",28,"len")=4
+	Set gtmtypes("lvmon_value_ent",28,"type")="int"
+	Set gtmtypfldindx("lvmon_value_ent","varvalue.len")=28
+	Set gtmtypes("lvmon_value_ent",29,"name")="lvmon_value_ent.varvalue.addr"
+	Set gtmtypes("lvmon_value_ent",29,"off")=88
+	Set gtmtypes("lvmon_value_ent",29,"len")=8
+	Set gtmtypes("lvmon_value_ent",29,"type")="addr"
+	Set gtmtypfldindx("lvmon_value_ent","varvalue.addr")=29
+	Set gtmtypes("lvmon_value_ent",30,"name")="lvmon_value_ent.alloclen"
+	Set gtmtypes("lvmon_value_ent",30,"off")=96
+	Set gtmtypes("lvmon_value_ent",30,"len")=4
+	Set gtmtypes("lvmon_value_ent",30,"type")="unsigned-int"
+	Set gtmtypfldindx("lvmon_value_ent","alloclen")=30
+	Set gtmtypes("lvmon_value_ent",31,"name")="lvmon_value_ent.filler"
+	Set gtmtypes("lvmon_value_ent",31,"off")=100
+	Set gtmtypes("lvmon_value_ent",31,"len")=4
+	Set gtmtypes("lvmon_value_ent",31,"type")="int"
+	Set gtmtypfldindx("lvmon_value_ent","filler")=31
+	;
+	Set gtmtypes("lvmon_var")="struct"
+	Set gtmtypes("lvmon_var",0)=38
+	Set gtmtypes("lvmon_var","len")=248
+	Set gtmtypes("lvmon_var",1,"name")="lvmon_var.lvmv"
+	Set gtmtypes("lvmon_var",1,"off")=0
+	Set gtmtypes("lvmon_var",1,"len")=24
+	Set gtmtypes("lvmon_var",1,"type")="mname_entry"
+	Set gtmtypfldindx("lvmon_var","lvmv")=1
+	Set gtmtypes("lvmon_var",2,"name")="lvmon_var.lvmv.var_name"
+	Set gtmtypes("lvmon_var",2,"off")=0
+	Set gtmtypes("lvmon_var",2,"len")=16
+	Set gtmtypes("lvmon_var",2,"type")="mstr"
+	Set gtmtypfldindx("lvmon_var","lvmv.var_name")=2
+	Set gtmtypes("lvmon_var",3,"name")="lvmon_var.lvmv.hash_code"
+	Set gtmtypes("lvmon_var",3,"off")=16
+	Set gtmtypes("lvmon_var",3,"len")=4
+	Set gtmtypes("lvmon_var",3,"type")="unsigned-int"
+	Set gtmtypfldindx("lvmon_var","lvmv.hash_code")=3
+	Set gtmtypes("lvmon_var",4,"name")="lvmon_var.lvmv.marked"
+	Set gtmtypes("lvmon_var",4,"off")=20
+	Set gtmtypes("lvmon_var",4,"len")=4
+	Set gtmtypes("lvmon_var",4,"type")="boolean_t"
+	Set gtmtypfldindx("lvmon_var","lvmv.marked")=4
+	Set gtmtypes("lvmon_var",5,"name")="lvmon_var.varlvadr"
+	Set gtmtypes("lvmon_var",5,"off")=24
+	Set gtmtypes("lvmon_var",5,"len")=8
+	Set gtmtypes("lvmon_var",5,"type")="addr"
+	Set gtmtypfldindx("lvmon_var","varlvadr")=5
+	Set gtmtypes("lvmon_var",6,"name")="lvmon_var.curr_symval_cycle"
+	Set gtmtypes("lvmon_var",6,"off")=32
+	Set gtmtypes("lvmon_var",6,"len")=8
+	Set gtmtypes("lvmon_var",6,"type")="gtm_int8"
+	Set gtmtypfldindx("lvmon_var","curr_symval_cycle")=6
+	Set gtmtypes("lvmon_var",7,"name")="lvmon_var.values"
+	Set gtmtypes("lvmon_var",7,"off")=40
+	Set gtmtypes("lvmon_var",7,"len")=208
+	Set gtmtypes("lvmon_var",7,"type")="lvmon_value_ent"
+	Set gtmtypfldindx("lvmon_var","values")=7
+	Set gtmtypes("lvmon_var",7,"dim")=2
+	Set gtmtypes("lvmon_var",8,"name")="lvmon_var.values[0].varlvval"
+	Set gtmtypes("lvmon_var",8,"off")=40
+	Set gtmtypes("lvmon_var",8,"len")=80
+	Set gtmtypes("lvmon_var",8,"type")="lv_val"
+	Set gtmtypfldindx("lvmon_var","values[0].varlvval")=8
+	Set gtmtypes("lvmon_var",9,"name")="lvmon_var.values[0].varlvval.v"
+	Set gtmtypes("lvmon_var",9,"off")=40
+	Set gtmtypes("lvmon_var",9,"len")=32
+	Set gtmtypes("lvmon_var",9,"type")="mval"
+	Set gtmtypfldindx("lvmon_var","values[0].varlvval.v")=9
+	Set gtmtypes("lvmon_var",10,"name")="lvmon_var.values[0].varlvval.v.mvtype"
+	Set gtmtypes("lvmon_var",10,"off")=40
+	Set gtmtypes("lvmon_var",10,"len")=2
+	Set gtmtypes("lvmon_var",10,"type")="unsigned-short"
+	Set gtmtypfldindx("lvmon_var","values[0].varlvval.v.mvtype")=10
+	Set gtmtypes("lvmon_var",11,"name")="lvmon_var.values[0].varlvval.v.fnpc_indx"
+	Set gtmtypes("lvmon_var",11,"off")=43
+	Set gtmtypes("lvmon_var",11,"len")=1
+	Set gtmtypes("lvmon_var",11,"type")="unsigned-char"
+	Set gtmtypfldindx("lvmon_var","values[0].varlvval.v.fnpc_indx")=11
+	Set gtmtypes("lvmon_var",12,"name")="lvmon_var.values[0].varlvval.v.utfcgr_indx"
+	Set gtmtypes("lvmon_var",12,"off")=44
+	Set gtmtypes("lvmon_var",12,"len")=4
+	Set gtmtypes("lvmon_var",12,"type")="unsigned-int"
+	Set gtmtypfldindx("lvmon_var","values[0].varlvval.v.utfcgr_indx")=12
+	Set gtmtypes("lvmon_var",13,"name")="lvmon_var.values[0].varlvval.v.m"
+	Set gtmtypes("lvmon_var",13,"off")=48
+	Set gtmtypes("lvmon_var",13,"len")=8
+	Set gtmtypes("lvmon_var",13,"type")="int"
+	Set gtmtypfldindx("lvmon_var","values[0].varlvval.v.m")=13
+	Set gtmtypes("lvmon_var",13,"dim")=2
+	Set gtmtypes("lvmon_var",14,"name")="lvmon_var.values[0].varlvval.v.str"
+	Set gtmtypes("lvmon_var",14,"off")=56
+	Set gtmtypes("lvmon_var",14,"len")=16
+	Set gtmtypes("lvmon_var",14,"type")="mstr"
+	Set gtmtypfldindx("lvmon_var","values[0].varlvval.v.str")=14
+	Set gtmtypes("lvmon_var",15,"name")="lvmon_var.values[0].varlvval.ptrs"
+	Set gtmtypes("lvmon_var",15,"off")=72
+	Set gtmtypes("lvmon_var",15,"len")=16
+	Set gtmtypes("lvmon_var",15,"type")="union"
+	Set gtmtypfldindx("lvmon_var","values[0].varlvval.ptrs")=15
+	Set gtmtypes("lvmon_var",16,"name")="lvmon_var.values[0].varlvval.ptrs.val_ent"
+	Set gtmtypes("lvmon_var",16,"off")=72
+	Set gtmtypes("lvmon_var",16,"len")=16
+	Set gtmtypes("lvmon_var",16,"type")="struct"
+	Set gtmtypfldindx("lvmon_var","values[0].varlvval.ptrs.val_ent")=16
+	Set gtmtypes("lvmon_var",17,"name")="lvmon_var.values[0].varlvval.ptrs.val_ent.children"
+	Set gtmtypes("lvmon_var",17,"off")=72
+	Set gtmtypes("lvmon_var",17,"len")=8
+	Set gtmtypes("lvmon_var",17,"type")="addr"
+	Set gtmtypfldindx("lvmon_var","values[0].varlvval.ptrs.val_ent.children")=17
+	Set gtmtypes("lvmon_var",18,"name")="lvmon_var.values[0].varlvval.ptrs.val_ent.parent"
+	Set gtmtypes("lvmon_var",18,"off")=80
+	Set gtmtypes("lvmon_var",18,"len")=8
+	Set gtmtypes("lvmon_var",18,"type")="union"
+	Set gtmtypfldindx("lvmon_var","values[0].varlvval.ptrs.val_ent.parent")=18
+	Set gtmtypes("lvmon_var",19,"name")="lvmon_var.values[0].varlvval.ptrs.val_ent.parent.sym"
+	Set gtmtypes("lvmon_var",19,"off")=80
+	Set gtmtypes("lvmon_var",19,"len")=8
+	Set gtmtypes("lvmon_var",19,"type")="addr"
+	Set gtmtypfldindx("lvmon_var","values[0].varlvval.ptrs.val_ent.parent.sym")=19
+	Set gtmtypes("lvmon_var",20,"name")="lvmon_var.values[0].varlvval.ptrs.val_ent.parent.sbs_tree"
+	Set gtmtypes("lvmon_var",20,"off")=80
+	Set gtmtypes("lvmon_var",20,"len")=8
+	Set gtmtypes("lvmon_var",20,"type")="addr"
+	Set gtmtypfldindx("lvmon_var","values[0].varlvval.ptrs.val_ent.parent.sbs_tree")=20
+	Set gtmtypes("lvmon_var",21,"name")="lvmon_var.values[0].varlvval.ptrs.free_ent"
+	Set gtmtypes("lvmon_var",21,"off")=72
+	Set gtmtypes("lvmon_var",21,"len")=8
+	Set gtmtypes("lvmon_var",21,"type")="struct"
+	Set gtmtypfldindx("lvmon_var","values[0].varlvval.ptrs.free_ent")=21
+	Set gtmtypes("lvmon_var",22,"name")="lvmon_var.values[0].varlvval.ptrs.free_ent.next_free"
+	Set gtmtypes("lvmon_var",22,"off")=72
+	Set gtmtypes("lvmon_var",22,"len")=8
+	Set gtmtypes("lvmon_var",22,"type")="addr"
+	Set gtmtypfldindx("lvmon_var","values[0].varlvval.ptrs.free_ent.next_free")=22
+	Set gtmtypes("lvmon_var",23,"name")="lvmon_var.values[0].varlvval.ptrs.copy_loc"
+	Set gtmtypes("lvmon_var",23,"off")=72
+	Set gtmtypes("lvmon_var",23,"len")=8
+	Set gtmtypes("lvmon_var",23,"type")="struct"
+	Set gtmtypfldindx("lvmon_var","values[0].varlvval.ptrs.copy_loc")=23
+	Set gtmtypes("lvmon_var",24,"name")="lvmon_var.values[0].varlvval.ptrs.copy_loc.newtablv"
+	Set gtmtypes("lvmon_var",24,"off")=72
+	Set gtmtypes("lvmon_var",24,"len")=8
+	Set gtmtypes("lvmon_var",24,"type")="addr"
+	Set gtmtypfldindx("lvmon_var","values[0].varlvval.ptrs.copy_loc.newtablv")=24
+	Set gtmtypes("lvmon_var",25,"name")="lvmon_var.values[0].varlvval.stats"
+	Set gtmtypes("lvmon_var",25,"off")=88
+	Set gtmtypes("lvmon_var",25,"len")=16
+	Set gtmtypes("lvmon_var",25,"type")="struct"
+	Set gtmtypfldindx("lvmon_var","values[0].varlvval.stats")=25
+	Set gtmtypes("lvmon_var",26,"name")="lvmon_var.values[0].varlvval.stats.trefcnt"
+	Set gtmtypes("lvmon_var",26,"off")=88
+	Set gtmtypes("lvmon_var",26,"len")=4
+	Set gtmtypes("lvmon_var",26,"type")="int"
+	Set gtmtypfldindx("lvmon_var","values[0].varlvval.stats.trefcnt")=26
+	Set gtmtypes("lvmon_var",27,"name")="lvmon_var.values[0].varlvval.stats.crefcnt"
+	Set gtmtypes("lvmon_var",27,"off")=92
+	Set gtmtypes("lvmon_var",27,"len")=4
+	Set gtmtypes("lvmon_var",27,"type")="int"
+	Set gtmtypfldindx("lvmon_var","values[0].varlvval.stats.crefcnt")=27
+	Set gtmtypes("lvmon_var",28,"name")="lvmon_var.values[0].varlvval.stats.tstartcycle"
+	Set gtmtypes("lvmon_var",28,"off")=96
+	Set gtmtypes("lvmon_var",28,"len")=4
+	Set gtmtypes("lvmon_var",28,"type")="unsigned-int"
+	Set gtmtypfldindx("lvmon_var","values[0].varlvval.stats.tstartcycle")=28
+	Set gtmtypes("lvmon_var",29,"name")="lvmon_var.values[0].varlvval.stats.lvtaskcycle"
+	Set gtmtypes("lvmon_var",29,"off")=100
+	Set gtmtypes("lvmon_var",29,"len")=4
+	Set gtmtypes("lvmon_var",29,"type")="unsigned-int"
+	Set gtmtypfldindx("lvmon_var","values[0].varlvval.stats.lvtaskcycle")=29
+	Set gtmtypes("lvmon_var",30,"name")="lvmon_var.values[0].varlvval.has_aliascont"
+	Set gtmtypes("lvmon_var",30,"off")=104
+	Set gtmtypes("lvmon_var",30,"len")=4
+	Set gtmtypes("lvmon_var",30,"type")="boolean_t"
+	Set gtmtypfldindx("lvmon_var","values[0].varlvval.has_aliascont")=30
+	Set gtmtypes("lvmon_var",31,"name")="lvmon_var.values[0].varlvval.lvmon_mark"
+	Set gtmtypes("lvmon_var",31,"off")=108
+	Set gtmtypes("lvmon_var",31,"len")=4
+	Set gtmtypes("lvmon_var",31,"type")="boolean_t"
+	Set gtmtypfldindx("lvmon_var","values[0].varlvval.lvmon_mark")=31
+	Set gtmtypes("lvmon_var",32,"name")="lvmon_var.values[0].varlvval.tp_var"
+	Set gtmtypes("lvmon_var",32,"off")=112
+	Set gtmtypes("lvmon_var",32,"len")=8
+	Set gtmtypes("lvmon_var",32,"type")="addr"
+	Set gtmtypfldindx("lvmon_var","values[0].varlvval.tp_var")=32
+	Set gtmtypes("lvmon_var",33,"name")="lvmon_var.values[0].varvalue"
+	Set gtmtypes("lvmon_var",33,"off")=120
+	Set gtmtypes("lvmon_var",33,"len")=16
+	Set gtmtypes("lvmon_var",33,"type")="mstr"
+	Set gtmtypfldindx("lvmon_var","values[0].varvalue")=33
+	Set gtmtypes("lvmon_var",34,"name")="lvmon_var.values[0].varvalue.char_len"
+	Set gtmtypes("lvmon_var",34,"off")=120
+	Set gtmtypes("lvmon_var",34,"len")=4
+	Set gtmtypes("lvmon_var",34,"type")="unsigned-int"
+	Set gtmtypfldindx("lvmon_var","values[0].varvalue.char_len")=34
+	Set gtmtypes("lvmon_var",35,"name")="lvmon_var.values[0].varvalue.len"
+	Set gtmtypes("lvmon_var",35,"off")=124
+	Set gtmtypes("lvmon_var",35,"len")=4
+	Set gtmtypes("lvmon_var",35,"type")="int"
+	Set gtmtypfldindx("lvmon_var","values[0].varvalue.len")=35
+	Set gtmtypes("lvmon_var",36,"name")="lvmon_var.values[0].varvalue.addr"
+	Set gtmtypes("lvmon_var",36,"off")=128
+	Set gtmtypes("lvmon_var",36,"len")=8
+	Set gtmtypes("lvmon_var",36,"type")="addr"
+	Set gtmtypfldindx("lvmon_var","values[0].varvalue.addr")=36
+	Set gtmtypes("lvmon_var",37,"name")="lvmon_var.values[0].alloclen"
+	Set gtmtypes("lvmon_var",37,"off")=136
+	Set gtmtypes("lvmon_var",37,"len")=4
+	Set gtmtypes("lvmon_var",37,"type")="unsigned-int"
+	Set gtmtypfldindx("lvmon_var","values[0].alloclen")=37
+	Set gtmtypes("lvmon_var",38,"name")="lvmon_var.values[0].filler"
+	Set gtmtypes("lvmon_var",38,"off")=140
+	Set gtmtypes("lvmon_var",38,"len")=4
+	Set gtmtypes("lvmon_var",38,"type")="int"
+	Set gtmtypfldindx("lvmon_var","values[0].filler")=38
+	;
 	Set gtmtypes("lvname_info")="struct"
 	Set gtmtypes("lvname_info",0)=4
 	Set gtmtypes("lvname_info","len")=280
@@ -13399,8 +14238,8 @@ Init
 	Set gtmtypfldindx("mlabel","gbl")=9
 	;
 	Set gtmtypes("mline")="struct"
-	Set gtmtypes("mline",0)=6
-	Set gtmtypes("mline","len")=40
+	Set gtmtypes("mline",0)=7
+	Set gtmtypes("mline","len")=48
 	Set gtmtypes("mline",1,"name")="mline.parent"
 	Set gtmtypes("mline",1,"off")=0
 	Set gtmtypes("mline",1,"len")=8
@@ -13431,6 +14270,11 @@ Init
 	Set gtmtypes("mline",6,"len")=4
 	Set gtmtypes("mline",6,"type")="boolean_t"
 	Set gtmtypfldindx("mline","table")=6
+	Set gtmtypes("mline",7,"name")="mline.block_ok"
+	Set gtmtypes("mline",7,"off")=40
+	Set gtmtypes("mline",7,"len")=4
+	Set gtmtypes("mline",7,"type")="boolean_t"
+	Set gtmtypfldindx("mline","block_ok")=7
 	;
 	Set gtmtypes("mliteral")="struct"
 	Set gtmtypes("mliteral",0)=11
@@ -16970,8 +17814,8 @@ Init
 	Set gtmtypfldindx("nametabent","name")=2
 	;
 	Set gtmtypes("node_local")="struct"
-	Set gtmtypes("node_local",0)=247
-	Set gtmtypes("node_local","len")=121528
+	Set gtmtypes("node_local",0)=248
+	Set gtmtypes("node_local","len")=121536
 	Set gtmtypes("node_local",1,"name")="node_local.label"
 	Set gtmtypes("node_local",1,"off")=0
 	Set gtmtypes("node_local",1,"len")=12
@@ -18098,126 +18942,131 @@ Init
 	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,"name")="node_local.update_underway_tn"
 	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",224,"len")=8
+	Set gtmtypes("node_local",224,"type")="uint64_t"
+	Set gtmtypfldindx("node_local","update_underway_tn")=224
+	Set gtmtypes("node_local",225,"name")="node_local.lastwriterbypas_msg_issued"
+	Set gtmtypes("node_local",225,"off")=121464
 	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 gtmtypfldindx("node_local","lastwriterbypas_msg_issued")=225
+	Set gtmtypes("node_local",226,"name")="node_local.first_writer_seen"
+	Set gtmtypes("node_local",226,"off")=121468
 	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 gtmtypfldindx("node_local","first_writer_seen")=226
+	Set gtmtypes("node_local",227,"name")="node_local.first_nonbypas_writer_seen"
+	Set gtmtypes("node_local",227,"off")=121472
 	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 gtmtypfldindx("node_local","first_nonbypas_writer_seen")=227
+	Set gtmtypes("node_local",228,"name")="node_local.ftok_counter_halted"
+	Set gtmtypes("node_local",228,"off")=121476
 	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 gtmtypfldindx("node_local","ftok_counter_halted")=228
+	Set gtmtypes("node_local",229,"name")="node_local.access_counter_halted"
+	Set gtmtypes("node_local",229,"off")=121480
 	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 gtmtypfldindx("node_local","access_counter_halted")=229
+	Set gtmtypes("node_local",230,"name")="node_local.statsdb_created"
+	Set gtmtypes("node_local",230,"off")=121484
 	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",230,"type")="boolean_t"
+	Set gtmtypfldindx("node_local","statsdb_created")=230
+	Set gtmtypes("node_local",231,"name")="node_local.statsdb_fname_len"
+	Set gtmtypes("node_local",231,"off")=121488
 	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",231,"type")="unsigned-int"
+	Set gtmtypfldindx("node_local","statsdb_fname_len")=231
+	Set gtmtypes("node_local",232,"name")="node_local.statsdb_rundown_clean"
+	Set gtmtypes("node_local",232,"off")=121492
+	Set gtmtypes("node_local",232,"len")=4
+	Set gtmtypes("node_local",232,"type")="boolean_t"
+	Set gtmtypfldindx("node_local","statsdb_rundown_clean")=232
+	Set gtmtypes("node_local",233,"name")="node_local.freeze_latch"
+	Set gtmtypes("node_local",233,"off")=121496
 	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",233,"type")="global_latch_t"
+	Set gtmtypfldindx("node_local","freeze_latch")=233
+	Set gtmtypes("node_local",234,"name")="node_local.freeze_latch.u"
+	Set gtmtypes("node_local",234,"off")=121496
 	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",234,"type")="union"
+	Set gtmtypfldindx("node_local","freeze_latch.u")=234
+	Set gtmtypes("node_local",235,"name")="node_local.freeze_latch.u.pid_imgcnt"
+	Set gtmtypes("node_local",235,"off")=121496
 	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",235,"type")="uint64_t"
+	Set gtmtypfldindx("node_local","freeze_latch.u.pid_imgcnt")=235
+	Set gtmtypes("node_local",236,"name")="node_local.freeze_latch.u.parts"
+	Set gtmtypes("node_local",236,"off")=121496
+	Set gtmtypes("node_local",236,"len")=8
+	Set gtmtypes("node_local",236,"type")="struct"
+	Set gtmtypfldindx("node_local","freeze_latch.u.parts")=236
+	Set gtmtypes("node_local",237,"name")="node_local.freeze_latch.u.parts.latch_pid"
+	Set gtmtypes("node_local",237,"off")=121496
 	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 gtmtypfldindx("node_local","freeze_latch.u.parts.latch_pid")=237
+	Set gtmtypes("node_local",238,"name")="node_local.freeze_latch.u.parts.latch_word"
+	Set gtmtypes("node_local",238,"off")=121500
+	Set gtmtypes("node_local",238,"len")=4
+	Set gtmtypes("node_local",238,"type")="int"
+	Set gtmtypfldindx("node_local","freeze_latch.u.parts.latch_word")=238
+	Set gtmtypes("node_local",239,"name")="node_local.wcs_buffs_freed"
 	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 gtmtypfldindx("node_local","wcs_buffs_freed")=239
+	Set gtmtypes("node_local",240,"name")="node_local.dskspace_next_fire"
 	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",240,"type")="uint64_t"
+	Set gtmtypfldindx("node_local","dskspace_next_fire")=240
+	Set gtmtypes("node_local",241,"name")="node_local.lock_crit"
+	Set gtmtypes("node_local",241,"off")=121520
 	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",241,"type")="global_latch_t"
+	Set gtmtypfldindx("node_local","lock_crit")=241
+	Set gtmtypes("node_local",242,"name")="node_local.lock_crit.u"
+	Set gtmtypes("node_local",242,"off")=121520
 	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",242,"type")="union"
+	Set gtmtypfldindx("node_local","lock_crit.u")=242
+	Set gtmtypes("node_local",243,"name")="node_local.lock_crit.u.pid_imgcnt"
+	Set gtmtypes("node_local",243,"off")=121520
 	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",243,"type")="uint64_t"
+	Set gtmtypfldindx("node_local","lock_crit.u.pid_imgcnt")=243
+	Set gtmtypes("node_local",244,"name")="node_local.lock_crit.u.parts"
+	Set gtmtypes("node_local",244,"off")=121520
+	Set gtmtypes("node_local",244,"len")=8
+	Set gtmtypes("node_local",244,"type")="struct"
+	Set gtmtypfldindx("node_local","lock_crit.u.parts")=244
+	Set gtmtypes("node_local",245,"name")="node_local.lock_crit.u.parts.latch_pid"
+	Set gtmtypes("node_local",245,"off")=121520
 	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 gtmtypfldindx("node_local","lock_crit.u.parts.latch_pid")=245
+	Set gtmtypes("node_local",246,"name")="node_local.lock_crit.u.parts.latch_word"
+	Set gtmtypes("node_local",246,"off")=121524
 	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 gtmtypfldindx("node_local","lock_crit.u.parts.latch_word")=246
+	Set gtmtypes("node_local",247,"name")="node_local.tp_hint"
+	Set gtmtypes("node_local",247,"off")=121528
 	Set gtmtypes("node_local",247,"len")=4
 	Set gtmtypes("node_local",247,"type")="int"
-	Set gtmtypfldindx("node_local","filler_8byte_align6")=247
+	Set gtmtypfldindx("node_local","tp_hint")=247
+	Set gtmtypes("node_local",248,"name")="node_local.filler_8byte_align6"
+	Set gtmtypes("node_local",248,"off")=121532
+	Set gtmtypes("node_local",248,"len")=4
+	Set gtmtypes("node_local",248,"type")="int"
+	Set gtmtypfldindx("node_local","filler_8byte_align6")=248
 	;
 	Set gtmtypes("noisolation_element")="struct"
 	Set gtmtypes("noisolation_element",0)=2
@@ -19149,6 +19998,101 @@ Init
 	Set gtmtypes("parse_blk",17,"type")="addr"
 	Set gtmtypfldindx("parse_blk","l_ext")=17
 	;
+	Set gtmtypes("parse_save_block")="struct"
+	Set gtmtypes("parse_save_block",0)=18
+	Set gtmtypes("parse_save_block","len")=136
+	Set gtmtypes("parse_save_block",1,"name")="parse_save_block.source_error_found"
+	Set gtmtypes("parse_save_block",1,"off")=0
+	Set gtmtypes("parse_save_block",1,"len")=4
+	Set gtmtypes("parse_save_block",1,"type")="boolean_t"
+	Set gtmtypfldindx("parse_save_block","source_error_found")=1
+	Set gtmtypes("parse_save_block",2,"name")="parse_save_block.source_column"
+	Set gtmtypes("parse_save_block",2,"off")=4
+	Set gtmtypes("parse_save_block",2,"len")=4
+	Set gtmtypes("parse_save_block",2,"type")="int"
+	Set gtmtypfldindx("parse_save_block","source_column")=2
+	Set gtmtypes("parse_save_block",3,"name")="parse_save_block.director_ident_len"
+	Set gtmtypes("parse_save_block",3,"off")=8
+	Set gtmtypes("parse_save_block",3,"len")=4
+	Set gtmtypes("parse_save_block",3,"type")="int"
+	Set gtmtypfldindx("parse_save_block","director_ident_len")=3
+	Set gtmtypes("parse_save_block",4,"name")="parse_save_block.block_level"
+	Set gtmtypes("parse_save_block",4,"off")=12
+	Set gtmtypes("parse_save_block",4,"len")=4
+	Set gtmtypes("parse_save_block",4,"type")="int"
+	Set gtmtypfldindx("parse_save_block","block_level")=4
+	Set gtmtypes("parse_save_block",5,"name")="parse_save_block.source_len"
+	Set gtmtypes("parse_save_block",5,"off")=16
+	Set gtmtypes("parse_save_block",5,"len")=4
+	Set gtmtypes("parse_save_block",5,"type")="int"
+	Set gtmtypfldindx("parse_save_block","source_len")=5
+	Set gtmtypes("parse_save_block",6,"name")="parse_save_block.director_mval"
+	Set gtmtypes("parse_save_block",6,"off")=24
+	Set gtmtypes("parse_save_block",6,"len")=32
+	Set gtmtypes("parse_save_block",6,"type")="mval"
+	Set gtmtypfldindx("parse_save_block","director_mval")=6
+	Set gtmtypes("parse_save_block",7,"name")="parse_save_block.director_mval.mvtype"
+	Set gtmtypes("parse_save_block",7,"off")=24
+	Set gtmtypes("parse_save_block",7,"len")=2
+	Set gtmtypes("parse_save_block",7,"type")="unsigned-short"
+	Set gtmtypfldindx("parse_save_block","director_mval.mvtype")=7
+	Set gtmtypes("parse_save_block",8,"name")="parse_save_block.director_mval.fnpc_indx"
+	Set gtmtypes("parse_save_block",8,"off")=27
+	Set gtmtypes("parse_save_block",8,"len")=1
+	Set gtmtypes("parse_save_block",8,"type")="unsigned-char"
+	Set gtmtypfldindx("parse_save_block","director_mval.fnpc_indx")=8
+	Set gtmtypes("parse_save_block",9,"name")="parse_save_block.director_mval.utfcgr_indx"
+	Set gtmtypes("parse_save_block",9,"off")=28
+	Set gtmtypes("parse_save_block",9,"len")=4
+	Set gtmtypes("parse_save_block",9,"type")="unsigned-int"
+	Set gtmtypfldindx("parse_save_block","director_mval.utfcgr_indx")=9
+	Set gtmtypes("parse_save_block",10,"name")="parse_save_block.director_mval.m"
+	Set gtmtypes("parse_save_block",10,"off")=32
+	Set gtmtypes("parse_save_block",10,"len")=8
+	Set gtmtypes("parse_save_block",10,"type")="int"
+	Set gtmtypfldindx("parse_save_block","director_mval.m")=10
+	Set gtmtypes("parse_save_block",10,"dim")=2
+	Set gtmtypes("parse_save_block",11,"name")="parse_save_block.director_mval.str"
+	Set gtmtypes("parse_save_block",11,"off")=40
+	Set gtmtypes("parse_save_block",11,"len")=16
+	Set gtmtypes("parse_save_block",11,"type")="mstr"
+	Set gtmtypfldindx("parse_save_block","director_mval.str")=11
+	Set gtmtypes("parse_save_block",12,"name")="parse_save_block.director_mval.str.char_len"
+	Set gtmtypes("parse_save_block",12,"off")=40
+	Set gtmtypes("parse_save_block",12,"len")=4
+	Set gtmtypes("parse_save_block",12,"type")="unsigned-int"
+	Set gtmtypfldindx("parse_save_block","director_mval.str.char_len")=12
+	Set gtmtypes("parse_save_block",13,"name")="parse_save_block.director_mval.str.len"
+	Set gtmtypes("parse_save_block",13,"off")=44
+	Set gtmtypes("parse_save_block",13,"len")=4
+	Set gtmtypes("parse_save_block",13,"type")="int"
+	Set gtmtypfldindx("parse_save_block","director_mval.str.len")=13
+	Set gtmtypes("parse_save_block",14,"name")="parse_save_block.director_mval.str.addr"
+	Set gtmtypes("parse_save_block",14,"off")=48
+	Set gtmtypes("parse_save_block",14,"len")=8
+	Set gtmtypes("parse_save_block",14,"type")="addr"
+	Set gtmtypfldindx("parse_save_block","director_mval.str.addr")=14
+	Set gtmtypes("parse_save_block",15,"name")="parse_save_block.ident_buffer"
+	Set gtmtypes("parse_save_block",15,"off")=56
+	Set gtmtypes("parse_save_block",15,"len")=63
+	Set gtmtypes("parse_save_block",15,"type")="unsigned-char"
+	Set gtmtypfldindx("parse_save_block","ident_buffer")=15
+	Set gtmtypes("parse_save_block",16,"name")="parse_save_block.director_token"
+	Set gtmtypes("parse_save_block",16,"off")=119
+	Set gtmtypes("parse_save_block",16,"len")=1
+	Set gtmtypes("parse_save_block",16,"type")="char"
+	Set gtmtypfldindx("parse_save_block","director_token")=16
+	Set gtmtypes("parse_save_block",17,"name")="parse_save_block.lexical_ptr"
+	Set gtmtypes("parse_save_block",17,"off")=120
+	Set gtmtypes("parse_save_block",17,"len")=8
+	Set gtmtypes("parse_save_block",17,"type")="addr"
+	Set gtmtypfldindx("parse_save_block","lexical_ptr")=17
+	Set gtmtypes("parse_save_block",18,"name")="parse_save_block.window_token"
+	Set gtmtypes("parse_save_block",18,"off")=128
+	Set gtmtypes("parse_save_block",18,"len")=1
+	Set gtmtypes("parse_save_block",18,"type")="char"
+	Set gtmtypfldindx("parse_save_block","window_token")=18
+	;
 	Set gtmtypes("pat_strlit")="struct"
 	Set gtmtypes("pat_strlit",0)=4
 	Set gtmtypes("pat_strlit","len")=3956
@@ -26055,8 +26999,8 @@ Init
 	Set gtmtypfldindx("sgbg_addrs","cache_state")=1
 	;
 	Set gtmtypes("sgm_info")="struct"
-	Set gtmtypes("sgm_info",0)=39
-	Set gtmtypes("sgm_info","len")=264
+	Set gtmtypes("sgm_info",0)=40
+	Set gtmtypes("sgm_info","len")=272
 	Set gtmtypes("sgm_info",1,"name")="sgm_info.next_sgm_info"
 	Set gtmtypes("sgm_info",1,"off")=0
 	Set gtmtypes("sgm_info",1,"len")=8
@@ -26252,6 +27196,11 @@ Init
 	Set gtmtypes("sgm_info",39,"len")=4
 	Set gtmtypes("sgm_info",39,"type")="unsigned-int"
 	Set gtmtypfldindx("sgm_info","tot_jrec_size")=39
+	Set gtmtypes("sgm_info",40,"name")="sgm_info.jbuf_rsrv_ptr"
+	Set gtmtypes("sgm_info",40,"off")=264
+	Set gtmtypes("sgm_info",40,"len")=8
+	Set gtmtypes("sgm_info",40,"type")="addr"
+	Set gtmtypfldindx("sgm_info","jbuf_rsrv_ptr")=40
 	;
 	Set gtmtypes("sgmm_addrs")="struct"
 	Set gtmtypes("sgmm_addrs",0)=1
@@ -26865,7 +27814,7 @@ Init
 	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 gtmtypes("sgmnt_addrs",120,"type")="int"
 	Set gtmtypfldindx("sgmnt_addrs","do_fullblockwrites")=120
 	Set gtmtypes("sgmnt_addrs",121,"name")="sgmnt_addrs.regnum"
 	Set gtmtypes("sgmnt_addrs",121,"off")=836
@@ -27029,7 +27978,7 @@ Init
 	Set gtmtypfldindx("sgmnt_addrs","statsDB_setup_completed")=152
 	;
 	Set gtmtypes("sgmnt_data")="struct"
-	Set gtmtypes("sgmnt_data",0)=586
+	Set gtmtypes("sgmnt_data",0)=592
 	Set gtmtypes("sgmnt_data","len")=8192
 	Set gtmtypes("sgmnt_data",1,"name")="sgmnt_data.label"
 	Set gtmtypes("sgmnt_data",1,"off")=0
@@ -27912,11 +28861,11 @@ Init
 	Set gtmtypes("sgmnt_data",174,"len")=8
 	Set gtmtypes("sgmnt_data",174,"type")="uint64_t"
 	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,"name")="sgmnt_data.wcb_gds_rundown2_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_bgtrcrec1_tn")=175
+	Set gtmtypfldindx("sgmnt_data","wcb_gds_rundown2_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
@@ -28207,11 +29156,11 @@ Init
 	Set gtmtypes("sgmnt_data",233,"len")=8
 	Set gtmtypes("sgmnt_data",233,"type")="uint64_t"
 	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,"name")="sgmnt_data.wcb_wcs_flu0_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_tp_grab_crit_tn")=234
+	Set gtmtypfldindx("sgmnt_data","wcb_wcs_flu0_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
@@ -28232,11 +29181,11 @@ Init
 	Set gtmtypes("sgmnt_data",238,"len")=8
 	Set gtmtypes("sgmnt_data",238,"type")="uint64_t"
 	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,"name")="sgmnt_data.wcb_gds_rundown1_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_gds_rundown_tn")=239
+	Set gtmtypfldindx("sgmnt_data","wcb_gds_rundown1_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
@@ -28592,1391 +29541,1421 @@ Init
 	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,"name")="sgmnt_data.jnlbuff_phs2cmt_array_full_tn"
 	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","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","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","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",311,"len")=8
+	Set gtmtypes("sgmnt_data",311,"type")="uint64_t"
+	Set gtmtypfldindx("sgmnt_data","jnlbuff_phs2cmt_array_full_tn")=311
+	Set gtmtypes("sgmnt_data",312,"name")="sgmnt_data.jnl_phase2_cleanup_if_possible_tn"
+	Set gtmtypes("sgmnt_data",312,"off")=3208
+	Set gtmtypes("sgmnt_data",312,"len")=8
+	Set gtmtypes("sgmnt_data",312,"type")="uint64_t"
+	Set gtmtypfldindx("sgmnt_data","jnl_phase2_cleanup_if_possible_tn")=312
+	Set gtmtypes("sgmnt_data",313,"name")="sgmnt_data.jnlbuff_phs2cmt_isprcalv_tn"
+	Set gtmtypes("sgmnt_data",313,"off")=3216
+	Set gtmtypes("sgmnt_data",313,"len")=8
+	Set gtmtypes("sgmnt_data",313,"type")="uint64_t"
+	Set gtmtypfldindx("sgmnt_data","jnlbuff_phs2cmt_isprcalv_tn")=313
+	Set gtmtypes("sgmnt_data",314,"name")="sgmnt_data.bg_trc_rec_tn_filler"
+	Set gtmtypes("sgmnt_data",314,"off")=3224
+	Set gtmtypes("sgmnt_data",314,"len")=24
+	Set gtmtypes("sgmnt_data",314,"type")="char"
+	Set gtmtypfldindx("sgmnt_data","bg_trc_rec_tn_filler")=314
+	Set gtmtypes("sgmnt_data",315,"name")="sgmnt_data.total_buffer_flush_cntr"
+	Set gtmtypes("sgmnt_data",315,"off")=3248
 	Set gtmtypes("sgmnt_data",315,"len")=4
 	Set gtmtypes("sgmnt_data",315,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","total_buffer_flush_cntr")=315
+	Set gtmtypes("sgmnt_data",316,"name")="sgmnt_data.bufct_buffer_flush_cntr"
+	Set gtmtypes("sgmnt_data",316,"off")=3252
 	Set gtmtypes("sgmnt_data",316,"len")=4
 	Set gtmtypes("sgmnt_data",316,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","bufct_buffer_flush_cntr")=316
+	Set gtmtypes("sgmnt_data",317,"name")="sgmnt_data.bufct_buffer_flush_loop_cntr"
+	Set gtmtypes("sgmnt_data",317,"off")=3256
 	Set gtmtypes("sgmnt_data",317,"len")=4
 	Set gtmtypes("sgmnt_data",317,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","bufct_buffer_flush_loop_cntr")=317
+	Set gtmtypes("sgmnt_data",318,"name")="sgmnt_data.wrt_calls_cntr"
+	Set gtmtypes("sgmnt_data",318,"off")=3260
 	Set gtmtypes("sgmnt_data",318,"len")=4
 	Set gtmtypes("sgmnt_data",318,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","wrt_calls_cntr")=318
+	Set gtmtypes("sgmnt_data",319,"name")="sgmnt_data.wrt_count_cntr"
+	Set gtmtypes("sgmnt_data",319,"off")=3264
 	Set gtmtypes("sgmnt_data",319,"len")=4
 	Set gtmtypes("sgmnt_data",319,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","wrt_count_cntr")=319
+	Set gtmtypes("sgmnt_data",320,"name")="sgmnt_data.wrt_blocked_cntr"
+	Set gtmtypes("sgmnt_data",320,"off")=3268
 	Set gtmtypes("sgmnt_data",320,"len")=4
 	Set gtmtypes("sgmnt_data",320,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","wrt_blocked_cntr")=320
+	Set gtmtypes("sgmnt_data",321,"name")="sgmnt_data.wrt_busy_cntr"
+	Set gtmtypes("sgmnt_data",321,"off")=3272
 	Set gtmtypes("sgmnt_data",321,"len")=4
 	Set gtmtypes("sgmnt_data",321,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","wrt_busy_cntr")=321
+	Set gtmtypes("sgmnt_data",322,"name")="sgmnt_data.wrt_noblks_wrtn_cntr"
+	Set gtmtypes("sgmnt_data",322,"off")=3276
 	Set gtmtypes("sgmnt_data",322,"len")=4
 	Set gtmtypes("sgmnt_data",322,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","wrt_noblks_wrtn_cntr")=322
+	Set gtmtypes("sgmnt_data",323,"name")="sgmnt_data.wcb_gds_rundown2_cntr"
+	Set gtmtypes("sgmnt_data",323,"off")=3280
 	Set gtmtypes("sgmnt_data",323,"len")=4
 	Set gtmtypes("sgmnt_data",323,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","wcb_gds_rundown2_cntr")=323
+	Set gtmtypes("sgmnt_data",324,"name")="sgmnt_data.reserved_bgtrcrec2_cntr"
+	Set gtmtypes("sgmnt_data",324,"off")=3284
 	Set gtmtypes("sgmnt_data",324,"len")=4
 	Set gtmtypes("sgmnt_data",324,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","reserved_bgtrcrec2_cntr")=324
+	Set gtmtypes("sgmnt_data",325,"name")="sgmnt_data.reserved_bgtrcrec3_cntr"
+	Set gtmtypes("sgmnt_data",325,"off")=3288
 	Set gtmtypes("sgmnt_data",325,"len")=4
 	Set gtmtypes("sgmnt_data",325,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","reserved_bgtrcrec3_cntr")=325
+	Set gtmtypes("sgmnt_data",326,"name")="sgmnt_data.lost_block_recovery_cntr"
+	Set gtmtypes("sgmnt_data",326,"off")=3292
 	Set gtmtypes("sgmnt_data",326,"len")=4
 	Set gtmtypes("sgmnt_data",326,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","lost_block_recovery_cntr")=326
+	Set gtmtypes("sgmnt_data",327,"name")="sgmnt_data.wc_blocked_onln_rlbk_cntr"
+	Set gtmtypes("sgmnt_data",327,"off")=3296
 	Set gtmtypes("sgmnt_data",327,"len")=4
 	Set gtmtypes("sgmnt_data",327,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","wc_blocked_onln_rlbk_cntr")=327
+	Set gtmtypes("sgmnt_data",328,"name")="sgmnt_data.stale_cntr"
+	Set gtmtypes("sgmnt_data",328,"off")=3300
 	Set gtmtypes("sgmnt_data",328,"len")=4
 	Set gtmtypes("sgmnt_data",328,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","stale_cntr")=328
+	Set gtmtypes("sgmnt_data",329,"name")="sgmnt_data.starved_cntr"
+	Set gtmtypes("sgmnt_data",329,"off")=3304
 	Set gtmtypes("sgmnt_data",329,"len")=4
 	Set gtmtypes("sgmnt_data",329,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","starved_cntr")=329
+	Set gtmtypes("sgmnt_data",330,"name")="sgmnt_data.stale_timer_started_cntr"
+	Set gtmtypes("sgmnt_data",330,"off")=3308
 	Set gtmtypes("sgmnt_data",330,"len")=4
 	Set gtmtypes("sgmnt_data",330,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","stale_timer_started_cntr")=330
+	Set gtmtypes("sgmnt_data",331,"name")="sgmnt_data.stale_timer_pop_cntr"
+	Set gtmtypes("sgmnt_data",331,"off")=3312
 	Set gtmtypes("sgmnt_data",331,"len")=4
 	Set gtmtypes("sgmnt_data",331,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","stale_timer_pop_cntr")=331
+	Set gtmtypes("sgmnt_data",332,"name")="sgmnt_data.stale_process_defer_cntr"
+	Set gtmtypes("sgmnt_data",332,"off")=3316
 	Set gtmtypes("sgmnt_data",332,"len")=4
 	Set gtmtypes("sgmnt_data",332,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","stale_process_defer_cntr")=332
+	Set gtmtypes("sgmnt_data",333,"name")="sgmnt_data.stale_defer_processed_cntr"
+	Set gtmtypes("sgmnt_data",333,"off")=3320
 	Set gtmtypes("sgmnt_data",333,"len")=4
 	Set gtmtypes("sgmnt_data",333,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","stale_defer_processed_cntr")=333
+	Set gtmtypes("sgmnt_data",334,"name")="sgmnt_data.spcfc_buffer_flush_cntr"
+	Set gtmtypes("sgmnt_data",334,"off")=3324
 	Set gtmtypes("sgmnt_data",334,"len")=4
 	Set gtmtypes("sgmnt_data",334,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","spcfc_buffer_flush_cntr")=334
+	Set gtmtypes("sgmnt_data",335,"name")="sgmnt_data.spcfc_buffer_flush_loop_cntr"
+	Set gtmtypes("sgmnt_data",335,"off")=3328
 	Set gtmtypes("sgmnt_data",335,"len")=4
 	Set gtmtypes("sgmnt_data",335,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","spcfc_buffer_flush_loop_cntr")=335
+	Set gtmtypes("sgmnt_data",336,"name")="sgmnt_data.spcfc_buffer_flush_retries_cntr"
+	Set gtmtypes("sgmnt_data",336,"off")=3332
 	Set gtmtypes("sgmnt_data",336,"len")=4
 	Set gtmtypes("sgmnt_data",336,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","spcfc_buffer_flush_retries_cntr")=336
+	Set gtmtypes("sgmnt_data",337,"name")="sgmnt_data.spcfc_buffer_flushed_during_lockwait_cntr"
+	Set gtmtypes("sgmnt_data",337,"off")=3336
 	Set gtmtypes("sgmnt_data",337,"len")=4
 	Set gtmtypes("sgmnt_data",337,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","spcfc_buffer_flushed_during_lockwait_cntr")=337
+	Set gtmtypes("sgmnt_data",338,"name")="sgmnt_data.tp_crit_retries_cntr"
+	Set gtmtypes("sgmnt_data",338,"off")=3340
 	Set gtmtypes("sgmnt_data",338,"len")=4
 	Set gtmtypes("sgmnt_data",338,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","tp_crit_retries_cntr")=338
+	Set gtmtypes("sgmnt_data",339,"name")="sgmnt_data.db_csh_getn_flush_dirty_cntr"
+	Set gtmtypes("sgmnt_data",339,"off")=3344
 	Set gtmtypes("sgmnt_data",339,"len")=4
 	Set gtmtypes("sgmnt_data",339,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","db_csh_getn_flush_dirty_cntr")=339
+	Set gtmtypes("sgmnt_data",340,"name")="sgmnt_data.db_csh_getn_rip_wait_cntr"
+	Set gtmtypes("sgmnt_data",340,"off")=3348
 	Set gtmtypes("sgmnt_data",340,"len")=4
 	Set gtmtypes("sgmnt_data",340,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","db_csh_getn_rip_wait_cntr")=340
+	Set gtmtypes("sgmnt_data",341,"name")="sgmnt_data.db_csh_getn_buf_owner_stuck_cntr"
+	Set gtmtypes("sgmnt_data",341,"off")=3352
 	Set gtmtypes("sgmnt_data",341,"len")=4
 	Set gtmtypes("sgmnt_data",341,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","db_csh_getn_buf_owner_stuck_cntr")=341
+	Set gtmtypes("sgmnt_data",342,"name")="sgmnt_data.db_csh_getn_out_of_design_cntr"
+	Set gtmtypes("sgmnt_data",342,"off")=3356
 	Set gtmtypes("sgmnt_data",342,"len")=4
 	Set gtmtypes("sgmnt_data",342,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","db_csh_getn_out_of_design_cntr")=342
+	Set gtmtypes("sgmnt_data",343,"name")="sgmnt_data.t_qread_buf_owner_stuck_cntr"
+	Set gtmtypes("sgmnt_data",343,"off")=3360
 	Set gtmtypes("sgmnt_data",343,"len")=4
 	Set gtmtypes("sgmnt_data",343,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","t_qread_buf_owner_stuck_cntr")=343
+	Set gtmtypes("sgmnt_data",344,"name")="sgmnt_data.t_qread_out_of_design_cntr"
+	Set gtmtypes("sgmnt_data",344,"off")=3364
 	Set gtmtypes("sgmnt_data",344,"len")=4
 	Set gtmtypes("sgmnt_data",344,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","t_qread_out_of_design_cntr")=344
+	Set gtmtypes("sgmnt_data",345,"name")="sgmnt_data.bt_put_flush_dirty_cntr"
+	Set gtmtypes("sgmnt_data",345,"off")=3368
 	Set gtmtypes("sgmnt_data",345,"len")=4
 	Set gtmtypes("sgmnt_data",345,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","bt_put_flush_dirty_cntr")=345
+	Set gtmtypes("sgmnt_data",346,"name")="sgmnt_data.mlock_wakeups_cntr"
+	Set gtmtypes("sgmnt_data",346,"off")=3372
 	Set gtmtypes("sgmnt_data",346,"len")=4
 	Set gtmtypes("sgmnt_data",346,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","mlock_wakeups_cntr")=346
+	Set gtmtypes("sgmnt_data",347,"name")="sgmnt_data.wc_blocked_wcs_recover_invoked_cntr"
+	Set gtmtypes("sgmnt_data",347,"off")=3376
 	Set gtmtypes("sgmnt_data",347,"len")=4
 	Set gtmtypes("sgmnt_data",347,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","wc_blocked_wcs_recover_invoked_cntr")=347
+	Set gtmtypes("sgmnt_data",348,"name")="sgmnt_data.wc_blocked_wcs_verify_passed_cntr"
+	Set gtmtypes("sgmnt_data",348,"off")=3380
 	Set gtmtypes("sgmnt_data",348,"len")=4
 	Set gtmtypes("sgmnt_data",348,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","wc_blocked_wcs_verify_passed_cntr")=348
+	Set gtmtypes("sgmnt_data",349,"name")="sgmnt_data.wc_blocked_t_qread_db_csh_getn_invalid_blk_cntr"
+	Set gtmtypes("sgmnt_data",349,"off")=3384
 	Set gtmtypes("sgmnt_data",349,"len")=4
 	Set gtmtypes("sgmnt_data",349,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","wc_blocked_t_qread_db_csh_getn_invalid_blk_cntr")=349
+	Set gtmtypes("sgmnt_data",350,"name")="sgmnt_data.wc_blocked_t_qread_db_csh_get_invalid_blk_cntr"
+	Set gtmtypes("sgmnt_data",350,"off")=3388
 	Set gtmtypes("sgmnt_data",350,"len")=4
 	Set gtmtypes("sgmnt_data",350,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","wc_blocked_t_qread_db_csh_get_invalid_blk_cntr")=350
+	Set gtmtypes("sgmnt_data",351,"name")="sgmnt_data.wc_blocked_db_csh_getn_loopexceed_cntr"
+	Set gtmtypes("sgmnt_data",351,"off")=3392
 	Set gtmtypes("sgmnt_data",351,"len")=4
 	Set gtmtypes("sgmnt_data",351,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","wc_blocked_db_csh_getn_loopexceed_cntr")=351
+	Set gtmtypes("sgmnt_data",352,"name")="sgmnt_data.wc_blocked_db_csh_getn_wcsstarvewrt_cntr"
+	Set gtmtypes("sgmnt_data",352,"off")=3396
 	Set gtmtypes("sgmnt_data",352,"len")=4
 	Set gtmtypes("sgmnt_data",352,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","wc_blocked_db_csh_getn_wcsstarvewrt_cntr")=352
+	Set gtmtypes("sgmnt_data",353,"name")="sgmnt_data.wc_blocked_db_csh_get_cntr"
+	Set gtmtypes("sgmnt_data",353,"off")=3400
 	Set gtmtypes("sgmnt_data",353,"len")=4
 	Set gtmtypes("sgmnt_data",353,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","wc_blocked_db_csh_get_cntr")=353
+	Set gtmtypes("sgmnt_data",354,"name")="sgmnt_data.wc_blocked_tp_tend_wcsgetspace_cntr"
+	Set gtmtypes("sgmnt_data",354,"off")=3404
 	Set gtmtypes("sgmnt_data",354,"len")=4
 	Set gtmtypes("sgmnt_data",354,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","wc_blocked_tp_tend_wcsgetspace_cntr")=354
+	Set gtmtypes("sgmnt_data",355,"name")="sgmnt_data.wc_blocked_tp_tend_t1_cntr"
+	Set gtmtypes("sgmnt_data",355,"off")=3408
 	Set gtmtypes("sgmnt_data",355,"len")=4
 	Set gtmtypes("sgmnt_data",355,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","wc_blocked_tp_tend_t1_cntr")=355
+	Set gtmtypes("sgmnt_data",356,"name")="sgmnt_data.wc_blocked_tp_tend_bitmap_cntr"
+	Set gtmtypes("sgmnt_data",356,"off")=3412
 	Set gtmtypes("sgmnt_data",356,"len")=4
 	Set gtmtypes("sgmnt_data",356,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","wc_blocked_tp_tend_bitmap_cntr")=356
+	Set gtmtypes("sgmnt_data",357,"name")="sgmnt_data.wc_blocked_tp_tend_jnl_cwset_cntr"
+	Set gtmtypes("sgmnt_data",357,"off")=3416
 	Set gtmtypes("sgmnt_data",357,"len")=4
 	Set gtmtypes("sgmnt_data",357,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","wc_blocked_tp_tend_jnl_cwset_cntr")=357
+	Set gtmtypes("sgmnt_data",358,"name")="sgmnt_data.wc_blocked_tp_tend_jnl_wcsflu_cntr"
+	Set gtmtypes("sgmnt_data",358,"off")=3420
 	Set gtmtypes("sgmnt_data",358,"len")=4
 	Set gtmtypes("sgmnt_data",358,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","wc_blocked_tp_tend_jnl_wcsflu_cntr")=358
+	Set gtmtypes("sgmnt_data",359,"name")="sgmnt_data.wc_blocked_t_end_hist_cntr"
+	Set gtmtypes("sgmnt_data",359,"off")=3424
 	Set gtmtypes("sgmnt_data",359,"len")=4
 	Set gtmtypes("sgmnt_data",359,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","wc_blocked_t_end_hist_cntr")=359
+	Set gtmtypes("sgmnt_data",360,"name")="sgmnt_data.wc_blocked_t_end_hist1_nullbt_cntr"
+	Set gtmtypes("sgmnt_data",360,"off")=3428
 	Set gtmtypes("sgmnt_data",360,"len")=4
 	Set gtmtypes("sgmnt_data",360,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","wc_blocked_t_end_hist1_nullbt_cntr")=360
+	Set gtmtypes("sgmnt_data",361,"name")="sgmnt_data.wc_blocked_t_end_hist1_nonnullbt_cntr"
+	Set gtmtypes("sgmnt_data",361,"off")=3432
 	Set gtmtypes("sgmnt_data",361,"len")=4
 	Set gtmtypes("sgmnt_data",361,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","wc_blocked_t_end_hist1_nonnullbt_cntr")=361
+	Set gtmtypes("sgmnt_data",362,"name")="sgmnt_data.wc_blocked_t_end_bitmap_nullbt_cntr"
+	Set gtmtypes("sgmnt_data",362,"off")=3436
 	Set gtmtypes("sgmnt_data",362,"len")=4
 	Set gtmtypes("sgmnt_data",362,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","wc_blocked_t_end_bitmap_nullbt_cntr")=362
+	Set gtmtypes("sgmnt_data",363,"name")="sgmnt_data.wc_blocked_t_end_bitmap_nonnullbt_cntr"
+	Set gtmtypes("sgmnt_data",363,"off")=3440
 	Set gtmtypes("sgmnt_data",363,"len")=4
 	Set gtmtypes("sgmnt_data",363,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","wc_blocked_t_end_bitmap_nonnullbt_cntr")=363
+	Set gtmtypes("sgmnt_data",364,"name")="sgmnt_data.wc_blocked_t_end_jnl_cwset_cntr"
+	Set gtmtypes("sgmnt_data",364,"off")=3444
 	Set gtmtypes("sgmnt_data",364,"len")=4
 	Set gtmtypes("sgmnt_data",364,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","wc_blocked_t_end_jnl_cwset_cntr")=364
+	Set gtmtypes("sgmnt_data",365,"name")="sgmnt_data.wc_blocked_t_end_jnl_wcsflu_cntr"
+	Set gtmtypes("sgmnt_data",365,"off")=3448
 	Set gtmtypes("sgmnt_data",365,"len")=4
 	Set gtmtypes("sgmnt_data",365,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","wc_blocked_t_end_jnl_wcsflu_cntr")=365
+	Set gtmtypes("sgmnt_data",366,"name")="sgmnt_data.db_csh_get_too_many_loops_cntr"
+	Set gtmtypes("sgmnt_data",366,"off")=3452
 	Set gtmtypes("sgmnt_data",366,"len")=4
 	Set gtmtypes("sgmnt_data",366,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","db_csh_get_too_many_loops_cntr")=366
+	Set gtmtypes("sgmnt_data",367,"name")="sgmnt_data.wc_blocked_tpckh_hist1_nullbt_cntr"
+	Set gtmtypes("sgmnt_data",367,"off")=3456
 	Set gtmtypes("sgmnt_data",367,"len")=4
 	Set gtmtypes("sgmnt_data",367,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","wc_blocked_tpckh_hist1_nullbt_cntr")=367
+	Set gtmtypes("sgmnt_data",368,"name")="sgmnt_data.wc_blocked_tpckh_hist1_nonnullbt_cntr"
+	Set gtmtypes("sgmnt_data",368,"off")=3460
 	Set gtmtypes("sgmnt_data",368,"len")=4
 	Set gtmtypes("sgmnt_data",368,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","wc_blocked_tpckh_hist1_nonnullbt_cntr")=368
+	Set gtmtypes("sgmnt_data",369,"name")="sgmnt_data.jnl_blocked_writer_lost_cntr"
+	Set gtmtypes("sgmnt_data",369,"off")=3464
 	Set gtmtypes("sgmnt_data",369,"len")=4
 	Set gtmtypes("sgmnt_data",369,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","jnl_blocked_writer_lost_cntr")=369
+	Set gtmtypes("sgmnt_data",370,"name")="sgmnt_data.jnl_blocked_writer_stuck_cntr"
+	Set gtmtypes("sgmnt_data",370,"off")=3468
 	Set gtmtypes("sgmnt_data",370,"len")=4
 	Set gtmtypes("sgmnt_data",370,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","jnl_blocked_writer_stuck_cntr")=370
+	Set gtmtypes("sgmnt_data",371,"name")="sgmnt_data.jnl_blocked_writer_blocked_cntr"
+	Set gtmtypes("sgmnt_data",371,"off")=3472
 	Set gtmtypes("sgmnt_data",371,"len")=4
 	Set gtmtypes("sgmnt_data",371,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","jnl_blocked_writer_blocked_cntr")=371
+	Set gtmtypes("sgmnt_data",372,"name")="sgmnt_data.n_jnl_fsyncs_cntr"
+	Set gtmtypes("sgmnt_data",372,"off")=3476
 	Set gtmtypes("sgmnt_data",372,"len")=4
 	Set gtmtypes("sgmnt_data",372,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","n_jnl_fsyncs_cntr")=372
+	Set gtmtypes("sgmnt_data",373,"name")="sgmnt_data.n_jnl_fsync_tries_cntr"
+	Set gtmtypes("sgmnt_data",373,"off")=3480
 	Set gtmtypes("sgmnt_data",373,"len")=4
 	Set gtmtypes("sgmnt_data",373,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","n_jnl_fsync_tries_cntr")=373
+	Set gtmtypes("sgmnt_data",374,"name")="sgmnt_data.n_jnl_fsync_recovers_cntr"
+	Set gtmtypes("sgmnt_data",374,"off")=3484
 	Set gtmtypes("sgmnt_data",374,"len")=4
 	Set gtmtypes("sgmnt_data",374,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","n_jnl_fsync_recovers_cntr")=374
+	Set gtmtypes("sgmnt_data",375,"name")="sgmnt_data.n_db_fsyncs_cntr"
+	Set gtmtypes("sgmnt_data",375,"off")=3488
 	Set gtmtypes("sgmnt_data",375,"len")=4
 	Set gtmtypes("sgmnt_data",375,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","n_db_fsyncs_cntr")=375
+	Set gtmtypes("sgmnt_data",376,"name")="sgmnt_data.n_db_fsyncs_in_crit_cntr"
+	Set gtmtypes("sgmnt_data",376,"off")=3492
 	Set gtmtypes("sgmnt_data",376,"len")=4
 	Set gtmtypes("sgmnt_data",376,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","n_db_fsyncs_in_crit_cntr")=376
+	Set gtmtypes("sgmnt_data",377,"name")="sgmnt_data.n_dbsync_timers_cntr"
+	Set gtmtypes("sgmnt_data",377,"off")=3496
 	Set gtmtypes("sgmnt_data",377,"len")=4
 	Set gtmtypes("sgmnt_data",377,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","n_dbsync_timers_cntr")=377
+	Set gtmtypes("sgmnt_data",378,"name")="sgmnt_data.n_dbsync_writes_cntr"
+	Set gtmtypes("sgmnt_data",378,"off")=3500
 	Set gtmtypes("sgmnt_data",378,"len")=4
 	Set gtmtypes("sgmnt_data",378,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","n_dbsync_writes_cntr")=378
+	Set gtmtypes("sgmnt_data",379,"name")="sgmnt_data.mutex_queue_full_cntr"
+	Set gtmtypes("sgmnt_data",379,"off")=3504
 	Set gtmtypes("sgmnt_data",379,"len")=4
 	Set gtmtypes("sgmnt_data",379,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","mutex_queue_full_cntr")=379
+	Set gtmtypes("sgmnt_data",380,"name")="sgmnt_data.wcb_bt_put_cntr"
+	Set gtmtypes("sgmnt_data",380,"off")=3508
 	Set gtmtypes("sgmnt_data",380,"len")=4
 	Set gtmtypes("sgmnt_data",380,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","wcb_bt_put_cntr")=380
+	Set gtmtypes("sgmnt_data",381,"name")="sgmnt_data.wcb_mutex_salvage_cntr"
+	Set gtmtypes("sgmnt_data",381,"off")=3512
 	Set gtmtypes("sgmnt_data",381,"len")=4
 	Set gtmtypes("sgmnt_data",381,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","wcb_mutex_salvage_cntr")=381
+	Set gtmtypes("sgmnt_data",382,"name")="sgmnt_data.wcb_wcs_flu0_cntr"
+	Set gtmtypes("sgmnt_data",382,"off")=3516
 	Set gtmtypes("sgmnt_data",382,"len")=4
 	Set gtmtypes("sgmnt_data",382,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","wcb_wcs_flu0_cntr")=382
+	Set gtmtypes("sgmnt_data",383,"name")="sgmnt_data.wcb_t_end_sysops_nocr_invcr_cntr"
+	Set gtmtypes("sgmnt_data",383,"off")=3520
 	Set gtmtypes("sgmnt_data",383,"len")=4
 	Set gtmtypes("sgmnt_data",383,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","wcb_t_end_sysops_nocr_invcr_cntr")=383
+	Set gtmtypes("sgmnt_data",384,"name")="sgmnt_data.wcb_t_end_sysops_cr_invcr_cntr"
+	Set gtmtypes("sgmnt_data",384,"off")=3524
 	Set gtmtypes("sgmnt_data",384,"len")=4
 	Set gtmtypes("sgmnt_data",384,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","wcb_t_end_sysops_cr_invcr_cntr")=384
+	Set gtmtypes("sgmnt_data",385,"name")="sgmnt_data.wcb_t_end_sysops_rip_wait_cntr"
+	Set gtmtypes("sgmnt_data",385,"off")=3528
 	Set gtmtypes("sgmnt_data",385,"len")=4
 	Set gtmtypes("sgmnt_data",385,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","wcb_t_end_sysops_rip_wait_cntr")=385
+	Set gtmtypes("sgmnt_data",386,"name")="sgmnt_data.wcb_t_end_sysops_dirtyripwait_cntr"
+	Set gtmtypes("sgmnt_data",386,"off")=3532
 	Set gtmtypes("sgmnt_data",386,"len")=4
 	Set gtmtypes("sgmnt_data",386,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","wcb_t_end_sysops_dirtyripwait_cntr")=386
+	Set gtmtypes("sgmnt_data",387,"name")="sgmnt_data.wcb_gds_rundown1_cntr"
+	Set gtmtypes("sgmnt_data",387,"off")=3536
 	Set gtmtypes("sgmnt_data",387,"len")=4
 	Set gtmtypes("sgmnt_data",387,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","wcb_gds_rundown1_cntr")=387
+	Set gtmtypes("sgmnt_data",388,"name")="sgmnt_data.wcb_wcs_flu1_cntr"
+	Set gtmtypes("sgmnt_data",388,"off")=3540
 	Set gtmtypes("sgmnt_data",388,"len")=4
 	Set gtmtypes("sgmnt_data",388,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","wcb_wcs_flu1_cntr")=388
+	Set gtmtypes("sgmnt_data",389,"name")="sgmnt_data.wcb_mu_back_cntr"
+	Set gtmtypes("sgmnt_data",389,"off")=3544
 	Set gtmtypes("sgmnt_data",389,"len")=4
 	Set gtmtypes("sgmnt_data",389,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","wcb_mu_back_cntr")=389
+	Set gtmtypes("sgmnt_data",390,"name")="sgmnt_data.wcb_t_end_sysops_dirty_invcr_cntr"
+	Set gtmtypes("sgmnt_data",390,"off")=3548
 	Set gtmtypes("sgmnt_data",390,"len")=4
 	Set gtmtypes("sgmnt_data",390,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","wcb_t_end_sysops_dirty_invcr_cntr")=390
+	Set gtmtypes("sgmnt_data",391,"name")="sgmnt_data.wcb_t_end_sysops_wtfini_fail_cntr"
+	Set gtmtypes("sgmnt_data",391,"off")=3552
 	Set gtmtypes("sgmnt_data",391,"len")=4
 	Set gtmtypes("sgmnt_data",391,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","wcb_t_end_sysops_wtfini_fail_cntr")=391
+	Set gtmtypes("sgmnt_data",392,"name")="sgmnt_data.wcb_t_end_sysops_twin_stuck_cntr"
+	Set gtmtypes("sgmnt_data",392,"off")=3556
 	Set gtmtypes("sgmnt_data",392,"len")=4
 	Set gtmtypes("sgmnt_data",392,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","wcb_t_end_sysops_twin_stuck_cntr")=392
+	Set gtmtypes("sgmnt_data",393,"name")="sgmnt_data.db_csh_getn_wrt_latch_stuck_cntr"
+	Set gtmtypes("sgmnt_data",393,"off")=3560
 	Set gtmtypes("sgmnt_data",393,"len")=4
 	Set gtmtypes("sgmnt_data",393,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","db_csh_getn_wrt_latch_stuck_cntr")=393
+	Set gtmtypes("sgmnt_data",394,"name")="sgmnt_data.wcb_secshr_db_clnup_now_crit_cntr"
+	Set gtmtypes("sgmnt_data",394,"off")=3564
 	Set gtmtypes("sgmnt_data",394,"len")=4
 	Set gtmtypes("sgmnt_data",394,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","wcb_secshr_db_clnup_now_crit_cntr")=394
+	Set gtmtypes("sgmnt_data",395,"name")="sgmnt_data.wc_blocked_t_qread_bad_bt_index1_cntr"
+	Set gtmtypes("sgmnt_data",395,"off")=3568
 	Set gtmtypes("sgmnt_data",395,"len")=4
 	Set gtmtypes("sgmnt_data",395,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","wc_blocked_t_qread_bad_bt_index1_cntr")=395
+	Set gtmtypes("sgmnt_data",396,"name")="sgmnt_data.wc_blocked_t_qread_bad_bt_index2_cntr"
+	Set gtmtypes("sgmnt_data",396,"off")=3572
 	Set gtmtypes("sgmnt_data",396,"len")=4
 	Set gtmtypes("sgmnt_data",396,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","wc_blocked_t_qread_bad_bt_index2_cntr")=396
+	Set gtmtypes("sgmnt_data",397,"name")="sgmnt_data.wc_blocked_t_end_crbtmismatch1_cntr"
+	Set gtmtypes("sgmnt_data",397,"off")=3576
 	Set gtmtypes("sgmnt_data",397,"len")=4
 	Set gtmtypes("sgmnt_data",397,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","wc_blocked_t_end_crbtmismatch1_cntr")=397
+	Set gtmtypes("sgmnt_data",398,"name")="sgmnt_data.wc_blocked_t_end_crbtmismatch2_cntr"
+	Set gtmtypes("sgmnt_data",398,"off")=3580
 	Set gtmtypes("sgmnt_data",398,"len")=4
 	Set gtmtypes("sgmnt_data",398,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","wc_blocked_t_end_crbtmismatch2_cntr")=398
+	Set gtmtypes("sgmnt_data",399,"name")="sgmnt_data.wc_blocked_t_end_crbtmismatch3_cntr"
+	Set gtmtypes("sgmnt_data",399,"off")=3584
 	Set gtmtypes("sgmnt_data",399,"len")=4
 	Set gtmtypes("sgmnt_data",399,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","wc_blocked_t_end_crbtmismatch3_cntr")=399
+	Set gtmtypes("sgmnt_data",400,"name")="sgmnt_data.wc_blocked_tp_tend_crbtmismatch1_cntr"
+	Set gtmtypes("sgmnt_data",400,"off")=3588
 	Set gtmtypes("sgmnt_data",400,"len")=4
 	Set gtmtypes("sgmnt_data",400,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","wc_blocked_tp_tend_crbtmismatch1_cntr")=400
+	Set gtmtypes("sgmnt_data",401,"name")="sgmnt_data.wc_blocked_tp_tend_crbtmismatch2_cntr"
+	Set gtmtypes("sgmnt_data",401,"off")=3592
 	Set gtmtypes("sgmnt_data",401,"len")=4
 	Set gtmtypes("sgmnt_data",401,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","wc_blocked_tp_tend_crbtmismatch2_cntr")=401
+	Set gtmtypes("sgmnt_data",402,"name")="sgmnt_data.wc_blocked_tp_tend_crbtmismatch3_cntr"
+	Set gtmtypes("sgmnt_data",402,"off")=3596
 	Set gtmtypes("sgmnt_data",402,"len")=4
 	Set gtmtypes("sgmnt_data",402,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","wc_blocked_tp_tend_crbtmismatch3_cntr")=402
+	Set gtmtypes("sgmnt_data",403,"name")="sgmnt_data.wc_blocked_wcs_wtstart_bad_cr_cntr"
+	Set gtmtypes("sgmnt_data",403,"off")=3600
 	Set gtmtypes("sgmnt_data",403,"len")=4
 	Set gtmtypes("sgmnt_data",403,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","wc_blocked_wcs_wtstart_bad_cr_cntr")=403
+	Set gtmtypes("sgmnt_data",404,"name")="sgmnt_data.wc_blocked_wcs_wtfini_bad_cr_cntr"
+	Set gtmtypes("sgmnt_data",404,"off")=3604
 	Set gtmtypes("sgmnt_data",404,"len")=4
 	Set gtmtypes("sgmnt_data",404,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","wc_blocked_wcs_wtfini_bad_cr_cntr")=404
+	Set gtmtypes("sgmnt_data",405,"name")="sgmnt_data.wc_blocked_bt_get_cntr"
+	Set gtmtypes("sgmnt_data",405,"off")=3608
 	Set gtmtypes("sgmnt_data",405,"len")=4
 	Set gtmtypes("sgmnt_data",405,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","wc_blocked_bt_get_cntr")=405
+	Set gtmtypes("sgmnt_data",406,"name")="sgmnt_data.wc_blocked_wcs_cdb_sc_final_retry_cntr"
+	Set gtmtypes("sgmnt_data",406,"off")=3612
 	Set gtmtypes("sgmnt_data",406,"len")=4
 	Set gtmtypes("sgmnt_data",406,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","wc_blocked_wcs_cdb_sc_final_retry_cntr")=406
+	Set gtmtypes("sgmnt_data",407,"name")="sgmnt_data.wcb_bg_update_lckfail1_cntr"
+	Set gtmtypes("sgmnt_data",407,"off")=3616
 	Set gtmtypes("sgmnt_data",407,"len")=4
 	Set gtmtypes("sgmnt_data",407,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","wcb_bg_update_lckfail1_cntr")=407
+	Set gtmtypes("sgmnt_data",408,"name")="sgmnt_data.wcb_bg_update_lckfail2_cntr"
+	Set gtmtypes("sgmnt_data",408,"off")=3620
 	Set gtmtypes("sgmnt_data",408,"len")=4
 	Set gtmtypes("sgmnt_data",408,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","wcb_bg_update_lckfail2_cntr")=408
+	Set gtmtypes("sgmnt_data",409,"name")="sgmnt_data.wcb_wtstart_lckfail1_cntr"
+	Set gtmtypes("sgmnt_data",409,"off")=3624
 	Set gtmtypes("sgmnt_data",409,"len")=4
 	Set gtmtypes("sgmnt_data",409,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","wcb_wtstart_lckfail1_cntr")=409
+	Set gtmtypes("sgmnt_data",410,"name")="sgmnt_data.wcb_wtstart_lckfail2_cntr"
+	Set gtmtypes("sgmnt_data",410,"off")=3628
 	Set gtmtypes("sgmnt_data",410,"len")=4
 	Set gtmtypes("sgmnt_data",410,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","wcb_wtstart_lckfail2_cntr")=410
+	Set gtmtypes("sgmnt_data",411,"name")="sgmnt_data.wcb_wtstart_lckfail3_cntr"
+	Set gtmtypes("sgmnt_data",411,"off")=3632
 	Set gtmtypes("sgmnt_data",411,"len")=4
 	Set gtmtypes("sgmnt_data",411,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","wcb_wtstart_lckfail3_cntr")=411
+	Set gtmtypes("sgmnt_data",412,"name")="sgmnt_data.wcb_wtstart_lckfail4_cntr"
+	Set gtmtypes("sgmnt_data",412,"off")=3636
 	Set gtmtypes("sgmnt_data",412,"len")=4
 	Set gtmtypes("sgmnt_data",412,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","wcb_wtstart_lckfail4_cntr")=412
+	Set gtmtypes("sgmnt_data",413,"name")="sgmnt_data.wcb_wtfini_lckfail1_cntr"
+	Set gtmtypes("sgmnt_data",413,"off")=3640
 	Set gtmtypes("sgmnt_data",413,"len")=4
 	Set gtmtypes("sgmnt_data",413,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","wcb_wtfini_lckfail1_cntr")=413
+	Set gtmtypes("sgmnt_data",414,"name")="sgmnt_data.wcb_wtfini_lckfail2_cntr"
+	Set gtmtypes("sgmnt_data",414,"off")=3644
 	Set gtmtypes("sgmnt_data",414,"len")=4
 	Set gtmtypes("sgmnt_data",414,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","wcb_wtfini_lckfail2_cntr")=414
+	Set gtmtypes("sgmnt_data",415,"name")="sgmnt_data.wcb_wtfini_lckfail3_cntr"
+	Set gtmtypes("sgmnt_data",415,"off")=3648
 	Set gtmtypes("sgmnt_data",415,"len")=4
 	Set gtmtypes("sgmnt_data",415,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","wcb_wtfini_lckfail3_cntr")=415
+	Set gtmtypes("sgmnt_data",416,"name")="sgmnt_data.wcb_wtfini_lckfail4_cntr"
+	Set gtmtypes("sgmnt_data",416,"off")=3652
 	Set gtmtypes("sgmnt_data",416,"len")=4
 	Set gtmtypes("sgmnt_data",416,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","wcb_wtfini_lckfail4_cntr")=416
+	Set gtmtypes("sgmnt_data",417,"name")="sgmnt_data.wcb_t_end_sysops_dirtystuck1_cntr"
+	Set gtmtypes("sgmnt_data",417,"off")=3656
 	Set gtmtypes("sgmnt_data",417,"len")=4
 	Set gtmtypes("sgmnt_data",417,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","wcb_t_end_sysops_dirtystuck1_cntr")=417
+	Set gtmtypes("sgmnt_data",418,"name")="sgmnt_data.wcb_t_end_sysops_dirtystuck2_cntr"
+	Set gtmtypes("sgmnt_data",418,"off")=3660
 	Set gtmtypes("sgmnt_data",418,"len")=4
 	Set gtmtypes("sgmnt_data",418,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","wcb_t_end_sysops_dirtystuck2_cntr")=418
+	Set gtmtypes("sgmnt_data",419,"name")="sgmnt_data.wcb_secshr_db_clnup_wbuf_dqd_cntr"
+	Set gtmtypes("sgmnt_data",419,"off")=3664
 	Set gtmtypes("sgmnt_data",419,"len")=4
 	Set gtmtypes("sgmnt_data",419,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","wcb_secshr_db_clnup_wbuf_dqd_cntr")=419
+	Set gtmtypes("sgmnt_data",420,"name")="sgmnt_data.dwngrd_refmts_syncio_cntr"
+	Set gtmtypes("sgmnt_data",420,"off")=3668
 	Set gtmtypes("sgmnt_data",420,"len")=4
 	Set gtmtypes("sgmnt_data",420,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","dwngrd_refmts_syncio_cntr")=420
+	Set gtmtypes("sgmnt_data",421,"name")="sgmnt_data.dwngrd_refmts_asyncio_cntr"
+	Set gtmtypes("sgmnt_data",421,"off")=3672
 	Set gtmtypes("sgmnt_data",421,"len")=4
 	Set gtmtypes("sgmnt_data",421,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","dwngrd_refmts_asyncio_cntr")=421
+	Set gtmtypes("sgmnt_data",422,"name")="sgmnt_data.shmpool_refmt_harvests_cntr"
+	Set gtmtypes("sgmnt_data",422,"off")=3676
 	Set gtmtypes("sgmnt_data",422,"len")=4
 	Set gtmtypes("sgmnt_data",422,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","shmpool_refmt_harvests_cntr")=422
+	Set gtmtypes("sgmnt_data",423,"name")="sgmnt_data.shmpool_recovery_cntr"
+	Set gtmtypes("sgmnt_data",423,"off")=3680
 	Set gtmtypes("sgmnt_data",423,"len")=4
 	Set gtmtypes("sgmnt_data",423,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","shmpool_recovery_cntr")=423
+	Set gtmtypes("sgmnt_data",424,"name")="sgmnt_data.shmpool_blkd_by_sdc_cntr"
+	Set gtmtypes("sgmnt_data",424,"off")=3684
 	Set gtmtypes("sgmnt_data",424,"len")=4
 	Set gtmtypes("sgmnt_data",424,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","shmpool_blkd_by_sdc_cntr")=424
+	Set gtmtypes("sgmnt_data",425,"name")="sgmnt_data.shmpool_alloc_bbflush_cntr"
+	Set gtmtypes("sgmnt_data",425,"off")=3688
 	Set gtmtypes("sgmnt_data",425,"len")=4
 	Set gtmtypes("sgmnt_data",425,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","shmpool_alloc_bbflush_cntr")=425
+	Set gtmtypes("sgmnt_data",426,"name")="sgmnt_data.refmt_hvst_blk_released_replaced_cntr"
+	Set gtmtypes("sgmnt_data",426,"off")=3692
 	Set gtmtypes("sgmnt_data",426,"len")=4
 	Set gtmtypes("sgmnt_data",426,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","refmt_hvst_blk_released_replaced_cntr")=426
+	Set gtmtypes("sgmnt_data",427,"name")="sgmnt_data.refmt_hvst_blk_released_io_complete_cntr"
+	Set gtmtypes("sgmnt_data",427,"off")=3696
 	Set gtmtypes("sgmnt_data",427,"len")=4
 	Set gtmtypes("sgmnt_data",427,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","refmt_hvst_blk_released_io_complete_cntr")=427
+	Set gtmtypes("sgmnt_data",428,"name")="sgmnt_data.refmt_hvst_blk_kept_cntr"
+	Set gtmtypes("sgmnt_data",428,"off")=3700
 	Set gtmtypes("sgmnt_data",428,"len")=4
 	Set gtmtypes("sgmnt_data",428,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","refmt_hvst_blk_kept_cntr")=428
+	Set gtmtypes("sgmnt_data",429,"name")="sgmnt_data.refmt_hvst_blk_ignored_cntr"
+	Set gtmtypes("sgmnt_data",429,"off")=3704
 	Set gtmtypes("sgmnt_data",429,"len")=4
 	Set gtmtypes("sgmnt_data",429,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","refmt_hvst_blk_ignored_cntr")=429
+	Set gtmtypes("sgmnt_data",430,"name")="sgmnt_data.refmt_blk_chk_blk_freed_cntr"
+	Set gtmtypes("sgmnt_data",430,"off")=3708
 	Set gtmtypes("sgmnt_data",430,"len")=4
 	Set gtmtypes("sgmnt_data",430,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","refmt_blk_chk_blk_freed_cntr")=430
+	Set gtmtypes("sgmnt_data",431,"name")="sgmnt_data.refmt_blk_chk_blk_kept_cntr"
+	Set gtmtypes("sgmnt_data",431,"off")=3712
 	Set gtmtypes("sgmnt_data",431,"len")=4
 	Set gtmtypes("sgmnt_data",431,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","refmt_blk_chk_blk_kept_cntr")=431
+	Set gtmtypes("sgmnt_data",432,"name")="sgmnt_data.active_lvl_trigger_cntr"
+	Set gtmtypes("sgmnt_data",432,"off")=3716
 	Set gtmtypes("sgmnt_data",432,"len")=4
 	Set gtmtypes("sgmnt_data",432,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","active_lvl_trigger_cntr")=432
+	Set gtmtypes("sgmnt_data",433,"name")="sgmnt_data.new_buff_cntr"
+	Set gtmtypes("sgmnt_data",433,"off")=3720
 	Set gtmtypes("sgmnt_data",433,"len")=4
 	Set gtmtypes("sgmnt_data",433,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","new_buff_cntr")=433
+	Set gtmtypes("sgmnt_data",434,"name")="sgmnt_data.phase2_commit_wait_sleep_in_crit_cntr"
+	Set gtmtypes("sgmnt_data",434,"off")=3724
 	Set gtmtypes("sgmnt_data",434,"len")=4
 	Set gtmtypes("sgmnt_data",434,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","phase2_commit_wait_sleep_in_crit_cntr")=434
+	Set gtmtypes("sgmnt_data",435,"name")="sgmnt_data.phase2_commit_wait_sleep_no_crit_cntr"
+	Set gtmtypes("sgmnt_data",435,"off")=3728
 	Set gtmtypes("sgmnt_data",435,"len")=4
 	Set gtmtypes("sgmnt_data",435,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","phase2_commit_wait_sleep_no_crit_cntr")=435
+	Set gtmtypes("sgmnt_data",436,"name")="sgmnt_data.phase2_commit_wait_pidcnt_cntr"
+	Set gtmtypes("sgmnt_data",436,"off")=3732
 	Set gtmtypes("sgmnt_data",436,"len")=4
 	Set gtmtypes("sgmnt_data",436,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","phase2_commit_wait_pidcnt_cntr")=436
+	Set gtmtypes("sgmnt_data",437,"name")="sgmnt_data.wcb_t_end_sysops_intend_wait_cntr"
+	Set gtmtypes("sgmnt_data",437,"off")=3736
 	Set gtmtypes("sgmnt_data",437,"len")=4
 	Set gtmtypes("sgmnt_data",437,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","wcb_t_end_sysops_intend_wait_cntr")=437
+	Set gtmtypes("sgmnt_data",438,"name")="sgmnt_data.wcb_secshr_db_clnup_phase2_clnup_cntr"
+	Set gtmtypes("sgmnt_data",438,"off")=3740
 	Set gtmtypes("sgmnt_data",438,"len")=4
 	Set gtmtypes("sgmnt_data",438,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","wcb_secshr_db_clnup_phase2_clnup_cntr")=438
+	Set gtmtypes("sgmnt_data",439,"name")="sgmnt_data.wcb_phase2_commit_wait_cntr"
+	Set gtmtypes("sgmnt_data",439,"off")=3744
 	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 gtmtypfldindx("sgmnt_data","wcb_phase2_commit_wait_cntr")=439
+	Set gtmtypes("sgmnt_data",440,"name")="sgmnt_data.recompute_upd_array_calls_cntr"
+	Set gtmtypes("sgmnt_data",440,"off")=3748
 	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 gtmtypfldindx("sgmnt_data","recompute_upd_array_calls_cntr")=440
+	Set gtmtypes("sgmnt_data",441,"name")="sgmnt_data.recompute_upd_array_rip_cntr"
+	Set gtmtypes("sgmnt_data",441,"off")=3752
 	Set gtmtypes("sgmnt_data",441,"len")=4
 	Set gtmtypes("sgmnt_data",441,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","recompute_upd_array_rip_cntr")=441
+	Set gtmtypes("sgmnt_data",442,"name")="sgmnt_data.recompute_upd_array_in_tend_cntr"
+	Set gtmtypes("sgmnt_data",442,"off")=3756
 	Set gtmtypes("sgmnt_data",442,"len")=4
 	Set gtmtypes("sgmnt_data",442,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","recompute_upd_array_in_tend_cntr")=442
+	Set gtmtypes("sgmnt_data",443,"name")="sgmnt_data.recompute_upd_array_search_blk_cntr"
+	Set gtmtypes("sgmnt_data",443,"off")=3760
 	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 gtmtypfldindx("sgmnt_data","recompute_upd_array_search_blk_cntr")=443
+	Set gtmtypes("sgmnt_data",444,"name")="sgmnt_data.recompute_upd_array_new_rec_cntr"
+	Set gtmtypes("sgmnt_data",444,"off")=3764
 	Set gtmtypes("sgmnt_data",444,"len")=4
 	Set gtmtypes("sgmnt_data",444,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","recompute_upd_array_new_rec_cntr")=444
+	Set gtmtypes("sgmnt_data",445,"name")="sgmnt_data.recompute_upd_array_rec_size_cntr"
+	Set gtmtypes("sgmnt_data",445,"off")=3768
 	Set gtmtypes("sgmnt_data",445,"len")=4
 	Set gtmtypes("sgmnt_data",445,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","recompute_upd_array_rec_size_cntr")=445
+	Set gtmtypes("sgmnt_data",446,"name")="sgmnt_data.recompute_upd_array_rec_cmpc_cntr"
+	Set gtmtypes("sgmnt_data",446,"off")=3772
 	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 gtmtypfldindx("sgmnt_data","recompute_upd_array_rec_cmpc_cntr")=446
+	Set gtmtypes("sgmnt_data",447,"name")="sgmnt_data.recompute_upd_array_blk_fini_cntr"
+	Set gtmtypes("sgmnt_data",447,"off")=3776
 	Set gtmtypes("sgmnt_data",447,"len")=4
 	Set gtmtypes("sgmnt_data",447,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","recompute_upd_array_blk_fini_cntr")=447
+	Set gtmtypes("sgmnt_data",448,"name")="sgmnt_data.recompute_upd_array_blk_split_cntr"
+	Set gtmtypes("sgmnt_data",448,"off")=3780
 	Set gtmtypes("sgmnt_data",448,"len")=4
 	Set gtmtypes("sgmnt_data",448,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","recompute_upd_array_blk_split_cntr")=448
+	Set gtmtypes("sgmnt_data",449,"name")="sgmnt_data.t_qread_ripsleep_cnt_cntr"
+	Set gtmtypes("sgmnt_data",449,"off")=3784
 	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 gtmtypfldindx("sgmnt_data","t_qread_ripsleep_cnt_cntr")=449
+	Set gtmtypes("sgmnt_data",450,"name")="sgmnt_data.t_qread_ripsleep_nblks_cntr"
+	Set gtmtypes("sgmnt_data",450,"off")=3788
 	Set gtmtypes("sgmnt_data",450,"len")=4
 	Set gtmtypes("sgmnt_data",450,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","t_qread_ripsleep_nblks_cntr")=450
+	Set gtmtypes("sgmnt_data",451,"name")="sgmnt_data.wcs_wtfini_invoked_cntr"
+	Set gtmtypes("sgmnt_data",451,"off")=3792
 	Set gtmtypes("sgmnt_data",451,"len")=4
 	Set gtmtypes("sgmnt_data",451,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","wcs_wtfini_invoked_cntr")=451
+	Set gtmtypes("sgmnt_data",452,"name")="sgmnt_data.wcs_wterror_invoked_cntr"
+	Set gtmtypes("sgmnt_data",452,"off")=3796
 	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 gtmtypfldindx("sgmnt_data","wcs_wterror_invoked_cntr")=452
+	Set gtmtypes("sgmnt_data",453,"name")="sgmnt_data.wcs_wt_restart_invoked_cntr"
+	Set gtmtypes("sgmnt_data",453,"off")=3800
 	Set gtmtypes("sgmnt_data",453,"len")=4
 	Set gtmtypes("sgmnt_data",453,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","wcs_wt_restart_invoked_cntr")=453
+	Set gtmtypes("sgmnt_data",454,"name")="sgmnt_data.wcs_wt_restart_eagain_cntr"
+	Set gtmtypes("sgmnt_data",454,"off")=3804
 	Set gtmtypes("sgmnt_data",454,"len")=4
 	Set gtmtypes("sgmnt_data",454,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","wcs_wt_restart_eagain_cntr")=454
+	Set gtmtypes("sgmnt_data",455,"name")="sgmnt_data.wcs_wt_restart_reinsert_cntr"
+	Set gtmtypes("sgmnt_data",455,"off")=3808
 	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 gtmtypfldindx("sgmnt_data","wcs_wt_restart_reinsert_cntr")=455
+	Set gtmtypes("sgmnt_data",456,"name")="sgmnt_data.wcs_wtstart_eagain_cntr"
+	Set gtmtypes("sgmnt_data",456,"off")=3812
+	Set gtmtypes("sgmnt_data",456,"len")=4
+	Set gtmtypes("sgmnt_data",456,"type")="int"
+	Set gtmtypfldindx("sgmnt_data","wcs_wtstart_eagain_cntr")=456
+	Set gtmtypes("sgmnt_data",457,"name")="sgmnt_data.wcs_wtstart_eagain_incrit_cntr"
+	Set gtmtypes("sgmnt_data",457,"off")=3816
+	Set gtmtypes("sgmnt_data",457,"len")=4
+	Set gtmtypes("sgmnt_data",457,"type")="int"
+	Set gtmtypfldindx("sgmnt_data","wcs_wtstart_eagain_incrit_cntr")=457
+	Set gtmtypes("sgmnt_data",458,"name")="sgmnt_data.async_restart_eagain_cntr"
+	Set gtmtypes("sgmnt_data",458,"off")=3820
 	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 gtmtypfldindx("sgmnt_data","async_restart_eagain_cntr")=458
+	Set gtmtypes("sgmnt_data",459,"name")="sgmnt_data.jnlbuff_phs2cmt_array_full_cntr"
+	Set gtmtypes("sgmnt_data",459,"off")=3824
 	Set gtmtypes("sgmnt_data",459,"len")=4
 	Set gtmtypes("sgmnt_data",459,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","jnlbuff_phs2cmt_array_full_cntr")=459
+	Set gtmtypes("sgmnt_data",460,"name")="sgmnt_data.jnl_phase2_cleanup_if_possible_cntr"
+	Set gtmtypes("sgmnt_data",460,"off")=3828
+	Set gtmtypes("sgmnt_data",460,"len")=4
+	Set gtmtypes("sgmnt_data",460,"type")="int"
+	Set gtmtypfldindx("sgmnt_data","jnl_phase2_cleanup_if_possible_cntr")=460
+	Set gtmtypes("sgmnt_data",461,"name")="sgmnt_data.jnlbuff_phs2cmt_isprcalv_cntr"
+	Set gtmtypes("sgmnt_data",461,"off")=3832
 	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_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 gtmtypfldindx("sgmnt_data","jnlbuff_phs2cmt_isprcalv_cntr")=461
+	Set gtmtypes("sgmnt_data",462,"name")="sgmnt_data.bg_trc_rec_cntr_filler"
+	Set gtmtypes("sgmnt_data",462,"off")=3836
+	Set gtmtypes("sgmnt_data",462,"len")=12
+	Set gtmtypes("sgmnt_data",462,"type")="char"
+	Set gtmtypfldindx("sgmnt_data","bg_trc_rec_cntr_filler")=462
+	Set gtmtypes("sgmnt_data",463,"name")="sgmnt_data.n_gvcst_srches"
+	Set gtmtypes("sgmnt_data",463,"off")=3848
 	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 gtmtypfldindx("sgmnt_data","n_gvcst_srches")=463
+	Set gtmtypes("sgmnt_data",464,"name")="sgmnt_data.n_gvcst_srches.curr_count"
+	Set gtmtypes("sgmnt_data",464,"off")=3848
 	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 gtmtypfldindx("sgmnt_data","n_gvcst_srches.curr_count")=464
+	Set gtmtypes("sgmnt_data",465,"name")="sgmnt_data.n_gvcst_srches.cumul_count"
+	Set gtmtypes("sgmnt_data",465,"off")=3852
 	Set gtmtypes("sgmnt_data",465,"len")=4
 	Set gtmtypes("sgmnt_data",465,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","n_gvcst_srches.cumul_count")=465
+	Set gtmtypes("sgmnt_data",466,"name")="sgmnt_data.n_gvcst_srch_clues"
+	Set gtmtypes("sgmnt_data",466,"off")=3856
 	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 gtmtypfldindx("sgmnt_data","n_gvcst_srch_clues")=466
+	Set gtmtypes("sgmnt_data",467,"name")="sgmnt_data.n_gvcst_srch_clues.curr_count"
+	Set gtmtypes("sgmnt_data",467,"off")=3856
 	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 gtmtypfldindx("sgmnt_data","n_gvcst_srch_clues.curr_count")=467
+	Set gtmtypes("sgmnt_data",468,"name")="sgmnt_data.n_gvcst_srch_clues.cumul_count"
+	Set gtmtypes("sgmnt_data",468,"off")=3860
 	Set gtmtypes("sgmnt_data",468,"len")=4
 	Set gtmtypes("sgmnt_data",468,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","n_gvcst_srch_clues.cumul_count")=468
+	Set gtmtypes("sgmnt_data",469,"name")="sgmnt_data.n_clue_used_head"
+	Set gtmtypes("sgmnt_data",469,"off")=3864
 	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 gtmtypfldindx("sgmnt_data","n_clue_used_head")=469
+	Set gtmtypes("sgmnt_data",470,"name")="sgmnt_data.n_clue_used_head.curr_count"
+	Set gtmtypes("sgmnt_data",470,"off")=3864
 	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 gtmtypfldindx("sgmnt_data","n_clue_used_head.curr_count")=470
+	Set gtmtypes("sgmnt_data",471,"name")="sgmnt_data.n_clue_used_head.cumul_count"
+	Set gtmtypes("sgmnt_data",471,"off")=3868
 	Set gtmtypes("sgmnt_data",471,"len")=4
 	Set gtmtypes("sgmnt_data",471,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","n_clue_used_head.cumul_count")=471
+	Set gtmtypes("sgmnt_data",472,"name")="sgmnt_data.n_clue_used_same"
+	Set gtmtypes("sgmnt_data",472,"off")=3872
 	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 gtmtypfldindx("sgmnt_data","n_clue_used_same")=472
+	Set gtmtypes("sgmnt_data",473,"name")="sgmnt_data.n_clue_used_same.curr_count"
+	Set gtmtypes("sgmnt_data",473,"off")=3872
 	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 gtmtypfldindx("sgmnt_data","n_clue_used_same.curr_count")=473
+	Set gtmtypes("sgmnt_data",474,"name")="sgmnt_data.n_clue_used_same.cumul_count"
+	Set gtmtypes("sgmnt_data",474,"off")=3876
 	Set gtmtypes("sgmnt_data",474,"len")=4
 	Set gtmtypes("sgmnt_data",474,"type")="int"
-	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 gtmtypfldindx("sgmnt_data","n_clue_used_same.cumul_count")=474
+	Set gtmtypes("sgmnt_data",475,"name")="sgmnt_data.n_clue_used_tail"
+	Set gtmtypes("sgmnt_data",475,"off")=3880
 	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 gtmtypfldindx("sgmnt_data","n_clue_used_tail")=475
+	Set gtmtypes("sgmnt_data",476,"name")="sgmnt_data.n_clue_used_tail.curr_count"
+	Set gtmtypes("sgmnt_data",476,"off")=3880
 	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 gtmtypfldindx("sgmnt_data","n_clue_used_tail.curr_count")=476
+	Set gtmtypes("sgmnt_data",477,"name")="sgmnt_data.n_clue_used_tail.cumul_count"
+	Set gtmtypes("sgmnt_data",477,"off")=3884
 	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 gtmtypfldindx("sgmnt_data","n_clue_used_tail.cumul_count")=477
+	Set gtmtypes("sgmnt_data",478,"name")="sgmnt_data.n_t_qreads"
+	Set gtmtypes("sgmnt_data",478,"off")=3888
 	Set gtmtypes("sgmnt_data",478,"len")=8
 	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 gtmtypfldindx("sgmnt_data","n_t_qreads")=478
+	Set gtmtypes("sgmnt_data",479,"name")="sgmnt_data.n_t_qreads.curr_count"
+	Set gtmtypes("sgmnt_data",479,"off")=3888
 	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 gtmtypfldindx("sgmnt_data","n_t_qreads.curr_count")=479
+	Set gtmtypes("sgmnt_data",480,"name")="sgmnt_data.n_t_qreads.cumul_count"
+	Set gtmtypes("sgmnt_data",480,"off")=3892
 	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 gtmtypfldindx("sgmnt_data","n_t_qreads.cumul_count")=480
+	Set gtmtypes("sgmnt_data",481,"name")="sgmnt_data.unused_dsk_reads"
+	Set gtmtypes("sgmnt_data",481,"off")=3896
 	Set gtmtypes("sgmnt_data",481,"len")=8
 	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 gtmtypfldindx("sgmnt_data","unused_dsk_reads")=481
+	Set gtmtypes("sgmnt_data",482,"name")="sgmnt_data.unused_dsk_reads.curr_count"
+	Set gtmtypes("sgmnt_data",482,"off")=3896
 	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 gtmtypfldindx("sgmnt_data","unused_dsk_reads.curr_count")=482
+	Set gtmtypes("sgmnt_data",483,"name")="sgmnt_data.unused_dsk_reads.cumul_count"
+	Set gtmtypes("sgmnt_data",483,"off")=3900
 	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 gtmtypfldindx("sgmnt_data","unused_dsk_reads.cumul_count")=483
+	Set gtmtypes("sgmnt_data",484,"name")="sgmnt_data.n_bgmm_updates"
+	Set gtmtypes("sgmnt_data",484,"off")=3904
 	Set gtmtypes("sgmnt_data",484,"len")=8
 	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 gtmtypfldindx("sgmnt_data","n_bgmm_updates")=484
+	Set gtmtypes("sgmnt_data",485,"name")="sgmnt_data.n_bgmm_updates.curr_count"
+	Set gtmtypes("sgmnt_data",485,"off")=3904
 	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 gtmtypfldindx("sgmnt_data","n_bgmm_updates.curr_count")=485
+	Set gtmtypes("sgmnt_data",486,"name")="sgmnt_data.n_bgmm_updates.cumul_count"
+	Set gtmtypes("sgmnt_data",486,"off")=3908
 	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 gtmtypfldindx("sgmnt_data","n_bgmm_updates.cumul_count")=486
+	Set gtmtypes("sgmnt_data",487,"name")="sgmnt_data.unused_dsk_writes"
+	Set gtmtypes("sgmnt_data",487,"off")=3912
 	Set gtmtypes("sgmnt_data",487,"len")=8
 	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 gtmtypfldindx("sgmnt_data","unused_dsk_writes")=487
+	Set gtmtypes("sgmnt_data",488,"name")="sgmnt_data.unused_dsk_writes.curr_count"
+	Set gtmtypes("sgmnt_data",488,"off")=3912
 	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 gtmtypfldindx("sgmnt_data","unused_dsk_writes.curr_count")=488
+	Set gtmtypes("sgmnt_data",489,"name")="sgmnt_data.unused_dsk_writes.cumul_count"
+	Set gtmtypes("sgmnt_data",489,"off")=3916
 	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 gtmtypfldindx("sgmnt_data","unused_dsk_writes.cumul_count")=489
+	Set gtmtypes("sgmnt_data",490,"name")="sgmnt_data.n_bg_update_creates"
+	Set gtmtypes("sgmnt_data",490,"off")=3920
 	Set gtmtypes("sgmnt_data",490,"len")=8
 	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 gtmtypfldindx("sgmnt_data","n_bg_update_creates")=490
+	Set gtmtypes("sgmnt_data",491,"name")="sgmnt_data.n_bg_update_creates.curr_count"
+	Set gtmtypes("sgmnt_data",491,"off")=3920
 	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 gtmtypfldindx("sgmnt_data","n_bg_update_creates.curr_count")=491
+	Set gtmtypes("sgmnt_data",492,"name")="sgmnt_data.n_bg_update_creates.cumul_count"
+	Set gtmtypes("sgmnt_data",492,"off")=3924
 	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_set")=495
-	Set gtmtypes("sgmnt_data",496,"name")="sgmnt_data.gvstats_rec.n_kill"
-	Set gtmtypes("sgmnt_data",496,"off")=4104
+	Set gtmtypfldindx("sgmnt_data","n_bg_update_creates.cumul_count")=492
+	Set gtmtypes("sgmnt_data",493,"name")="sgmnt_data.n_db_csh_getns"
+	Set gtmtypes("sgmnt_data",493,"off")=3928
+	Set gtmtypes("sgmnt_data",493,"len")=8
+	Set gtmtypes("sgmnt_data",493,"type")="db_csh_acct_rec"
+	Set gtmtypfldindx("sgmnt_data","n_db_csh_getns")=493
+	Set gtmtypes("sgmnt_data",494,"name")="sgmnt_data.n_db_csh_getns.curr_count"
+	Set gtmtypes("sgmnt_data",494,"off")=3928
+	Set gtmtypes("sgmnt_data",494,"len")=4
+	Set gtmtypes("sgmnt_data",494,"type")="int"
+	Set gtmtypfldindx("sgmnt_data","n_db_csh_getns.curr_count")=494
+	Set gtmtypes("sgmnt_data",495,"name")="sgmnt_data.n_db_csh_getns.cumul_count"
+	Set gtmtypes("sgmnt_data",495,"off")=3932
+	Set gtmtypes("sgmnt_data",495,"len")=4
+	Set gtmtypes("sgmnt_data",495,"type")="int"
+	Set gtmtypfldindx("sgmnt_data","n_db_csh_getns.cumul_count")=495
+	Set gtmtypes("sgmnt_data",496,"name")="sgmnt_data.n_db_csh_getn_lcnt"
+	Set gtmtypes("sgmnt_data",496,"off")=3936
 	Set gtmtypes("sgmnt_data",496,"len")=8
-	Set gtmtypes("sgmnt_data",496,"type")="uint64_t"
-	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_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_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_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_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",496,"type")="db_csh_acct_rec"
+	Set gtmtypfldindx("sgmnt_data","n_db_csh_getn_lcnt")=496
+	Set gtmtypes("sgmnt_data",497,"name")="sgmnt_data.n_db_csh_getn_lcnt.curr_count"
+	Set gtmtypes("sgmnt_data",497,"off")=3936
+	Set gtmtypes("sgmnt_data",497,"len")=4
+	Set gtmtypes("sgmnt_data",497,"type")="int"
+	Set gtmtypfldindx("sgmnt_data","n_db_csh_getn_lcnt.curr_count")=497
+	Set gtmtypes("sgmnt_data",498,"name")="sgmnt_data.n_db_csh_getn_lcnt.cumul_count"
+	Set gtmtypes("sgmnt_data",498,"off")=3940
+	Set gtmtypes("sgmnt_data",498,"len")=4
+	Set gtmtypes("sgmnt_data",498,"type")="int"
+	Set gtmtypfldindx("sgmnt_data","n_db_csh_getn_lcnt.cumul_count")=498
+	Set gtmtypes("sgmnt_data",499,"name")="sgmnt_data.db_csh_acct_rec_filler_4k"
+	Set gtmtypes("sgmnt_data",499,"off")=3944
+	Set gtmtypes("sgmnt_data",499,"len")=152
+	Set gtmtypes("sgmnt_data",499,"type")="char"
+	Set gtmtypfldindx("sgmnt_data","db_csh_acct_rec_filler_4k")=499
+	Set gtmtypes("sgmnt_data",500,"name")="sgmnt_data.gvstats_rec"
+	Set gtmtypes("sgmnt_data",500,"off")=4096
+	Set gtmtypes("sgmnt_data",500,"len")=472
+	Set gtmtypes("sgmnt_data",500,"type")="gvstats_rec_t"
+	Set gtmtypfldindx("sgmnt_data","gvstats_rec")=500
+	Set gtmtypes("sgmnt_data",501,"name")="sgmnt_data.gvstats_rec.n_set"
+	Set gtmtypes("sgmnt_data",501,"off")=4096
 	Set gtmtypes("sgmnt_data",501,"len")=8
 	Set gtmtypes("sgmnt_data",501,"type")="uint64_t"
-	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 gtmtypfldindx("sgmnt_data","gvstats_rec.n_set")=501
+	Set gtmtypes("sgmnt_data",502,"name")="sgmnt_data.gvstats_rec.n_kill"
+	Set gtmtypes("sgmnt_data",502,"off")=4104
 	Set gtmtypes("sgmnt_data",502,"len")=8
 	Set gtmtypes("sgmnt_data",502,"type")="uint64_t"
-	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 gtmtypfldindx("sgmnt_data","gvstats_rec.n_kill")=502
+	Set gtmtypes("sgmnt_data",503,"name")="sgmnt_data.gvstats_rec.n_get"
+	Set gtmtypes("sgmnt_data",503,"off")=4112
 	Set gtmtypes("sgmnt_data",503,"len")=8
 	Set gtmtypes("sgmnt_data",503,"type")="uint64_t"
-	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 gtmtypfldindx("sgmnt_data","gvstats_rec.n_get")=503
+	Set gtmtypes("sgmnt_data",504,"name")="sgmnt_data.gvstats_rec.n_data"
+	Set gtmtypes("sgmnt_data",504,"off")=4120
 	Set gtmtypes("sgmnt_data",504,"len")=8
 	Set gtmtypes("sgmnt_data",504,"type")="uint64_t"
-	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 gtmtypfldindx("sgmnt_data","gvstats_rec.n_data")=504
+	Set gtmtypes("sgmnt_data",505,"name")="sgmnt_data.gvstats_rec.n_order"
+	Set gtmtypes("sgmnt_data",505,"off")=4128
 	Set gtmtypes("sgmnt_data",505,"len")=8
 	Set gtmtypes("sgmnt_data",505,"type")="uint64_t"
-	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 gtmtypfldindx("sgmnt_data","gvstats_rec.n_order")=505
+	Set gtmtypes("sgmnt_data",506,"name")="sgmnt_data.gvstats_rec.n_zprev"
+	Set gtmtypes("sgmnt_data",506,"off")=4136
 	Set gtmtypes("sgmnt_data",506,"len")=8
 	Set gtmtypes("sgmnt_data",506,"type")="uint64_t"
-	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 gtmtypfldindx("sgmnt_data","gvstats_rec.n_zprev")=506
+	Set gtmtypes("sgmnt_data",507,"name")="sgmnt_data.gvstats_rec.n_query"
+	Set gtmtypes("sgmnt_data",507,"off")=4144
 	Set gtmtypes("sgmnt_data",507,"len")=8
 	Set gtmtypes("sgmnt_data",507,"type")="uint64_t"
-	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 gtmtypfldindx("sgmnt_data","gvstats_rec.n_query")=507
+	Set gtmtypes("sgmnt_data",508,"name")="sgmnt_data.gvstats_rec.n_lock_success"
+	Set gtmtypes("sgmnt_data",508,"off")=4152
 	Set gtmtypes("sgmnt_data",508,"len")=8
 	Set gtmtypes("sgmnt_data",508,"type")="uint64_t"
-	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 gtmtypfldindx("sgmnt_data","gvstats_rec.n_lock_success")=508
+	Set gtmtypes("sgmnt_data",509,"name")="sgmnt_data.gvstats_rec.n_lock_fail"
+	Set gtmtypes("sgmnt_data",509,"off")=4160
 	Set gtmtypes("sgmnt_data",509,"len")=8
 	Set gtmtypes("sgmnt_data",509,"type")="uint64_t"
-	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 gtmtypfldindx("sgmnt_data","gvstats_rec.n_lock_fail")=509
+	Set gtmtypes("sgmnt_data",510,"name")="sgmnt_data.gvstats_rec.db_curr_tn"
+	Set gtmtypes("sgmnt_data",510,"off")=4168
 	Set gtmtypes("sgmnt_data",510,"len")=8
 	Set gtmtypes("sgmnt_data",510,"type")="uint64_t"
-	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 gtmtypfldindx("sgmnt_data","gvstats_rec.db_curr_tn")=510
+	Set gtmtypes("sgmnt_data",511,"name")="sgmnt_data.gvstats_rec.n_dsk_read"
+	Set gtmtypes("sgmnt_data",511,"off")=4176
 	Set gtmtypes("sgmnt_data",511,"len")=8
 	Set gtmtypes("sgmnt_data",511,"type")="uint64_t"
-	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 gtmtypfldindx("sgmnt_data","gvstats_rec.n_dsk_read")=511
+	Set gtmtypes("sgmnt_data",512,"name")="sgmnt_data.gvstats_rec.n_dsk_write"
+	Set gtmtypes("sgmnt_data",512,"off")=4184
 	Set gtmtypes("sgmnt_data",512,"len")=8
 	Set gtmtypes("sgmnt_data",512,"type")="uint64_t"
-	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 gtmtypfldindx("sgmnt_data","gvstats_rec.n_dsk_write")=512
+	Set gtmtypes("sgmnt_data",513,"name")="sgmnt_data.gvstats_rec.n_nontp_readwrite"
+	Set gtmtypes("sgmnt_data",513,"off")=4192
 	Set gtmtypes("sgmnt_data",513,"len")=8
 	Set gtmtypes("sgmnt_data",513,"type")="uint64_t"
-	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 gtmtypfldindx("sgmnt_data","gvstats_rec.n_nontp_readwrite")=513
+	Set gtmtypes("sgmnt_data",514,"name")="sgmnt_data.gvstats_rec.n_nontp_readonly"
+	Set gtmtypes("sgmnt_data",514,"off")=4200
 	Set gtmtypes("sgmnt_data",514,"len")=8
 	Set gtmtypes("sgmnt_data",514,"type")="uint64_t"
-	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 gtmtypfldindx("sgmnt_data","gvstats_rec.n_nontp_readonly")=514
+	Set gtmtypes("sgmnt_data",515,"name")="sgmnt_data.gvstats_rec.n_nontp_blkwrite"
+	Set gtmtypes("sgmnt_data",515,"off")=4208
 	Set gtmtypes("sgmnt_data",515,"len")=8
 	Set gtmtypes("sgmnt_data",515,"type")="uint64_t"
-	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 gtmtypfldindx("sgmnt_data","gvstats_rec.n_nontp_blkwrite")=515
+	Set gtmtypes("sgmnt_data",516,"name")="sgmnt_data.gvstats_rec.n_nontp_blkread"
+	Set gtmtypes("sgmnt_data",516,"off")=4216
 	Set gtmtypes("sgmnt_data",516,"len")=8
 	Set gtmtypes("sgmnt_data",516,"type")="uint64_t"
-	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 gtmtypfldindx("sgmnt_data","gvstats_rec.n_nontp_blkread")=516
+	Set gtmtypes("sgmnt_data",517,"name")="sgmnt_data.gvstats_rec.n_nontp_retries_0"
+	Set gtmtypes("sgmnt_data",517,"off")=4224
 	Set gtmtypes("sgmnt_data",517,"len")=8
 	Set gtmtypes("sgmnt_data",517,"type")="uint64_t"
-	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 gtmtypfldindx("sgmnt_data","gvstats_rec.n_nontp_retries_0")=517
+	Set gtmtypes("sgmnt_data",518,"name")="sgmnt_data.gvstats_rec.n_nontp_retries_1"
+	Set gtmtypes("sgmnt_data",518,"off")=4232
 	Set gtmtypes("sgmnt_data",518,"len")=8
 	Set gtmtypes("sgmnt_data",518,"type")="uint64_t"
-	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 gtmtypfldindx("sgmnt_data","gvstats_rec.n_nontp_retries_1")=518
+	Set gtmtypes("sgmnt_data",519,"name")="sgmnt_data.gvstats_rec.n_nontp_retries_2"
+	Set gtmtypes("sgmnt_data",519,"off")=4240
 	Set gtmtypes("sgmnt_data",519,"len")=8
 	Set gtmtypes("sgmnt_data",519,"type")="uint64_t"
-	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 gtmtypfldindx("sgmnt_data","gvstats_rec.n_nontp_retries_2")=519
+	Set gtmtypes("sgmnt_data",520,"name")="sgmnt_data.gvstats_rec.n_nontp_retries_3"
+	Set gtmtypes("sgmnt_data",520,"off")=4248
 	Set gtmtypes("sgmnt_data",520,"len")=8
 	Set gtmtypes("sgmnt_data",520,"type")="uint64_t"
-	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 gtmtypfldindx("sgmnt_data","gvstats_rec.n_nontp_retries_3")=520
+	Set gtmtypes("sgmnt_data",521,"name")="sgmnt_data.gvstats_rec.n_tp_readwrite"
+	Set gtmtypes("sgmnt_data",521,"off")=4256
 	Set gtmtypes("sgmnt_data",521,"len")=8
 	Set gtmtypes("sgmnt_data",521,"type")="uint64_t"
-	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 gtmtypfldindx("sgmnt_data","gvstats_rec.n_tp_readwrite")=521
+	Set gtmtypes("sgmnt_data",522,"name")="sgmnt_data.gvstats_rec.n_tp_readonly"
+	Set gtmtypes("sgmnt_data",522,"off")=4264
 	Set gtmtypes("sgmnt_data",522,"len")=8
 	Set gtmtypes("sgmnt_data",522,"type")="uint64_t"
-	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 gtmtypfldindx("sgmnt_data","gvstats_rec.n_tp_readonly")=522
+	Set gtmtypes("sgmnt_data",523,"name")="sgmnt_data.gvstats_rec.n_tp_rolledback"
+	Set gtmtypes("sgmnt_data",523,"off")=4272
 	Set gtmtypes("sgmnt_data",523,"len")=8
 	Set gtmtypes("sgmnt_data",523,"type")="uint64_t"
-	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 gtmtypfldindx("sgmnt_data","gvstats_rec.n_tp_rolledback")=523
+	Set gtmtypes("sgmnt_data",524,"name")="sgmnt_data.gvstats_rec.n_tp_blkwrite"
+	Set gtmtypes("sgmnt_data",524,"off")=4280
 	Set gtmtypes("sgmnt_data",524,"len")=8
 	Set gtmtypes("sgmnt_data",524,"type")="uint64_t"
-	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 gtmtypfldindx("sgmnt_data","gvstats_rec.n_tp_blkwrite")=524
+	Set gtmtypes("sgmnt_data",525,"name")="sgmnt_data.gvstats_rec.n_tp_blkread"
+	Set gtmtypes("sgmnt_data",525,"off")=4288
 	Set gtmtypes("sgmnt_data",525,"len")=8
 	Set gtmtypes("sgmnt_data",525,"type")="uint64_t"
-	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 gtmtypfldindx("sgmnt_data","gvstats_rec.n_tp_blkread")=525
+	Set gtmtypes("sgmnt_data",526,"name")="sgmnt_data.gvstats_rec.n_tp_tot_retries_0"
+	Set gtmtypes("sgmnt_data",526,"off")=4296
 	Set gtmtypes("sgmnt_data",526,"len")=8
 	Set gtmtypes("sgmnt_data",526,"type")="uint64_t"
-	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 gtmtypfldindx("sgmnt_data","gvstats_rec.n_tp_tot_retries_0")=526
+	Set gtmtypes("sgmnt_data",527,"name")="sgmnt_data.gvstats_rec.n_tp_tot_retries_1"
+	Set gtmtypes("sgmnt_data",527,"off")=4304
 	Set gtmtypes("sgmnt_data",527,"len")=8
 	Set gtmtypes("sgmnt_data",527,"type")="uint64_t"
-	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 gtmtypfldindx("sgmnt_data","gvstats_rec.n_tp_tot_retries_1")=527
+	Set gtmtypes("sgmnt_data",528,"name")="sgmnt_data.gvstats_rec.n_tp_tot_retries_2"
+	Set gtmtypes("sgmnt_data",528,"off")=4312
 	Set gtmtypes("sgmnt_data",528,"len")=8
 	Set gtmtypes("sgmnt_data",528,"type")="uint64_t"
-	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 gtmtypfldindx("sgmnt_data","gvstats_rec.n_tp_tot_retries_2")=528
+	Set gtmtypes("sgmnt_data",529,"name")="sgmnt_data.gvstats_rec.n_tp_tot_retries_3"
+	Set gtmtypes("sgmnt_data",529,"off")=4320
 	Set gtmtypes("sgmnt_data",529,"len")=8
 	Set gtmtypes("sgmnt_data",529,"type")="uint64_t"
-	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 gtmtypfldindx("sgmnt_data","gvstats_rec.n_tp_tot_retries_3")=529
+	Set gtmtypes("sgmnt_data",530,"name")="sgmnt_data.gvstats_rec.n_tp_tot_retries_4"
+	Set gtmtypes("sgmnt_data",530,"off")=4328
 	Set gtmtypes("sgmnt_data",530,"len")=8
 	Set gtmtypes("sgmnt_data",530,"type")="uint64_t"
-	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 gtmtypfldindx("sgmnt_data","gvstats_rec.n_tp_tot_retries_4")=530
+	Set gtmtypes("sgmnt_data",531,"name")="sgmnt_data.gvstats_rec.n_tp_cnflct_retries_0"
+	Set gtmtypes("sgmnt_data",531,"off")=4336
 	Set gtmtypes("sgmnt_data",531,"len")=8
 	Set gtmtypes("sgmnt_data",531,"type")="uint64_t"
-	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 gtmtypfldindx("sgmnt_data","gvstats_rec.n_tp_cnflct_retries_0")=531
+	Set gtmtypes("sgmnt_data",532,"name")="sgmnt_data.gvstats_rec.n_tp_cnflct_retries_1"
+	Set gtmtypes("sgmnt_data",532,"off")=4344
 	Set gtmtypes("sgmnt_data",532,"len")=8
 	Set gtmtypes("sgmnt_data",532,"type")="uint64_t"
-	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 gtmtypfldindx("sgmnt_data","gvstats_rec.n_tp_cnflct_retries_1")=532
+	Set gtmtypes("sgmnt_data",533,"name")="sgmnt_data.gvstats_rec.n_tp_cnflct_retries_2"
+	Set gtmtypes("sgmnt_data",533,"off")=4352
 	Set gtmtypes("sgmnt_data",533,"len")=8
 	Set gtmtypes("sgmnt_data",533,"type")="uint64_t"
-	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 gtmtypfldindx("sgmnt_data","gvstats_rec.n_tp_cnflct_retries_2")=533
+	Set gtmtypes("sgmnt_data",534,"name")="sgmnt_data.gvstats_rec.n_tp_cnflct_retries_3"
+	Set gtmtypes("sgmnt_data",534,"off")=4360
 	Set gtmtypes("sgmnt_data",534,"len")=8
 	Set gtmtypes("sgmnt_data",534,"type")="uint64_t"
-	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 gtmtypfldindx("sgmnt_data","gvstats_rec.n_tp_cnflct_retries_3")=534
+	Set gtmtypes("sgmnt_data",535,"name")="sgmnt_data.gvstats_rec.n_tp_cnflct_retries_4"
+	Set gtmtypes("sgmnt_data",535,"off")=4368
 	Set gtmtypes("sgmnt_data",535,"len")=8
 	Set gtmtypes("sgmnt_data",535,"type")="uint64_t"
-	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 gtmtypfldindx("sgmnt_data","gvstats_rec.n_tp_cnflct_retries_4")=535
+	Set gtmtypes("sgmnt_data",536,"name")="sgmnt_data.gvstats_rec.n_ztrigger"
+	Set gtmtypes("sgmnt_data",536,"off")=4376
 	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 gtmtypfldindx("sgmnt_data","gvstats_rec.n_ztrigger")=536
+	Set gtmtypes("sgmnt_data",537,"name")="sgmnt_data.gvstats_rec.n_db_flush"
+	Set gtmtypes("sgmnt_data",537,"off")=4384
 	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 gtmtypfldindx("sgmnt_data","gvstats_rec.n_db_flush")=537
+	Set gtmtypes("sgmnt_data",538,"name")="sgmnt_data.gvstats_rec.n_db_fsync"
+	Set gtmtypes("sgmnt_data",538,"off")=4392
 	Set gtmtypes("sgmnt_data",538,"len")=8
 	Set gtmtypes("sgmnt_data",538,"type")="uint64_t"
-	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 gtmtypfldindx("sgmnt_data","gvstats_rec.n_db_fsync")=538
+	Set gtmtypes("sgmnt_data",539,"name")="sgmnt_data.gvstats_rec.n_jnl_flush"
+	Set gtmtypes("sgmnt_data",539,"off")=4400
 	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 gtmtypfldindx("sgmnt_data","gvstats_rec.n_jnl_flush")=539
+	Set gtmtypes("sgmnt_data",540,"name")="sgmnt_data.gvstats_rec.n_jnl_fsync"
+	Set gtmtypes("sgmnt_data",540,"off")=4408
 	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 gtmtypfldindx("sgmnt_data","gvstats_rec.n_jnl_fsync")=540
+	Set gtmtypes("sgmnt_data",541,"name")="sgmnt_data.gvstats_rec.n_jbuff_bytes"
+	Set gtmtypes("sgmnt_data",541,"off")=4416
 	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 gtmtypfldindx("sgmnt_data","gvstats_rec.n_jbuff_bytes")=541
+	Set gtmtypes("sgmnt_data",542,"name")="sgmnt_data.gvstats_rec.n_jfile_bytes"
+	Set gtmtypes("sgmnt_data",542,"off")=4424
 	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 gtmtypfldindx("sgmnt_data","gvstats_rec.n_jfile_bytes")=542
+	Set gtmtypes("sgmnt_data",543,"name")="sgmnt_data.gvstats_rec.n_jfile_writes"
+	Set gtmtypes("sgmnt_data",543,"off")=4432
 	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 gtmtypfldindx("sgmnt_data","gvstats_rec.n_jfile_writes")=543
+	Set gtmtypes("sgmnt_data",544,"name")="sgmnt_data.gvstats_rec.n_jrec_logical"
+	Set gtmtypes("sgmnt_data",544,"off")=4440
 	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 gtmtypfldindx("sgmnt_data","gvstats_rec.n_jrec_logical")=544
+	Set gtmtypes("sgmnt_data",545,"name")="sgmnt_data.gvstats_rec.n_jrec_pblk"
+	Set gtmtypes("sgmnt_data",545,"off")=4448
 	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 gtmtypfldindx("sgmnt_data","gvstats_rec.n_jrec_pblk")=545
+	Set gtmtypes("sgmnt_data",546,"name")="sgmnt_data.gvstats_rec.n_jrec_epoch_regular"
+	Set gtmtypes("sgmnt_data",546,"off")=4456
 	Set gtmtypes("sgmnt_data",546,"len")=8
 	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 gtmtypfldindx("sgmnt_data","gvstats_rec.n_jrec_epoch_regular")=546
+	Set gtmtypes("sgmnt_data",547,"name")="sgmnt_data.gvstats_rec.n_jrec_epoch_idle"
+	Set gtmtypes("sgmnt_data",547,"off")=4464
 	Set gtmtypes("sgmnt_data",547,"len")=8
 	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 gtmtypfldindx("sgmnt_data","gvstats_rec.n_jrec_epoch_idle")=547
+	Set gtmtypes("sgmnt_data",548,"name")="sgmnt_data.gvstats_rec.n_jrec_other"
+	Set gtmtypes("sgmnt_data",548,"off")=4472
 	Set gtmtypes("sgmnt_data",548,"len")=8
 	Set gtmtypes("sgmnt_data",548,"type")="uint64_t"
-	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 gtmtypfldindx("sgmnt_data","gvstats_rec.n_jrec_other")=548
+	Set gtmtypes("sgmnt_data",549,"name")="sgmnt_data.gvstats_rec.n_jnl_extends"
+	Set gtmtypes("sgmnt_data",549,"off")=4480
 	Set gtmtypes("sgmnt_data",549,"len")=8
 	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 gtmtypfldindx("sgmnt_data","gvstats_rec.n_jnl_extends")=549
+	Set gtmtypes("sgmnt_data",550,"name")="sgmnt_data.gvstats_rec.n_db_extends"
+	Set gtmtypes("sgmnt_data",550,"off")=4488
 	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 gtmtypfldindx("sgmnt_data","gvstats_rec.n_db_extends")=550
+	Set gtmtypes("sgmnt_data",551,"name")="sgmnt_data.gvstats_rec.n_crit_success"
+	Set gtmtypes("sgmnt_data",551,"off")=4496
 	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 gtmtypfldindx("sgmnt_data","gvstats_rec.n_crit_success")=551
+	Set gtmtypes("sgmnt_data",552,"name")="sgmnt_data.gvstats_rec.n_crits_in_epch"
+	Set gtmtypes("sgmnt_data",552,"off")=4504
 	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 gtmtypfldindx("sgmnt_data","gvstats_rec.n_crits_in_epch")=552
+	Set gtmtypes("sgmnt_data",553,"name")="sgmnt_data.gvstats_rec.sq_crit_failed"
+	Set gtmtypes("sgmnt_data",553,"off")=4512
 	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 gtmtypfldindx("sgmnt_data","gvstats_rec.sq_crit_failed")=553
+	Set gtmtypes("sgmnt_data",554,"name")="sgmnt_data.gvstats_rec.n_crit_failed"
+	Set gtmtypes("sgmnt_data",554,"off")=4520
+	Set gtmtypes("sgmnt_data",554,"len")=8
+	Set gtmtypes("sgmnt_data",554,"type")="uint64_t"
+	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_crit_failed")=554
+	Set gtmtypes("sgmnt_data",555,"name")="sgmnt_data.gvstats_rec.sq_crit_que_slps"
+	Set gtmtypes("sgmnt_data",555,"off")=4528
+	Set gtmtypes("sgmnt_data",555,"len")=8
+	Set gtmtypes("sgmnt_data",555,"type")="uint64_t"
+	Set gtmtypfldindx("sgmnt_data","gvstats_rec.sq_crit_que_slps")=555
+	Set gtmtypes("sgmnt_data",556,"name")="sgmnt_data.gvstats_rec.n_crit_que_slps"
+	Set gtmtypes("sgmnt_data",556,"off")=4536
+	Set gtmtypes("sgmnt_data",556,"len")=8
 	Set gtmtypes("sgmnt_data",556,"type")="uint64_t"
-	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.creation_db_ver"
-	Set gtmtypes("sgmnt_data",557,"off")=5104
-	Set gtmtypes("sgmnt_data",557,"len")=4
-	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")="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")="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")="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")="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 gtmtypfldindx("sgmnt_data","gvstats_rec.n_crit_que_slps")=556
+	Set gtmtypes("sgmnt_data",557,"name")="sgmnt_data.gvstats_rec.sq_crit_yields"
+	Set gtmtypes("sgmnt_data",557,"off")=4544
+	Set gtmtypes("sgmnt_data",557,"len")=8
+	Set gtmtypes("sgmnt_data",557,"type")="uint64_t"
+	Set gtmtypfldindx("sgmnt_data","gvstats_rec.sq_crit_yields")=557
+	Set gtmtypes("sgmnt_data",558,"name")="sgmnt_data.gvstats_rec.n_crit_yields"
+	Set gtmtypes("sgmnt_data",558,"off")=4552
+	Set gtmtypes("sgmnt_data",558,"len")=8
+	Set gtmtypes("sgmnt_data",558,"type")="uint64_t"
+	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_crit_yields")=558
+	Set gtmtypes("sgmnt_data",559,"name")="sgmnt_data.gvstats_rec.n_clean2dirty"
+	Set gtmtypes("sgmnt_data",559,"off")=4560
+	Set gtmtypes("sgmnt_data",559,"len")=8
+	Set gtmtypes("sgmnt_data",559,"type")="uint64_t"
+	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_clean2dirty")=559
+	Set gtmtypes("sgmnt_data",560,"name")="sgmnt_data.gvstats_rec_filler_4k_plus_512"
+	Set gtmtypes("sgmnt_data",560,"off")=4568
+	Set gtmtypes("sgmnt_data",560,"len")=40
+	Set gtmtypes("sgmnt_data",560,"type")="char"
+	Set gtmtypfldindx("sgmnt_data","gvstats_rec_filler_4k_plus_512")=560
+	Set gtmtypes("sgmnt_data",561,"name")="sgmnt_data.filler_4k_plus_512"
+	Set gtmtypes("sgmnt_data",561,"off")=4608
+	Set gtmtypes("sgmnt_data",561,"len")=368
+	Set gtmtypes("sgmnt_data",561,"type")="char"
+	Set gtmtypfldindx("sgmnt_data","filler_4k_plus_512")=561
+	Set gtmtypes("sgmnt_data",562,"name")="sgmnt_data.intrpt_recov_resync_strm_seqno"
+	Set gtmtypes("sgmnt_data",562,"off")=4976
+	Set gtmtypes("sgmnt_data",562,"len")=128
+	Set gtmtypes("sgmnt_data",562,"type")="uint64_t"
+	Set gtmtypfldindx("sgmnt_data","intrpt_recov_resync_strm_seqno")=562
+	Set gtmtypes("sgmnt_data",562,"dim")=16
+	Set gtmtypes("sgmnt_data",563,"name")="sgmnt_data.creation_db_ver"
+	Set gtmtypes("sgmnt_data",563,"off")=5104
+	Set gtmtypes("sgmnt_data",563,"len")=4
+	Set gtmtypes("sgmnt_data",563,"type")="int"
+	Set gtmtypfldindx("sgmnt_data","creation_db_ver")=563
+	Set gtmtypes("sgmnt_data",564,"name")="sgmnt_data.creation_mdb_ver"
+	Set gtmtypes("sgmnt_data",564,"off")=5108
+	Set gtmtypes("sgmnt_data",564,"len")=4
+	Set gtmtypes("sgmnt_data",564,"type")="int"
+	Set gtmtypfldindx("sgmnt_data","creation_mdb_ver")=564
+	Set gtmtypes("sgmnt_data",565,"name")="sgmnt_data.certified_for_upgrade_to"
+	Set gtmtypes("sgmnt_data",565,"off")=5112
+	Set gtmtypes("sgmnt_data",565,"len")=4
+	Set gtmtypes("sgmnt_data",565,"type")="int"
+	Set gtmtypfldindx("sgmnt_data","certified_for_upgrade_to")=565
+	Set gtmtypes("sgmnt_data",566,"name")="sgmnt_data.filler_5k"
+	Set gtmtypes("sgmnt_data",566,"off")=5116
+	Set gtmtypes("sgmnt_data",566,"len")=4
+	Set gtmtypes("sgmnt_data",566,"type")="int"
+	Set gtmtypfldindx("sgmnt_data","filler_5k")=566
+	Set gtmtypes("sgmnt_data",567,"name")="sgmnt_data.secshr_ops_index_filler"
+	Set gtmtypes("sgmnt_data",567,"off")=5120
+	Set gtmtypes("sgmnt_data",567,"len")=4
+	Set gtmtypes("sgmnt_data",567,"type")="int"
+	Set gtmtypfldindx("sgmnt_data","secshr_ops_index_filler")=567
+	Set gtmtypes("sgmnt_data",568,"name")="sgmnt_data.secshr_ops_array_filler"
+	Set gtmtypes("sgmnt_data",568,"off")=5124
+	Set gtmtypes("sgmnt_data",568,"len")=1020
 	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 gtmtypfldindx("sgmnt_data","secshr_ops_array_filler")=568
+	Set gtmtypes("sgmnt_data",568,"dim")=255
+	Set gtmtypes("sgmnt_data",569,"name")="sgmnt_data.next_upgrd_warn"
+	Set gtmtypes("sgmnt_data",569,"off")=6144
+	Set gtmtypes("sgmnt_data",569,"len")=24
+	Set gtmtypes("sgmnt_data",569,"type")="compswap_time_field"
+	Set gtmtypfldindx("sgmnt_data","next_upgrd_warn")=569
+	Set gtmtypes("sgmnt_data",570,"name")="sgmnt_data.next_upgrd_warn.time_latch"
+	Set gtmtypes("sgmnt_data",570,"off")=6144
+	Set gtmtypes("sgmnt_data",570,"len")=8
+	Set gtmtypes("sgmnt_data",570,"type")="global_latch_t"
+	Set gtmtypfldindx("sgmnt_data","next_upgrd_warn.time_latch")=570
+	Set gtmtypes("sgmnt_data",571,"name")="sgmnt_data.next_upgrd_warn.time_latch.u"
+	Set gtmtypes("sgmnt_data",571,"off")=6144
+	Set gtmtypes("sgmnt_data",571,"len")=8
+	Set gtmtypes("sgmnt_data",571,"type")="union"
+	Set gtmtypfldindx("sgmnt_data","next_upgrd_warn.time_latch.u")=571
+	Set gtmtypes("sgmnt_data",572,"name")="sgmnt_data.next_upgrd_warn.time_latch.u.pid_imgcnt"
+	Set gtmtypes("sgmnt_data",572,"off")=6144
+	Set gtmtypes("sgmnt_data",572,"len")=8
+	Set gtmtypes("sgmnt_data",572,"type")="uint64_t"
+	Set gtmtypfldindx("sgmnt_data","next_upgrd_warn.time_latch.u.pid_imgcnt")=572
+	Set gtmtypes("sgmnt_data",573,"name")="sgmnt_data.next_upgrd_warn.time_latch.u.parts"
+	Set gtmtypes("sgmnt_data",573,"off")=6144
+	Set gtmtypes("sgmnt_data",573,"len")=8
+	Set gtmtypes("sgmnt_data",573,"type")="struct"
+	Set gtmtypfldindx("sgmnt_data","next_upgrd_warn.time_latch.u.parts")=573
+	Set gtmtypes("sgmnt_data",574,"name")="sgmnt_data.next_upgrd_warn.time_latch.u.parts.latch_pid"
+	Set gtmtypes("sgmnt_data",574,"off")=6144
+	Set gtmtypes("sgmnt_data",574,"len")=4
+	Set gtmtypes("sgmnt_data",574,"type")="int"
+	Set gtmtypfldindx("sgmnt_data","next_upgrd_warn.time_latch.u.parts.latch_pid")=574
+	Set gtmtypes("sgmnt_data",575,"name")="sgmnt_data.next_upgrd_warn.time_latch.u.parts.latch_word"
+	Set gtmtypes("sgmnt_data",575,"off")=6148
 	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",575,"type")="int"
+	Set gtmtypfldindx("sgmnt_data","next_upgrd_warn.time_latch.u.parts.latch_word")=575
+	Set gtmtypes("sgmnt_data",576,"name")="sgmnt_data.next_upgrd_warn.hp_latch_space"
+	Set gtmtypes("sgmnt_data",576,"off")=6152
+	Set gtmtypes("sgmnt_data",576,"len")=16
+	Set gtmtypes("sgmnt_data",576,"type")="int"
+	Set gtmtypfldindx("sgmnt_data","next_upgrd_warn.hp_latch_space")=576
+	Set gtmtypes("sgmnt_data",576,"dim")=4
+	Set gtmtypes("sgmnt_data",577,"name")="sgmnt_data.is_encrypted"
+	Set gtmtypes("sgmnt_data",577,"off")=6168
 	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",577,"type")="unsigned-int"
+	Set gtmtypfldindx("sgmnt_data","is_encrypted")=577
+	Set gtmtypes("sgmnt_data",578,"name")="sgmnt_data.db_trigger_cycle"
+	Set gtmtypes("sgmnt_data",578,"off")=6172
 	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",578,"type")="unsigned-int"
+	Set gtmtypfldindx("sgmnt_data","db_trigger_cycle")=578
+	Set gtmtypes("sgmnt_data",579,"name")="sgmnt_data.strm_reg_seqno"
+	Set gtmtypes("sgmnt_data",579,"off")=6176
+	Set gtmtypes("sgmnt_data",579,"len")=128
+	Set gtmtypes("sgmnt_data",579,"type")="uint64_t"
+	Set gtmtypfldindx("sgmnt_data","strm_reg_seqno")=579
+	Set gtmtypes("sgmnt_data",579,"dim")=16
+	Set gtmtypes("sgmnt_data",580,"name")="sgmnt_data.save_strm_reg_seqno"
+	Set gtmtypes("sgmnt_data",580,"off")=6304
+	Set gtmtypes("sgmnt_data",580,"len")=128
+	Set gtmtypes("sgmnt_data",580,"type")="uint64_t"
+	Set gtmtypfldindx("sgmnt_data","save_strm_reg_seqno")=580
+	Set gtmtypes("sgmnt_data",580,"dim")=16
+	Set gtmtypes("sgmnt_data",581,"name")="sgmnt_data.freeze_on_fail"
+	Set gtmtypes("sgmnt_data",581,"off")=6432
 	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 gtmtypfldindx("sgmnt_data","freeze_on_fail")=581
+	Set gtmtypes("sgmnt_data",582,"name")="sgmnt_data.span_node_absent"
+	Set gtmtypes("sgmnt_data",582,"off")=6436
 	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 gtmtypfldindx("sgmnt_data","span_node_absent")=582
+	Set gtmtypes("sgmnt_data",583,"name")="sgmnt_data.maxkeysz_assured"
+	Set gtmtypes("sgmnt_data",583,"off")=6440
 	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("sgmnt_data",583,"type")="boolean_t"
+	Set gtmtypfldindx("sgmnt_data","maxkeysz_assured")=583
+	Set gtmtypes("sgmnt_data",584,"name")="sgmnt_data.hasht_upgrade_needed"
+	Set gtmtypes("sgmnt_data",584,"off")=6444
+	Set gtmtypes("sgmnt_data",584,"len")=4
+	Set gtmtypes("sgmnt_data",584,"type")="boolean_t"
+	Set gtmtypfldindx("sgmnt_data","hasht_upgrade_needed")=584
+	Set gtmtypes("sgmnt_data",585,"name")="sgmnt_data.defer_allocate"
+	Set gtmtypes("sgmnt_data",585,"off")=6448
+	Set gtmtypes("sgmnt_data",585,"len")=4
+	Set gtmtypes("sgmnt_data",585,"type")="boolean_t"
+	Set gtmtypfldindx("sgmnt_data","defer_allocate")=585
+	Set gtmtypes("sgmnt_data",586,"name")="sgmnt_data.filler_ftok_counter_halted"
+	Set gtmtypes("sgmnt_data",586,"off")=6452
+	Set gtmtypes("sgmnt_data",586,"len")=4
+	Set gtmtypes("sgmnt_data",586,"type")="boolean_t"
+	Set gtmtypfldindx("sgmnt_data","filler_ftok_counter_halted")=586
+	Set gtmtypes("sgmnt_data",587,"name")="sgmnt_data.filler_access_counter_halted"
+	Set gtmtypes("sgmnt_data",587,"off")=6456
+	Set gtmtypes("sgmnt_data",587,"len")=4
+	Set gtmtypes("sgmnt_data",587,"type")="boolean_t"
+	Set gtmtypfldindx("sgmnt_data","filler_access_counter_halted")=587
+	Set gtmtypes("sgmnt_data",588,"name")="sgmnt_data.lock_crit_with_db"
+	Set gtmtypes("sgmnt_data",588,"off")=6460
+	Set gtmtypes("sgmnt_data",588,"len")=4
+	Set gtmtypes("sgmnt_data",588,"type")="boolean_t"
+	Set gtmtypfldindx("sgmnt_data","lock_crit_with_db")=588
+	Set gtmtypes("sgmnt_data",589,"name")="sgmnt_data.basedb_fname_len"
+	Set gtmtypes("sgmnt_data",589,"off")=6464
+	Set gtmtypes("sgmnt_data",589,"len")=4
+	Set gtmtypes("sgmnt_data",589,"type")="unsigned-int"
+	Set gtmtypfldindx("sgmnt_data","basedb_fname_len")=589
+	Set gtmtypes("sgmnt_data",590,"name")="sgmnt_data.basedb_fname"
+	Set gtmtypes("sgmnt_data",590,"off")=6468
+	Set gtmtypes("sgmnt_data",590,"len")=256
+	Set gtmtypes("sgmnt_data",590,"type")="unsigned-char"
+	Set gtmtypfldindx("sgmnt_data","basedb_fname")=590
+	Set gtmtypes("sgmnt_data",591,"name")="sgmnt_data.filler_7k"
+	Set gtmtypes("sgmnt_data",591,"off")=6724
+	Set gtmtypes("sgmnt_data",591,"len")=444
+	Set gtmtypes("sgmnt_data",591,"type")="char"
+	Set gtmtypfldindx("sgmnt_data","filler_7k")=591
+	Set gtmtypes("sgmnt_data",592,"name")="sgmnt_data.filler_8k"
+	Set gtmtypes("sgmnt_data",592,"off")=7168
+	Set gtmtypes("sgmnt_data",592,"len")=1024
+	Set gtmtypes("sgmnt_data",592,"type")="char"
+	Set gtmtypfldindx("sgmnt_data","filler_8k")=592
 	;
 	Set gtmtypes("shm_forw_multi_t")="struct"
 	Set gtmtypes("shm_forw_multi_t",0)=20
@@ -30153,7 +31132,7 @@ Init
 	Set gtmtypes("shm_reg_ctl_t",9,"dim")=3
 	;
 	Set gtmtypes("shm_snapshot_t")="struct"
-	Set gtmtypes("shm_snapshot_t",0)=608
+	Set gtmtypes("shm_snapshot_t",0)=614
 	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
@@ -31146,11 +32125,11 @@ Init
 	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.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,"name")="shm_snapshot_t.shadow_file_header.wcb_gds_rundown2_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_bgtrcrec1_tn")=197
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_gds_rundown2_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
@@ -31441,11 +32420,11 @@ Init
 	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_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,"name")="shm_snapshot_t.shadow_file_header.wcb_wcs_flu0_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_tp_grab_crit_tn")=256
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_wcs_flu0_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
@@ -31466,11 +32445,11 @@ Init
 	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_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,"name")="shm_snapshot_t.shadow_file_header.wcb_gds_rundown1_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_gds_rundown_tn")=261
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_gds_rundown1_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
@@ -31826,1391 +32805,1421 @@ Init
 	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,"name")="shm_snapshot_t.shadow_file_header.jnlbuff_phs2cmt_array_full_tn"
 	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.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.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.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",333,"len")=8
+	Set gtmtypes("shm_snapshot_t",333,"type")="uint64_t"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.jnlbuff_phs2cmt_array_full_tn")=333
+	Set gtmtypes("shm_snapshot_t",334,"name")="shm_snapshot_t.shadow_file_header.jnl_phase2_cleanup_if_possible_tn"
+	Set gtmtypes("shm_snapshot_t",334,"off")=7392
+	Set gtmtypes("shm_snapshot_t",334,"len")=8
+	Set gtmtypes("shm_snapshot_t",334,"type")="uint64_t"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.jnl_phase2_cleanup_if_possible_tn")=334
+	Set gtmtypes("shm_snapshot_t",335,"name")="shm_snapshot_t.shadow_file_header.jnlbuff_phs2cmt_isprcalv_tn"
+	Set gtmtypes("shm_snapshot_t",335,"off")=7400
+	Set gtmtypes("shm_snapshot_t",335,"len")=8
+	Set gtmtypes("shm_snapshot_t",335,"type")="uint64_t"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.jnlbuff_phs2cmt_isprcalv_tn")=335
+	Set gtmtypes("shm_snapshot_t",336,"name")="shm_snapshot_t.shadow_file_header.bg_trc_rec_tn_filler"
+	Set gtmtypes("shm_snapshot_t",336,"off")=7408
+	Set gtmtypes("shm_snapshot_t",336,"len")=24
+	Set gtmtypes("shm_snapshot_t",336,"type")="char"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.bg_trc_rec_tn_filler")=336
+	Set gtmtypes("shm_snapshot_t",337,"name")="shm_snapshot_t.shadow_file_header.total_buffer_flush_cntr"
+	Set gtmtypes("shm_snapshot_t",337,"off")=7432
 	Set gtmtypes("shm_snapshot_t",337,"len")=4
 	Set gtmtypes("shm_snapshot_t",337,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.total_buffer_flush_cntr")=337
+	Set gtmtypes("shm_snapshot_t",338,"name")="shm_snapshot_t.shadow_file_header.bufct_buffer_flush_cntr"
+	Set gtmtypes("shm_snapshot_t",338,"off")=7436
 	Set gtmtypes("shm_snapshot_t",338,"len")=4
 	Set gtmtypes("shm_snapshot_t",338,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.bufct_buffer_flush_cntr")=338
+	Set gtmtypes("shm_snapshot_t",339,"name")="shm_snapshot_t.shadow_file_header.bufct_buffer_flush_loop_cntr"
+	Set gtmtypes("shm_snapshot_t",339,"off")=7440
 	Set gtmtypes("shm_snapshot_t",339,"len")=4
 	Set gtmtypes("shm_snapshot_t",339,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.bufct_buffer_flush_loop_cntr")=339
+	Set gtmtypes("shm_snapshot_t",340,"name")="shm_snapshot_t.shadow_file_header.wrt_calls_cntr"
+	Set gtmtypes("shm_snapshot_t",340,"off")=7444
 	Set gtmtypes("shm_snapshot_t",340,"len")=4
 	Set gtmtypes("shm_snapshot_t",340,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.wrt_calls_cntr")=340
+	Set gtmtypes("shm_snapshot_t",341,"name")="shm_snapshot_t.shadow_file_header.wrt_count_cntr"
+	Set gtmtypes("shm_snapshot_t",341,"off")=7448
 	Set gtmtypes("shm_snapshot_t",341,"len")=4
 	Set gtmtypes("shm_snapshot_t",341,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.wrt_count_cntr")=341
+	Set gtmtypes("shm_snapshot_t",342,"name")="shm_snapshot_t.shadow_file_header.wrt_blocked_cntr"
+	Set gtmtypes("shm_snapshot_t",342,"off")=7452
 	Set gtmtypes("shm_snapshot_t",342,"len")=4
 	Set gtmtypes("shm_snapshot_t",342,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.wrt_blocked_cntr")=342
+	Set gtmtypes("shm_snapshot_t",343,"name")="shm_snapshot_t.shadow_file_header.wrt_busy_cntr"
+	Set gtmtypes("shm_snapshot_t",343,"off")=7456
 	Set gtmtypes("shm_snapshot_t",343,"len")=4
 	Set gtmtypes("shm_snapshot_t",343,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.wrt_busy_cntr")=343
+	Set gtmtypes("shm_snapshot_t",344,"name")="shm_snapshot_t.shadow_file_header.wrt_noblks_wrtn_cntr"
+	Set gtmtypes("shm_snapshot_t",344,"off")=7460
 	Set gtmtypes("shm_snapshot_t",344,"len")=4
 	Set gtmtypes("shm_snapshot_t",344,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.wrt_noblks_wrtn_cntr")=344
+	Set gtmtypes("shm_snapshot_t",345,"name")="shm_snapshot_t.shadow_file_header.wcb_gds_rundown2_cntr"
+	Set gtmtypes("shm_snapshot_t",345,"off")=7464
 	Set gtmtypes("shm_snapshot_t",345,"len")=4
 	Set gtmtypes("shm_snapshot_t",345,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_gds_rundown2_cntr")=345
+	Set gtmtypes("shm_snapshot_t",346,"name")="shm_snapshot_t.shadow_file_header.reserved_bgtrcrec2_cntr"
+	Set gtmtypes("shm_snapshot_t",346,"off")=7468
 	Set gtmtypes("shm_snapshot_t",346,"len")=4
 	Set gtmtypes("shm_snapshot_t",346,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.reserved_bgtrcrec2_cntr")=346
+	Set gtmtypes("shm_snapshot_t",347,"name")="shm_snapshot_t.shadow_file_header.reserved_bgtrcrec3_cntr"
+	Set gtmtypes("shm_snapshot_t",347,"off")=7472
 	Set gtmtypes("shm_snapshot_t",347,"len")=4
 	Set gtmtypes("shm_snapshot_t",347,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.reserved_bgtrcrec3_cntr")=347
+	Set gtmtypes("shm_snapshot_t",348,"name")="shm_snapshot_t.shadow_file_header.lost_block_recovery_cntr"
+	Set gtmtypes("shm_snapshot_t",348,"off")=7476
 	Set gtmtypes("shm_snapshot_t",348,"len")=4
 	Set gtmtypes("shm_snapshot_t",348,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.lost_block_recovery_cntr")=348
+	Set gtmtypes("shm_snapshot_t",349,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_onln_rlbk_cntr"
+	Set gtmtypes("shm_snapshot_t",349,"off")=7480
 	Set gtmtypes("shm_snapshot_t",349,"len")=4
 	Set gtmtypes("shm_snapshot_t",349,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_onln_rlbk_cntr")=349
+	Set gtmtypes("shm_snapshot_t",350,"name")="shm_snapshot_t.shadow_file_header.stale_cntr"
+	Set gtmtypes("shm_snapshot_t",350,"off")=7484
 	Set gtmtypes("shm_snapshot_t",350,"len")=4
 	Set gtmtypes("shm_snapshot_t",350,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.stale_cntr")=350
+	Set gtmtypes("shm_snapshot_t",351,"name")="shm_snapshot_t.shadow_file_header.starved_cntr"
+	Set gtmtypes("shm_snapshot_t",351,"off")=7488
 	Set gtmtypes("shm_snapshot_t",351,"len")=4
 	Set gtmtypes("shm_snapshot_t",351,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.starved_cntr")=351
+	Set gtmtypes("shm_snapshot_t",352,"name")="shm_snapshot_t.shadow_file_header.stale_timer_started_cntr"
+	Set gtmtypes("shm_snapshot_t",352,"off")=7492
 	Set gtmtypes("shm_snapshot_t",352,"len")=4
 	Set gtmtypes("shm_snapshot_t",352,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.stale_timer_started_cntr")=352
+	Set gtmtypes("shm_snapshot_t",353,"name")="shm_snapshot_t.shadow_file_header.stale_timer_pop_cntr"
+	Set gtmtypes("shm_snapshot_t",353,"off")=7496
 	Set gtmtypes("shm_snapshot_t",353,"len")=4
 	Set gtmtypes("shm_snapshot_t",353,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.stale_timer_pop_cntr")=353
+	Set gtmtypes("shm_snapshot_t",354,"name")="shm_snapshot_t.shadow_file_header.stale_process_defer_cntr"
+	Set gtmtypes("shm_snapshot_t",354,"off")=7500
 	Set gtmtypes("shm_snapshot_t",354,"len")=4
 	Set gtmtypes("shm_snapshot_t",354,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.stale_process_defer_cntr")=354
+	Set gtmtypes("shm_snapshot_t",355,"name")="shm_snapshot_t.shadow_file_header.stale_defer_processed_cntr"
+	Set gtmtypes("shm_snapshot_t",355,"off")=7504
 	Set gtmtypes("shm_snapshot_t",355,"len")=4
 	Set gtmtypes("shm_snapshot_t",355,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.stale_defer_processed_cntr")=355
+	Set gtmtypes("shm_snapshot_t",356,"name")="shm_snapshot_t.shadow_file_header.spcfc_buffer_flush_cntr"
+	Set gtmtypes("shm_snapshot_t",356,"off")=7508
 	Set gtmtypes("shm_snapshot_t",356,"len")=4
 	Set gtmtypes("shm_snapshot_t",356,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.spcfc_buffer_flush_cntr")=356
+	Set gtmtypes("shm_snapshot_t",357,"name")="shm_snapshot_t.shadow_file_header.spcfc_buffer_flush_loop_cntr"
+	Set gtmtypes("shm_snapshot_t",357,"off")=7512
 	Set gtmtypes("shm_snapshot_t",357,"len")=4
 	Set gtmtypes("shm_snapshot_t",357,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.spcfc_buffer_flush_loop_cntr")=357
+	Set gtmtypes("shm_snapshot_t",358,"name")="shm_snapshot_t.shadow_file_header.spcfc_buffer_flush_retries_cntr"
+	Set gtmtypes("shm_snapshot_t",358,"off")=7516
 	Set gtmtypes("shm_snapshot_t",358,"len")=4
 	Set gtmtypes("shm_snapshot_t",358,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.spcfc_buffer_flush_retries_cntr")=358
+	Set gtmtypes("shm_snapshot_t",359,"name")="shm_snapshot_t.shadow_file_header.spcfc_buffer_flushed_during_lockwait_cntr"
+	Set gtmtypes("shm_snapshot_t",359,"off")=7520
 	Set gtmtypes("shm_snapshot_t",359,"len")=4
 	Set gtmtypes("shm_snapshot_t",359,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.spcfc_buffer_flushed_during_lockwait_cntr")=359
+	Set gtmtypes("shm_snapshot_t",360,"name")="shm_snapshot_t.shadow_file_header.tp_crit_retries_cntr"
+	Set gtmtypes("shm_snapshot_t",360,"off")=7524
 	Set gtmtypes("shm_snapshot_t",360,"len")=4
 	Set gtmtypes("shm_snapshot_t",360,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.tp_crit_retries_cntr")=360
+	Set gtmtypes("shm_snapshot_t",361,"name")="shm_snapshot_t.shadow_file_header.db_csh_getn_flush_dirty_cntr"
+	Set gtmtypes("shm_snapshot_t",361,"off")=7528
 	Set gtmtypes("shm_snapshot_t",361,"len")=4
 	Set gtmtypes("shm_snapshot_t",361,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.db_csh_getn_flush_dirty_cntr")=361
+	Set gtmtypes("shm_snapshot_t",362,"name")="shm_snapshot_t.shadow_file_header.db_csh_getn_rip_wait_cntr"
+	Set gtmtypes("shm_snapshot_t",362,"off")=7532
 	Set gtmtypes("shm_snapshot_t",362,"len")=4
 	Set gtmtypes("shm_snapshot_t",362,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.db_csh_getn_rip_wait_cntr")=362
+	Set gtmtypes("shm_snapshot_t",363,"name")="shm_snapshot_t.shadow_file_header.db_csh_getn_buf_owner_stuck_cntr"
+	Set gtmtypes("shm_snapshot_t",363,"off")=7536
 	Set gtmtypes("shm_snapshot_t",363,"len")=4
 	Set gtmtypes("shm_snapshot_t",363,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.db_csh_getn_buf_owner_stuck_cntr")=363
+	Set gtmtypes("shm_snapshot_t",364,"name")="shm_snapshot_t.shadow_file_header.db_csh_getn_out_of_design_cntr"
+	Set gtmtypes("shm_snapshot_t",364,"off")=7540
 	Set gtmtypes("shm_snapshot_t",364,"len")=4
 	Set gtmtypes("shm_snapshot_t",364,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.db_csh_getn_out_of_design_cntr")=364
+	Set gtmtypes("shm_snapshot_t",365,"name")="shm_snapshot_t.shadow_file_header.t_qread_buf_owner_stuck_cntr"
+	Set gtmtypes("shm_snapshot_t",365,"off")=7544
 	Set gtmtypes("shm_snapshot_t",365,"len")=4
 	Set gtmtypes("shm_snapshot_t",365,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.t_qread_buf_owner_stuck_cntr")=365
+	Set gtmtypes("shm_snapshot_t",366,"name")="shm_snapshot_t.shadow_file_header.t_qread_out_of_design_cntr"
+	Set gtmtypes("shm_snapshot_t",366,"off")=7548
 	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_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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.t_qread_out_of_design_cntr")=366
+	Set gtmtypes("shm_snapshot_t",367,"name")="shm_snapshot_t.shadow_file_header.bt_put_flush_dirty_cntr"
+	Set gtmtypes("shm_snapshot_t",367,"off")=7552
 	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_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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.bt_put_flush_dirty_cntr")=367
+	Set gtmtypes("shm_snapshot_t",368,"name")="shm_snapshot_t.shadow_file_header.mlock_wakeups_cntr"
+	Set gtmtypes("shm_snapshot_t",368,"off")=7556
 	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_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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.mlock_wakeups_cntr")=368
+	Set gtmtypes("shm_snapshot_t",369,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_wcs_recover_invoked_cntr"
+	Set gtmtypes("shm_snapshot_t",369,"off")=7560
 	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_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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_wcs_recover_invoked_cntr")=369
+	Set gtmtypes("shm_snapshot_t",370,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_wcs_verify_passed_cntr"
+	Set gtmtypes("shm_snapshot_t",370,"off")=7564
 	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_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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_wcs_verify_passed_cntr")=370
+	Set gtmtypes("shm_snapshot_t",371,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_t_qread_db_csh_getn_invalid_blk_cntr"
+	Set gtmtypes("shm_snapshot_t",371,"off")=7568
 	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_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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_t_qread_db_csh_getn_invalid_blk_cntr")=371
+	Set gtmtypes("shm_snapshot_t",372,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_t_qread_db_csh_get_invalid_blk_cntr"
+	Set gtmtypes("shm_snapshot_t",372,"off")=7572
 	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_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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_t_qread_db_csh_get_invalid_blk_cntr")=372
+	Set gtmtypes("shm_snapshot_t",373,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_db_csh_getn_loopexceed_cntr"
+	Set gtmtypes("shm_snapshot_t",373,"off")=7576
 	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_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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_db_csh_getn_loopexceed_cntr")=373
+	Set gtmtypes("shm_snapshot_t",374,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_db_csh_getn_wcsstarvewrt_cntr"
+	Set gtmtypes("shm_snapshot_t",374,"off")=7580
 	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_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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_db_csh_getn_wcsstarvewrt_cntr")=374
+	Set gtmtypes("shm_snapshot_t",375,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_db_csh_get_cntr"
+	Set gtmtypes("shm_snapshot_t",375,"off")=7584
 	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_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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_db_csh_get_cntr")=375
+	Set gtmtypes("shm_snapshot_t",376,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_tp_tend_wcsgetspace_cntr"
+	Set gtmtypes("shm_snapshot_t",376,"off")=7588
 	Set gtmtypes("shm_snapshot_t",376,"len")=4
 	Set gtmtypes("shm_snapshot_t",376,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_tp_tend_wcsgetspace_cntr")=376
+	Set gtmtypes("shm_snapshot_t",377,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_tp_tend_t1_cntr"
+	Set gtmtypes("shm_snapshot_t",377,"off")=7592
 	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_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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_tp_tend_t1_cntr")=377
+	Set gtmtypes("shm_snapshot_t",378,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_tp_tend_bitmap_cntr"
+	Set gtmtypes("shm_snapshot_t",378,"off")=7596
 	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_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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_tp_tend_bitmap_cntr")=378
+	Set gtmtypes("shm_snapshot_t",379,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_tp_tend_jnl_cwset_cntr"
+	Set gtmtypes("shm_snapshot_t",379,"off")=7600
 	Set gtmtypes("shm_snapshot_t",379,"len")=4
 	Set gtmtypes("shm_snapshot_t",379,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_tp_tend_jnl_cwset_cntr")=379
+	Set gtmtypes("shm_snapshot_t",380,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_tp_tend_jnl_wcsflu_cntr"
+	Set gtmtypes("shm_snapshot_t",380,"off")=7604
 	Set gtmtypes("shm_snapshot_t",380,"len")=4
 	Set gtmtypes("shm_snapshot_t",380,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_tp_tend_jnl_wcsflu_cntr")=380
+	Set gtmtypes("shm_snapshot_t",381,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_t_end_hist_cntr"
+	Set gtmtypes("shm_snapshot_t",381,"off")=7608
 	Set gtmtypes("shm_snapshot_t",381,"len")=4
 	Set gtmtypes("shm_snapshot_t",381,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_t_end_hist_cntr")=381
+	Set gtmtypes("shm_snapshot_t",382,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_t_end_hist1_nullbt_cntr"
+	Set gtmtypes("shm_snapshot_t",382,"off")=7612
 	Set gtmtypes("shm_snapshot_t",382,"len")=4
 	Set gtmtypes("shm_snapshot_t",382,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_t_end_hist1_nullbt_cntr")=382
+	Set gtmtypes("shm_snapshot_t",383,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_t_end_hist1_nonnullbt_cntr"
+	Set gtmtypes("shm_snapshot_t",383,"off")=7616
 	Set gtmtypes("shm_snapshot_t",383,"len")=4
 	Set gtmtypes("shm_snapshot_t",383,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_t_end_hist1_nonnullbt_cntr")=383
+	Set gtmtypes("shm_snapshot_t",384,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_t_end_bitmap_nullbt_cntr"
+	Set gtmtypes("shm_snapshot_t",384,"off")=7620
 	Set gtmtypes("shm_snapshot_t",384,"len")=4
 	Set gtmtypes("shm_snapshot_t",384,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_t_end_bitmap_nullbt_cntr")=384
+	Set gtmtypes("shm_snapshot_t",385,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_t_end_bitmap_nonnullbt_cntr"
+	Set gtmtypes("shm_snapshot_t",385,"off")=7624
 	Set gtmtypes("shm_snapshot_t",385,"len")=4
 	Set gtmtypes("shm_snapshot_t",385,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_t_end_bitmap_nonnullbt_cntr")=385
+	Set gtmtypes("shm_snapshot_t",386,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_t_end_jnl_cwset_cntr"
+	Set gtmtypes("shm_snapshot_t",386,"off")=7628
 	Set gtmtypes("shm_snapshot_t",386,"len")=4
 	Set gtmtypes("shm_snapshot_t",386,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_t_end_jnl_cwset_cntr")=386
+	Set gtmtypes("shm_snapshot_t",387,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_t_end_jnl_wcsflu_cntr"
+	Set gtmtypes("shm_snapshot_t",387,"off")=7632
 	Set gtmtypes("shm_snapshot_t",387,"len")=4
 	Set gtmtypes("shm_snapshot_t",387,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_t_end_jnl_wcsflu_cntr")=387
+	Set gtmtypes("shm_snapshot_t",388,"name")="shm_snapshot_t.shadow_file_header.db_csh_get_too_many_loops_cntr"
+	Set gtmtypes("shm_snapshot_t",388,"off")=7636
 	Set gtmtypes("shm_snapshot_t",388,"len")=4
 	Set gtmtypes("shm_snapshot_t",388,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.db_csh_get_too_many_loops_cntr")=388
+	Set gtmtypes("shm_snapshot_t",389,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_tpckh_hist1_nullbt_cntr"
+	Set gtmtypes("shm_snapshot_t",389,"off")=7640
 	Set gtmtypes("shm_snapshot_t",389,"len")=4
 	Set gtmtypes("shm_snapshot_t",389,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_tpckh_hist1_nullbt_cntr")=389
+	Set gtmtypes("shm_snapshot_t",390,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_tpckh_hist1_nonnullbt_cntr"
+	Set gtmtypes("shm_snapshot_t",390,"off")=7644
 	Set gtmtypes("shm_snapshot_t",390,"len")=4
 	Set gtmtypes("shm_snapshot_t",390,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_tpckh_hist1_nonnullbt_cntr")=390
+	Set gtmtypes("shm_snapshot_t",391,"name")="shm_snapshot_t.shadow_file_header.jnl_blocked_writer_lost_cntr"
+	Set gtmtypes("shm_snapshot_t",391,"off")=7648
 	Set gtmtypes("shm_snapshot_t",391,"len")=4
 	Set gtmtypes("shm_snapshot_t",391,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.jnl_blocked_writer_lost_cntr")=391
+	Set gtmtypes("shm_snapshot_t",392,"name")="shm_snapshot_t.shadow_file_header.jnl_blocked_writer_stuck_cntr"
+	Set gtmtypes("shm_snapshot_t",392,"off")=7652
 	Set gtmtypes("shm_snapshot_t",392,"len")=4
 	Set gtmtypes("shm_snapshot_t",392,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.jnl_blocked_writer_stuck_cntr")=392
+	Set gtmtypes("shm_snapshot_t",393,"name")="shm_snapshot_t.shadow_file_header.jnl_blocked_writer_blocked_cntr"
+	Set gtmtypes("shm_snapshot_t",393,"off")=7656
 	Set gtmtypes("shm_snapshot_t",393,"len")=4
 	Set gtmtypes("shm_snapshot_t",393,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.jnl_blocked_writer_blocked_cntr")=393
+	Set gtmtypes("shm_snapshot_t",394,"name")="shm_snapshot_t.shadow_file_header.n_jnl_fsyncs_cntr"
+	Set gtmtypes("shm_snapshot_t",394,"off")=7660
 	Set gtmtypes("shm_snapshot_t",394,"len")=4
 	Set gtmtypes("shm_snapshot_t",394,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_jnl_fsyncs_cntr")=394
+	Set gtmtypes("shm_snapshot_t",395,"name")="shm_snapshot_t.shadow_file_header.n_jnl_fsync_tries_cntr"
+	Set gtmtypes("shm_snapshot_t",395,"off")=7664
 	Set gtmtypes("shm_snapshot_t",395,"len")=4
 	Set gtmtypes("shm_snapshot_t",395,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_jnl_fsync_tries_cntr")=395
+	Set gtmtypes("shm_snapshot_t",396,"name")="shm_snapshot_t.shadow_file_header.n_jnl_fsync_recovers_cntr"
+	Set gtmtypes("shm_snapshot_t",396,"off")=7668
 	Set gtmtypes("shm_snapshot_t",396,"len")=4
 	Set gtmtypes("shm_snapshot_t",396,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_jnl_fsync_recovers_cntr")=396
+	Set gtmtypes("shm_snapshot_t",397,"name")="shm_snapshot_t.shadow_file_header.n_db_fsyncs_cntr"
+	Set gtmtypes("shm_snapshot_t",397,"off")=7672
 	Set gtmtypes("shm_snapshot_t",397,"len")=4
 	Set gtmtypes("shm_snapshot_t",397,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_db_fsyncs_cntr")=397
+	Set gtmtypes("shm_snapshot_t",398,"name")="shm_snapshot_t.shadow_file_header.n_db_fsyncs_in_crit_cntr"
+	Set gtmtypes("shm_snapshot_t",398,"off")=7676
 	Set gtmtypes("shm_snapshot_t",398,"len")=4
 	Set gtmtypes("shm_snapshot_t",398,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_db_fsyncs_in_crit_cntr")=398
+	Set gtmtypes("shm_snapshot_t",399,"name")="shm_snapshot_t.shadow_file_header.n_dbsync_timers_cntr"
+	Set gtmtypes("shm_snapshot_t",399,"off")=7680
 	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_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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_dbsync_timers_cntr")=399
+	Set gtmtypes("shm_snapshot_t",400,"name")="shm_snapshot_t.shadow_file_header.n_dbsync_writes_cntr"
+	Set gtmtypes("shm_snapshot_t",400,"off")=7684
 	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_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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_dbsync_writes_cntr")=400
+	Set gtmtypes("shm_snapshot_t",401,"name")="shm_snapshot_t.shadow_file_header.mutex_queue_full_cntr"
+	Set gtmtypes("shm_snapshot_t",401,"off")=7688
 	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_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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.mutex_queue_full_cntr")=401
+	Set gtmtypes("shm_snapshot_t",402,"name")="shm_snapshot_t.shadow_file_header.wcb_bt_put_cntr"
+	Set gtmtypes("shm_snapshot_t",402,"off")=7692
 	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_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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_bt_put_cntr")=402
+	Set gtmtypes("shm_snapshot_t",403,"name")="shm_snapshot_t.shadow_file_header.wcb_mutex_salvage_cntr"
+	Set gtmtypes("shm_snapshot_t",403,"off")=7696
 	Set gtmtypes("shm_snapshot_t",403,"len")=4
 	Set gtmtypes("shm_snapshot_t",403,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_mutex_salvage_cntr")=403
+	Set gtmtypes("shm_snapshot_t",404,"name")="shm_snapshot_t.shadow_file_header.wcb_wcs_flu0_cntr"
+	Set gtmtypes("shm_snapshot_t",404,"off")=7700
 	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_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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_wcs_flu0_cntr")=404
+	Set gtmtypes("shm_snapshot_t",405,"name")="shm_snapshot_t.shadow_file_header.wcb_t_end_sysops_nocr_invcr_cntr"
+	Set gtmtypes("shm_snapshot_t",405,"off")=7704
 	Set gtmtypes("shm_snapshot_t",405,"len")=4
 	Set gtmtypes("shm_snapshot_t",405,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_t_end_sysops_nocr_invcr_cntr")=405
+	Set gtmtypes("shm_snapshot_t",406,"name")="shm_snapshot_t.shadow_file_header.wcb_t_end_sysops_cr_invcr_cntr"
+	Set gtmtypes("shm_snapshot_t",406,"off")=7708
 	Set gtmtypes("shm_snapshot_t",406,"len")=4
 	Set gtmtypes("shm_snapshot_t",406,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_t_end_sysops_cr_invcr_cntr")=406
+	Set gtmtypes("shm_snapshot_t",407,"name")="shm_snapshot_t.shadow_file_header.wcb_t_end_sysops_rip_wait_cntr"
+	Set gtmtypes("shm_snapshot_t",407,"off")=7712
 	Set gtmtypes("shm_snapshot_t",407,"len")=4
 	Set gtmtypes("shm_snapshot_t",407,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_t_end_sysops_rip_wait_cntr")=407
+	Set gtmtypes("shm_snapshot_t",408,"name")="shm_snapshot_t.shadow_file_header.wcb_t_end_sysops_dirtyripwait_cntr"
+	Set gtmtypes("shm_snapshot_t",408,"off")=7716
 	Set gtmtypes("shm_snapshot_t",408,"len")=4
 	Set gtmtypes("shm_snapshot_t",408,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_t_end_sysops_dirtyripwait_cntr")=408
+	Set gtmtypes("shm_snapshot_t",409,"name")="shm_snapshot_t.shadow_file_header.wcb_gds_rundown1_cntr"
+	Set gtmtypes("shm_snapshot_t",409,"off")=7720
 	Set gtmtypes("shm_snapshot_t",409,"len")=4
 	Set gtmtypes("shm_snapshot_t",409,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_gds_rundown1_cntr")=409
+	Set gtmtypes("shm_snapshot_t",410,"name")="shm_snapshot_t.shadow_file_header.wcb_wcs_flu1_cntr"
+	Set gtmtypes("shm_snapshot_t",410,"off")=7724
 	Set gtmtypes("shm_snapshot_t",410,"len")=4
 	Set gtmtypes("shm_snapshot_t",410,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_wcs_flu1_cntr")=410
+	Set gtmtypes("shm_snapshot_t",411,"name")="shm_snapshot_t.shadow_file_header.wcb_mu_back_cntr"
+	Set gtmtypes("shm_snapshot_t",411,"off")=7728
 	Set gtmtypes("shm_snapshot_t",411,"len")=4
 	Set gtmtypes("shm_snapshot_t",411,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_mu_back_cntr")=411
+	Set gtmtypes("shm_snapshot_t",412,"name")="shm_snapshot_t.shadow_file_header.wcb_t_end_sysops_dirty_invcr_cntr"
+	Set gtmtypes("shm_snapshot_t",412,"off")=7732
 	Set gtmtypes("shm_snapshot_t",412,"len")=4
 	Set gtmtypes("shm_snapshot_t",412,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_t_end_sysops_dirty_invcr_cntr")=412
+	Set gtmtypes("shm_snapshot_t",413,"name")="shm_snapshot_t.shadow_file_header.wcb_t_end_sysops_wtfini_fail_cntr"
+	Set gtmtypes("shm_snapshot_t",413,"off")=7736
 	Set gtmtypes("shm_snapshot_t",413,"len")=4
 	Set gtmtypes("shm_snapshot_t",413,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_t_end_sysops_wtfini_fail_cntr")=413
+	Set gtmtypes("shm_snapshot_t",414,"name")="shm_snapshot_t.shadow_file_header.wcb_t_end_sysops_twin_stuck_cntr"
+	Set gtmtypes("shm_snapshot_t",414,"off")=7740
 	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_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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_t_end_sysops_twin_stuck_cntr")=414
+	Set gtmtypes("shm_snapshot_t",415,"name")="shm_snapshot_t.shadow_file_header.db_csh_getn_wrt_latch_stuck_cntr"
+	Set gtmtypes("shm_snapshot_t",415,"off")=7744
 	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_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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.db_csh_getn_wrt_latch_stuck_cntr")=415
+	Set gtmtypes("shm_snapshot_t",416,"name")="shm_snapshot_t.shadow_file_header.wcb_secshr_db_clnup_now_crit_cntr"
+	Set gtmtypes("shm_snapshot_t",416,"off")=7748
 	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_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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_secshr_db_clnup_now_crit_cntr")=416
+	Set gtmtypes("shm_snapshot_t",417,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_t_qread_bad_bt_index1_cntr"
+	Set gtmtypes("shm_snapshot_t",417,"off")=7752
 	Set gtmtypes("shm_snapshot_t",417,"len")=4
 	Set gtmtypes("shm_snapshot_t",417,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_t_qread_bad_bt_index1_cntr")=417
+	Set gtmtypes("shm_snapshot_t",418,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_t_qread_bad_bt_index2_cntr"
+	Set gtmtypes("shm_snapshot_t",418,"off")=7756
 	Set gtmtypes("shm_snapshot_t",418,"len")=4
 	Set gtmtypes("shm_snapshot_t",418,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_t_qread_bad_bt_index2_cntr")=418
+	Set gtmtypes("shm_snapshot_t",419,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_t_end_crbtmismatch1_cntr"
+	Set gtmtypes("shm_snapshot_t",419,"off")=7760
 	Set gtmtypes("shm_snapshot_t",419,"len")=4
 	Set gtmtypes("shm_snapshot_t",419,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_t_end_crbtmismatch1_cntr")=419
+	Set gtmtypes("shm_snapshot_t",420,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_t_end_crbtmismatch2_cntr"
+	Set gtmtypes("shm_snapshot_t",420,"off")=7764
 	Set gtmtypes("shm_snapshot_t",420,"len")=4
 	Set gtmtypes("shm_snapshot_t",420,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_t_end_crbtmismatch2_cntr")=420
+	Set gtmtypes("shm_snapshot_t",421,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_t_end_crbtmismatch3_cntr"
+	Set gtmtypes("shm_snapshot_t",421,"off")=7768
 	Set gtmtypes("shm_snapshot_t",421,"len")=4
 	Set gtmtypes("shm_snapshot_t",421,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_t_end_crbtmismatch3_cntr")=421
+	Set gtmtypes("shm_snapshot_t",422,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_tp_tend_crbtmismatch1_cntr"
+	Set gtmtypes("shm_snapshot_t",422,"off")=7772
 	Set gtmtypes("shm_snapshot_t",422,"len")=4
 	Set gtmtypes("shm_snapshot_t",422,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_tp_tend_crbtmismatch1_cntr")=422
+	Set gtmtypes("shm_snapshot_t",423,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_tp_tend_crbtmismatch2_cntr"
+	Set gtmtypes("shm_snapshot_t",423,"off")=7776
 	Set gtmtypes("shm_snapshot_t",423,"len")=4
 	Set gtmtypes("shm_snapshot_t",423,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_tp_tend_crbtmismatch2_cntr")=423
+	Set gtmtypes("shm_snapshot_t",424,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_tp_tend_crbtmismatch3_cntr"
+	Set gtmtypes("shm_snapshot_t",424,"off")=7780
 	Set gtmtypes("shm_snapshot_t",424,"len")=4
 	Set gtmtypes("shm_snapshot_t",424,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_tp_tend_crbtmismatch3_cntr")=424
+	Set gtmtypes("shm_snapshot_t",425,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_wcs_wtstart_bad_cr_cntr"
+	Set gtmtypes("shm_snapshot_t",425,"off")=7784
 	Set gtmtypes("shm_snapshot_t",425,"len")=4
 	Set gtmtypes("shm_snapshot_t",425,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_wcs_wtstart_bad_cr_cntr")=425
+	Set gtmtypes("shm_snapshot_t",426,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_wcs_wtfini_bad_cr_cntr"
+	Set gtmtypes("shm_snapshot_t",426,"off")=7788
 	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_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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_wcs_wtfini_bad_cr_cntr")=426
+	Set gtmtypes("shm_snapshot_t",427,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_bt_get_cntr"
+	Set gtmtypes("shm_snapshot_t",427,"off")=7792
 	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_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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_bt_get_cntr")=427
+	Set gtmtypes("shm_snapshot_t",428,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_wcs_cdb_sc_final_retry_cntr"
+	Set gtmtypes("shm_snapshot_t",428,"off")=7796
 	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_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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_wcs_cdb_sc_final_retry_cntr")=428
+	Set gtmtypes("shm_snapshot_t",429,"name")="shm_snapshot_t.shadow_file_header.wcb_bg_update_lckfail1_cntr"
+	Set gtmtypes("shm_snapshot_t",429,"off")=7800
 	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_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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_bg_update_lckfail1_cntr")=429
+	Set gtmtypes("shm_snapshot_t",430,"name")="shm_snapshot_t.shadow_file_header.wcb_bg_update_lckfail2_cntr"
+	Set gtmtypes("shm_snapshot_t",430,"off")=7804
 	Set gtmtypes("shm_snapshot_t",430,"len")=4
 	Set gtmtypes("shm_snapshot_t",430,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_bg_update_lckfail2_cntr")=430
+	Set gtmtypes("shm_snapshot_t",431,"name")="shm_snapshot_t.shadow_file_header.wcb_wtstart_lckfail1_cntr"
+	Set gtmtypes("shm_snapshot_t",431,"off")=7808
 	Set gtmtypes("shm_snapshot_t",431,"len")=4
 	Set gtmtypes("shm_snapshot_t",431,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_wtstart_lckfail1_cntr")=431
+	Set gtmtypes("shm_snapshot_t",432,"name")="shm_snapshot_t.shadow_file_header.wcb_wtstart_lckfail2_cntr"
+	Set gtmtypes("shm_snapshot_t",432,"off")=7812
 	Set gtmtypes("shm_snapshot_t",432,"len")=4
 	Set gtmtypes("shm_snapshot_t",432,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_wtstart_lckfail2_cntr")=432
+	Set gtmtypes("shm_snapshot_t",433,"name")="shm_snapshot_t.shadow_file_header.wcb_wtstart_lckfail3_cntr"
+	Set gtmtypes("shm_snapshot_t",433,"off")=7816
 	Set gtmtypes("shm_snapshot_t",433,"len")=4
 	Set gtmtypes("shm_snapshot_t",433,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_wtstart_lckfail3_cntr")=433
+	Set gtmtypes("shm_snapshot_t",434,"name")="shm_snapshot_t.shadow_file_header.wcb_wtstart_lckfail4_cntr"
+	Set gtmtypes("shm_snapshot_t",434,"off")=7820
 	Set gtmtypes("shm_snapshot_t",434,"len")=4
 	Set gtmtypes("shm_snapshot_t",434,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_wtstart_lckfail4_cntr")=434
+	Set gtmtypes("shm_snapshot_t",435,"name")="shm_snapshot_t.shadow_file_header.wcb_wtfini_lckfail1_cntr"
+	Set gtmtypes("shm_snapshot_t",435,"off")=7824
 	Set gtmtypes("shm_snapshot_t",435,"len")=4
 	Set gtmtypes("shm_snapshot_t",435,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_wtfini_lckfail1_cntr")=435
+	Set gtmtypes("shm_snapshot_t",436,"name")="shm_snapshot_t.shadow_file_header.wcb_wtfini_lckfail2_cntr"
+	Set gtmtypes("shm_snapshot_t",436,"off")=7828
 	Set gtmtypes("shm_snapshot_t",436,"len")=4
 	Set gtmtypes("shm_snapshot_t",436,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_wtfini_lckfail2_cntr")=436
+	Set gtmtypes("shm_snapshot_t",437,"name")="shm_snapshot_t.shadow_file_header.wcb_wtfini_lckfail3_cntr"
+	Set gtmtypes("shm_snapshot_t",437,"off")=7832
 	Set gtmtypes("shm_snapshot_t",437,"len")=4
 	Set gtmtypes("shm_snapshot_t",437,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_wtfini_lckfail3_cntr")=437
+	Set gtmtypes("shm_snapshot_t",438,"name")="shm_snapshot_t.shadow_file_header.wcb_wtfini_lckfail4_cntr"
+	Set gtmtypes("shm_snapshot_t",438,"off")=7836
 	Set gtmtypes("shm_snapshot_t",438,"len")=4
 	Set gtmtypes("shm_snapshot_t",438,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_wtfini_lckfail4_cntr")=438
+	Set gtmtypes("shm_snapshot_t",439,"name")="shm_snapshot_t.shadow_file_header.wcb_t_end_sysops_dirtystuck1_cntr"
+	Set gtmtypes("shm_snapshot_t",439,"off")=7840
 	Set gtmtypes("shm_snapshot_t",439,"len")=4
 	Set gtmtypes("shm_snapshot_t",439,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_t_end_sysops_dirtystuck1_cntr")=439
+	Set gtmtypes("shm_snapshot_t",440,"name")="shm_snapshot_t.shadow_file_header.wcb_t_end_sysops_dirtystuck2_cntr"
+	Set gtmtypes("shm_snapshot_t",440,"off")=7844
 	Set gtmtypes("shm_snapshot_t",440,"len")=4
 	Set gtmtypes("shm_snapshot_t",440,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_t_end_sysops_dirtystuck2_cntr")=440
+	Set gtmtypes("shm_snapshot_t",441,"name")="shm_snapshot_t.shadow_file_header.wcb_secshr_db_clnup_wbuf_dqd_cntr"
+	Set gtmtypes("shm_snapshot_t",441,"off")=7848
 	Set gtmtypes("shm_snapshot_t",441,"len")=4
 	Set gtmtypes("shm_snapshot_t",441,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_secshr_db_clnup_wbuf_dqd_cntr")=441
+	Set gtmtypes("shm_snapshot_t",442,"name")="shm_snapshot_t.shadow_file_header.dwngrd_refmts_syncio_cntr"
+	Set gtmtypes("shm_snapshot_t",442,"off")=7852
 	Set gtmtypes("shm_snapshot_t",442,"len")=4
 	Set gtmtypes("shm_snapshot_t",442,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.dwngrd_refmts_syncio_cntr")=442
+	Set gtmtypes("shm_snapshot_t",443,"name")="shm_snapshot_t.shadow_file_header.dwngrd_refmts_asyncio_cntr"
+	Set gtmtypes("shm_snapshot_t",443,"off")=7856
 	Set gtmtypes("shm_snapshot_t",443,"len")=4
 	Set gtmtypes("shm_snapshot_t",443,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.dwngrd_refmts_asyncio_cntr")=443
+	Set gtmtypes("shm_snapshot_t",444,"name")="shm_snapshot_t.shadow_file_header.shmpool_refmt_harvests_cntr"
+	Set gtmtypes("shm_snapshot_t",444,"off")=7860
 	Set gtmtypes("shm_snapshot_t",444,"len")=4
 	Set gtmtypes("shm_snapshot_t",444,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.shmpool_refmt_harvests_cntr")=444
+	Set gtmtypes("shm_snapshot_t",445,"name")="shm_snapshot_t.shadow_file_header.shmpool_recovery_cntr"
+	Set gtmtypes("shm_snapshot_t",445,"off")=7864
 	Set gtmtypes("shm_snapshot_t",445,"len")=4
 	Set gtmtypes("shm_snapshot_t",445,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.shmpool_recovery_cntr")=445
+	Set gtmtypes("shm_snapshot_t",446,"name")="shm_snapshot_t.shadow_file_header.shmpool_blkd_by_sdc_cntr"
+	Set gtmtypes("shm_snapshot_t",446,"off")=7868
 	Set gtmtypes("shm_snapshot_t",446,"len")=4
 	Set gtmtypes("shm_snapshot_t",446,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.shmpool_blkd_by_sdc_cntr")=446
+	Set gtmtypes("shm_snapshot_t",447,"name")="shm_snapshot_t.shadow_file_header.shmpool_alloc_bbflush_cntr"
+	Set gtmtypes("shm_snapshot_t",447,"off")=7872
 	Set gtmtypes("shm_snapshot_t",447,"len")=4
 	Set gtmtypes("shm_snapshot_t",447,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.shmpool_alloc_bbflush_cntr")=447
+	Set gtmtypes("shm_snapshot_t",448,"name")="shm_snapshot_t.shadow_file_header.refmt_hvst_blk_released_replaced_cntr"
+	Set gtmtypes("shm_snapshot_t",448,"off")=7876
 	Set gtmtypes("shm_snapshot_t",448,"len")=4
 	Set gtmtypes("shm_snapshot_t",448,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.refmt_hvst_blk_released_replaced_cntr")=448
+	Set gtmtypes("shm_snapshot_t",449,"name")="shm_snapshot_t.shadow_file_header.refmt_hvst_blk_released_io_complete_cntr"
+	Set gtmtypes("shm_snapshot_t",449,"off")=7880
 	Set gtmtypes("shm_snapshot_t",449,"len")=4
 	Set gtmtypes("shm_snapshot_t",449,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.refmt_hvst_blk_released_io_complete_cntr")=449
+	Set gtmtypes("shm_snapshot_t",450,"name")="shm_snapshot_t.shadow_file_header.refmt_hvst_blk_kept_cntr"
+	Set gtmtypes("shm_snapshot_t",450,"off")=7884
 	Set gtmtypes("shm_snapshot_t",450,"len")=4
 	Set gtmtypes("shm_snapshot_t",450,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.refmt_hvst_blk_kept_cntr")=450
+	Set gtmtypes("shm_snapshot_t",451,"name")="shm_snapshot_t.shadow_file_header.refmt_hvst_blk_ignored_cntr"
+	Set gtmtypes("shm_snapshot_t",451,"off")=7888
 	Set gtmtypes("shm_snapshot_t",451,"len")=4
 	Set gtmtypes("shm_snapshot_t",451,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.refmt_hvst_blk_ignored_cntr")=451
+	Set gtmtypes("shm_snapshot_t",452,"name")="shm_snapshot_t.shadow_file_header.refmt_blk_chk_blk_freed_cntr"
+	Set gtmtypes("shm_snapshot_t",452,"off")=7892
 	Set gtmtypes("shm_snapshot_t",452,"len")=4
 	Set gtmtypes("shm_snapshot_t",452,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.refmt_blk_chk_blk_freed_cntr")=452
+	Set gtmtypes("shm_snapshot_t",453,"name")="shm_snapshot_t.shadow_file_header.refmt_blk_chk_blk_kept_cntr"
+	Set gtmtypes("shm_snapshot_t",453,"off")=7896
 	Set gtmtypes("shm_snapshot_t",453,"len")=4
 	Set gtmtypes("shm_snapshot_t",453,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.refmt_blk_chk_blk_kept_cntr")=453
+	Set gtmtypes("shm_snapshot_t",454,"name")="shm_snapshot_t.shadow_file_header.active_lvl_trigger_cntr"
+	Set gtmtypes("shm_snapshot_t",454,"off")=7900
 	Set gtmtypes("shm_snapshot_t",454,"len")=4
 	Set gtmtypes("shm_snapshot_t",454,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.active_lvl_trigger_cntr")=454
+	Set gtmtypes("shm_snapshot_t",455,"name")="shm_snapshot_t.shadow_file_header.new_buff_cntr"
+	Set gtmtypes("shm_snapshot_t",455,"off")=7904
 	Set gtmtypes("shm_snapshot_t",455,"len")=4
 	Set gtmtypes("shm_snapshot_t",455,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.new_buff_cntr")=455
+	Set gtmtypes("shm_snapshot_t",456,"name")="shm_snapshot_t.shadow_file_header.phase2_commit_wait_sleep_in_crit_cntr"
+	Set gtmtypes("shm_snapshot_t",456,"off")=7908
 	Set gtmtypes("shm_snapshot_t",456,"len")=4
 	Set gtmtypes("shm_snapshot_t",456,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.phase2_commit_wait_sleep_in_crit_cntr")=456
+	Set gtmtypes("shm_snapshot_t",457,"name")="shm_snapshot_t.shadow_file_header.phase2_commit_wait_sleep_no_crit_cntr"
+	Set gtmtypes("shm_snapshot_t",457,"off")=7912
 	Set gtmtypes("shm_snapshot_t",457,"len")=4
 	Set gtmtypes("shm_snapshot_t",457,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.phase2_commit_wait_sleep_no_crit_cntr")=457
+	Set gtmtypes("shm_snapshot_t",458,"name")="shm_snapshot_t.shadow_file_header.phase2_commit_wait_pidcnt_cntr"
+	Set gtmtypes("shm_snapshot_t",458,"off")=7916
 	Set gtmtypes("shm_snapshot_t",458,"len")=4
 	Set gtmtypes("shm_snapshot_t",458,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.phase2_commit_wait_pidcnt_cntr")=458
+	Set gtmtypes("shm_snapshot_t",459,"name")="shm_snapshot_t.shadow_file_header.wcb_t_end_sysops_intend_wait_cntr"
+	Set gtmtypes("shm_snapshot_t",459,"off")=7920
 	Set gtmtypes("shm_snapshot_t",459,"len")=4
 	Set gtmtypes("shm_snapshot_t",459,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_t_end_sysops_intend_wait_cntr")=459
+	Set gtmtypes("shm_snapshot_t",460,"name")="shm_snapshot_t.shadow_file_header.wcb_secshr_db_clnup_phase2_clnup_cntr"
+	Set gtmtypes("shm_snapshot_t",460,"off")=7924
 	Set gtmtypes("shm_snapshot_t",460,"len")=4
 	Set gtmtypes("shm_snapshot_t",460,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_secshr_db_clnup_phase2_clnup_cntr")=460
+	Set gtmtypes("shm_snapshot_t",461,"name")="shm_snapshot_t.shadow_file_header.wcb_phase2_commit_wait_cntr"
+	Set gtmtypes("shm_snapshot_t",461,"off")=7928
 	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_phase2_commit_wait_cntr")=461
+	Set gtmtypes("shm_snapshot_t",462,"name")="shm_snapshot_t.shadow_file_header.recompute_upd_array_calls_cntr"
+	Set gtmtypes("shm_snapshot_t",462,"off")=7932
 	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.recompute_upd_array_calls_cntr")=462
+	Set gtmtypes("shm_snapshot_t",463,"name")="shm_snapshot_t.shadow_file_header.recompute_upd_array_rip_cntr"
+	Set gtmtypes("shm_snapshot_t",463,"off")=7936
 	Set gtmtypes("shm_snapshot_t",463,"len")=4
 	Set gtmtypes("shm_snapshot_t",463,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.recompute_upd_array_rip_cntr")=463
+	Set gtmtypes("shm_snapshot_t",464,"name")="shm_snapshot_t.shadow_file_header.recompute_upd_array_in_tend_cntr"
+	Set gtmtypes("shm_snapshot_t",464,"off")=7940
 	Set gtmtypes("shm_snapshot_t",464,"len")=4
 	Set gtmtypes("shm_snapshot_t",464,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.recompute_upd_array_in_tend_cntr")=464
+	Set gtmtypes("shm_snapshot_t",465,"name")="shm_snapshot_t.shadow_file_header.recompute_upd_array_search_blk_cntr"
+	Set gtmtypes("shm_snapshot_t",465,"off")=7944
 	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.recompute_upd_array_search_blk_cntr")=465
+	Set gtmtypes("shm_snapshot_t",466,"name")="shm_snapshot_t.shadow_file_header.recompute_upd_array_new_rec_cntr"
+	Set gtmtypes("shm_snapshot_t",466,"off")=7948
 	Set gtmtypes("shm_snapshot_t",466,"len")=4
 	Set gtmtypes("shm_snapshot_t",466,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.recompute_upd_array_new_rec_cntr")=466
+	Set gtmtypes("shm_snapshot_t",467,"name")="shm_snapshot_t.shadow_file_header.recompute_upd_array_rec_size_cntr"
+	Set gtmtypes("shm_snapshot_t",467,"off")=7952
 	Set gtmtypes("shm_snapshot_t",467,"len")=4
 	Set gtmtypes("shm_snapshot_t",467,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.recompute_upd_array_rec_size_cntr")=467
+	Set gtmtypes("shm_snapshot_t",468,"name")="shm_snapshot_t.shadow_file_header.recompute_upd_array_rec_cmpc_cntr"
+	Set gtmtypes("shm_snapshot_t",468,"off")=7956
 	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.recompute_upd_array_rec_cmpc_cntr")=468
+	Set gtmtypes("shm_snapshot_t",469,"name")="shm_snapshot_t.shadow_file_header.recompute_upd_array_blk_fini_cntr"
+	Set gtmtypes("shm_snapshot_t",469,"off")=7960
 	Set gtmtypes("shm_snapshot_t",469,"len")=4
 	Set gtmtypes("shm_snapshot_t",469,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.recompute_upd_array_blk_fini_cntr")=469
+	Set gtmtypes("shm_snapshot_t",470,"name")="shm_snapshot_t.shadow_file_header.recompute_upd_array_blk_split_cntr"
+	Set gtmtypes("shm_snapshot_t",470,"off")=7964
 	Set gtmtypes("shm_snapshot_t",470,"len")=4
 	Set gtmtypes("shm_snapshot_t",470,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.recompute_upd_array_blk_split_cntr")=470
+	Set gtmtypes("shm_snapshot_t",471,"name")="shm_snapshot_t.shadow_file_header.t_qread_ripsleep_cnt_cntr"
+	Set gtmtypes("shm_snapshot_t",471,"off")=7968
 	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.t_qread_ripsleep_cnt_cntr")=471
+	Set gtmtypes("shm_snapshot_t",472,"name")="shm_snapshot_t.shadow_file_header.t_qread_ripsleep_nblks_cntr"
+	Set gtmtypes("shm_snapshot_t",472,"off")=7972
 	Set gtmtypes("shm_snapshot_t",472,"len")=4
 	Set gtmtypes("shm_snapshot_t",472,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.t_qread_ripsleep_nblks_cntr")=472
+	Set gtmtypes("shm_snapshot_t",473,"name")="shm_snapshot_t.shadow_file_header.wcs_wtfini_invoked_cntr"
+	Set gtmtypes("shm_snapshot_t",473,"off")=7976
 	Set gtmtypes("shm_snapshot_t",473,"len")=4
 	Set gtmtypes("shm_snapshot_t",473,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcs_wtfini_invoked_cntr")=473
+	Set gtmtypes("shm_snapshot_t",474,"name")="shm_snapshot_t.shadow_file_header.wcs_wterror_invoked_cntr"
+	Set gtmtypes("shm_snapshot_t",474,"off")=7980
 	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcs_wterror_invoked_cntr")=474
+	Set gtmtypes("shm_snapshot_t",475,"name")="shm_snapshot_t.shadow_file_header.wcs_wt_restart_invoked_cntr"
+	Set gtmtypes("shm_snapshot_t",475,"off")=7984
 	Set gtmtypes("shm_snapshot_t",475,"len")=4
 	Set gtmtypes("shm_snapshot_t",475,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcs_wt_restart_invoked_cntr")=475
+	Set gtmtypes("shm_snapshot_t",476,"name")="shm_snapshot_t.shadow_file_header.wcs_wt_restart_eagain_cntr"
+	Set gtmtypes("shm_snapshot_t",476,"off")=7988
 	Set gtmtypes("shm_snapshot_t",476,"len")=4
 	Set gtmtypes("shm_snapshot_t",476,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcs_wt_restart_eagain_cntr")=476
+	Set gtmtypes("shm_snapshot_t",477,"name")="shm_snapshot_t.shadow_file_header.wcs_wt_restart_reinsert_cntr"
+	Set gtmtypes("shm_snapshot_t",477,"off")=7992
 	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcs_wt_restart_reinsert_cntr")=477
+	Set gtmtypes("shm_snapshot_t",478,"name")="shm_snapshot_t.shadow_file_header.wcs_wtstart_eagain_cntr"
+	Set gtmtypes("shm_snapshot_t",478,"off")=7996
+	Set gtmtypes("shm_snapshot_t",478,"len")=4
+	Set gtmtypes("shm_snapshot_t",478,"type")="int"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcs_wtstart_eagain_cntr")=478
+	Set gtmtypes("shm_snapshot_t",479,"name")="shm_snapshot_t.shadow_file_header.wcs_wtstart_eagain_incrit_cntr"
+	Set gtmtypes("shm_snapshot_t",479,"off")=8000
+	Set gtmtypes("shm_snapshot_t",479,"len")=4
+	Set gtmtypes("shm_snapshot_t",479,"type")="int"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcs_wtstart_eagain_incrit_cntr")=479
+	Set gtmtypes("shm_snapshot_t",480,"name")="shm_snapshot_t.shadow_file_header.async_restart_eagain_cntr"
+	Set gtmtypes("shm_snapshot_t",480,"off")=8004
 	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.async_restart_eagain_cntr")=480
+	Set gtmtypes("shm_snapshot_t",481,"name")="shm_snapshot_t.shadow_file_header.jnlbuff_phs2cmt_array_full_cntr"
+	Set gtmtypes("shm_snapshot_t",481,"off")=8008
 	Set gtmtypes("shm_snapshot_t",481,"len")=4
 	Set gtmtypes("shm_snapshot_t",481,"type")="int"
-	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.jnlbuff_phs2cmt_array_full_cntr")=481
+	Set gtmtypes("shm_snapshot_t",482,"name")="shm_snapshot_t.shadow_file_header.jnl_phase2_cleanup_if_possible_cntr"
+	Set gtmtypes("shm_snapshot_t",482,"off")=8012
+	Set gtmtypes("shm_snapshot_t",482,"len")=4
+	Set gtmtypes("shm_snapshot_t",482,"type")="int"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.jnl_phase2_cleanup_if_possible_cntr")=482
+	Set gtmtypes("shm_snapshot_t",483,"name")="shm_snapshot_t.shadow_file_header.jnlbuff_phs2cmt_isprcalv_cntr"
+	Set gtmtypes("shm_snapshot_t",483,"off")=8016
 	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_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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.jnlbuff_phs2cmt_isprcalv_cntr")=483
+	Set gtmtypes("shm_snapshot_t",484,"name")="shm_snapshot_t.shadow_file_header.bg_trc_rec_cntr_filler"
+	Set gtmtypes("shm_snapshot_t",484,"off")=8020
+	Set gtmtypes("shm_snapshot_t",484,"len")=12
+	Set gtmtypes("shm_snapshot_t",484,"type")="char"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.bg_trc_rec_cntr_filler")=484
+	Set gtmtypes("shm_snapshot_t",485,"name")="shm_snapshot_t.shadow_file_header.n_gvcst_srches"
+	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")=8048
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_gvcst_srches")=485
+	Set gtmtypes("shm_snapshot_t",486,"name")="shm_snapshot_t.shadow_file_header.n_gvcst_srches.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")=8052
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_gvcst_srches.curr_count")=486
+	Set gtmtypes("shm_snapshot_t",487,"name")="shm_snapshot_t.shadow_file_header.n_gvcst_srches.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.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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_gvcst_srches.cumul_count")=487
+	Set gtmtypes("shm_snapshot_t",488,"name")="shm_snapshot_t.shadow_file_header.n_gvcst_srch_clues"
+	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")=8056
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_gvcst_srch_clues")=488
+	Set gtmtypes("shm_snapshot_t",489,"name")="shm_snapshot_t.shadow_file_header.n_gvcst_srch_clues.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")=8060
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_gvcst_srch_clues.curr_count")=489
+	Set gtmtypes("shm_snapshot_t",490,"name")="shm_snapshot_t.shadow_file_header.n_gvcst_srch_clues.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_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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_gvcst_srch_clues.cumul_count")=490
+	Set gtmtypes("shm_snapshot_t",491,"name")="shm_snapshot_t.shadow_file_header.n_clue_used_head"
+	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")=8064
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_clue_used_head")=491
+	Set gtmtypes("shm_snapshot_t",492,"name")="shm_snapshot_t.shadow_file_header.n_clue_used_head.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")=8068
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_clue_used_head.curr_count")=492
+	Set gtmtypes("shm_snapshot_t",493,"name")="shm_snapshot_t.shadow_file_header.n_clue_used_head.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_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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_clue_used_head.cumul_count")=493
+	Set gtmtypes("shm_snapshot_t",494,"name")="shm_snapshot_t.shadow_file_header.n_clue_used_same"
+	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")=8072
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_clue_used_same")=494
+	Set gtmtypes("shm_snapshot_t",495,"name")="shm_snapshot_t.shadow_file_header.n_clue_used_same.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")=8076
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_clue_used_same.curr_count")=495
+	Set gtmtypes("shm_snapshot_t",496,"name")="shm_snapshot_t.shadow_file_header.n_clue_used_same.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_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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_clue_used_same.cumul_count")=496
+	Set gtmtypes("shm_snapshot_t",497,"name")="shm_snapshot_t.shadow_file_header.n_clue_used_tail"
+	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")=8080
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_clue_used_tail")=497
+	Set gtmtypes("shm_snapshot_t",498,"name")="shm_snapshot_t.shadow_file_header.n_clue_used_tail.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")=8084
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_clue_used_tail.curr_count")=498
+	Set gtmtypes("shm_snapshot_t",499,"name")="shm_snapshot_t.shadow_file_header.n_clue_used_tail.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")=8088
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_clue_used_tail.cumul_count")=499
+	Set gtmtypes("shm_snapshot_t",500,"name")="shm_snapshot_t.shadow_file_header.n_t_qreads"
+	Set gtmtypes("shm_snapshot_t",500,"off")=8072
 	Set gtmtypes("shm_snapshot_t",500,"len")=8
 	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_t_qreads")=500
+	Set gtmtypes("shm_snapshot_t",501,"name")="shm_snapshot_t.shadow_file_header.n_t_qreads.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")=8092
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_t_qreads.curr_count")=501
+	Set gtmtypes("shm_snapshot_t",502,"name")="shm_snapshot_t.shadow_file_header.n_t_qreads.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")=8096
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_t_qreads.cumul_count")=502
+	Set gtmtypes("shm_snapshot_t",503,"name")="shm_snapshot_t.shadow_file_header.unused_dsk_reads"
+	Set gtmtypes("shm_snapshot_t",503,"off")=8080
 	Set gtmtypes("shm_snapshot_t",503,"len")=8
 	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.unused_dsk_reads")=503
+	Set gtmtypes("shm_snapshot_t",504,"name")="shm_snapshot_t.shadow_file_header.unused_dsk_reads.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")=8100
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.unused_dsk_reads.curr_count")=504
+	Set gtmtypes("shm_snapshot_t",505,"name")="shm_snapshot_t.shadow_file_header.unused_dsk_reads.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")=8104
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.unused_dsk_reads.cumul_count")=505
+	Set gtmtypes("shm_snapshot_t",506,"name")="shm_snapshot_t.shadow_file_header.n_bgmm_updates"
+	Set gtmtypes("shm_snapshot_t",506,"off")=8088
 	Set gtmtypes("shm_snapshot_t",506,"len")=8
 	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_bgmm_updates")=506
+	Set gtmtypes("shm_snapshot_t",507,"name")="shm_snapshot_t.shadow_file_header.n_bgmm_updates.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")=8108
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_bgmm_updates.curr_count")=507
+	Set gtmtypes("shm_snapshot_t",508,"name")="shm_snapshot_t.shadow_file_header.n_bgmm_updates.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")=8112
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_bgmm_updates.cumul_count")=508
+	Set gtmtypes("shm_snapshot_t",509,"name")="shm_snapshot_t.shadow_file_header.unused_dsk_writes"
+	Set gtmtypes("shm_snapshot_t",509,"off")=8096
 	Set gtmtypes("shm_snapshot_t",509,"len")=8
 	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.unused_dsk_writes")=509
+	Set gtmtypes("shm_snapshot_t",510,"name")="shm_snapshot_t.shadow_file_header.unused_dsk_writes.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")=8116
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.unused_dsk_writes.curr_count")=510
+	Set gtmtypes("shm_snapshot_t",511,"name")="shm_snapshot_t.shadow_file_header.unused_dsk_writes.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")=8120
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.unused_dsk_writes.cumul_count")=511
+	Set gtmtypes("shm_snapshot_t",512,"name")="shm_snapshot_t.shadow_file_header.n_bg_update_creates"
+	Set gtmtypes("shm_snapshot_t",512,"off")=8104
 	Set gtmtypes("shm_snapshot_t",512,"len")=8
 	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_bg_update_creates")=512
+	Set gtmtypes("shm_snapshot_t",513,"name")="shm_snapshot_t.shadow_file_header.n_bg_update_creates.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")=8124
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_bg_update_creates.curr_count")=513
+	Set gtmtypes("shm_snapshot_t",514,"name")="shm_snapshot_t.shadow_file_header.n_bg_update_creates.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")=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_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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_bg_update_creates.cumul_count")=514
+	Set gtmtypes("shm_snapshot_t",515,"name")="shm_snapshot_t.shadow_file_header.n_db_csh_getns"
+	Set gtmtypes("shm_snapshot_t",515,"off")=8112
+	Set gtmtypes("shm_snapshot_t",515,"len")=8
+	Set gtmtypes("shm_snapshot_t",515,"type")="db_csh_acct_rec"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_db_csh_getns")=515
+	Set gtmtypes("shm_snapshot_t",516,"name")="shm_snapshot_t.shadow_file_header.n_db_csh_getns.curr_count"
+	Set gtmtypes("shm_snapshot_t",516,"off")=8112
+	Set gtmtypes("shm_snapshot_t",516,"len")=4
+	Set gtmtypes("shm_snapshot_t",516,"type")="int"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_db_csh_getns.curr_count")=516
+	Set gtmtypes("shm_snapshot_t",517,"name")="shm_snapshot_t.shadow_file_header.n_db_csh_getns.cumul_count"
+	Set gtmtypes("shm_snapshot_t",517,"off")=8116
+	Set gtmtypes("shm_snapshot_t",517,"len")=4
+	Set gtmtypes("shm_snapshot_t",517,"type")="int"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_db_csh_getns.cumul_count")=517
+	Set gtmtypes("shm_snapshot_t",518,"name")="shm_snapshot_t.shadow_file_header.n_db_csh_getn_lcnt"
+	Set gtmtypes("shm_snapshot_t",518,"off")=8120
 	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_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_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_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_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_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",518,"type")="db_csh_acct_rec"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_db_csh_getn_lcnt")=518
+	Set gtmtypes("shm_snapshot_t",519,"name")="shm_snapshot_t.shadow_file_header.n_db_csh_getn_lcnt.curr_count"
+	Set gtmtypes("shm_snapshot_t",519,"off")=8120
+	Set gtmtypes("shm_snapshot_t",519,"len")=4
+	Set gtmtypes("shm_snapshot_t",519,"type")="int"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_db_csh_getn_lcnt.curr_count")=519
+	Set gtmtypes("shm_snapshot_t",520,"name")="shm_snapshot_t.shadow_file_header.n_db_csh_getn_lcnt.cumul_count"
+	Set gtmtypes("shm_snapshot_t",520,"off")=8124
+	Set gtmtypes("shm_snapshot_t",520,"len")=4
+	Set gtmtypes("shm_snapshot_t",520,"type")="int"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_db_csh_getn_lcnt.cumul_count")=520
+	Set gtmtypes("shm_snapshot_t",521,"name")="shm_snapshot_t.shadow_file_header.db_csh_acct_rec_filler_4k"
+	Set gtmtypes("shm_snapshot_t",521,"off")=8128
+	Set gtmtypes("shm_snapshot_t",521,"len")=152
+	Set gtmtypes("shm_snapshot_t",521,"type")="char"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.db_csh_acct_rec_filler_4k")=521
+	Set gtmtypes("shm_snapshot_t",522,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec"
+	Set gtmtypes("shm_snapshot_t",522,"off")=8280
+	Set gtmtypes("shm_snapshot_t",522,"len")=472
+	Set gtmtypes("shm_snapshot_t",522,"type")="gvstats_rec_t"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec")=522
+	Set gtmtypes("shm_snapshot_t",523,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_set"
+	Set gtmtypes("shm_snapshot_t",523,"off")=8280
 	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_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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_set")=523
+	Set gtmtypes("shm_snapshot_t",524,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_kill"
+	Set gtmtypes("shm_snapshot_t",524,"off")=8288
 	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_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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_kill")=524
+	Set gtmtypes("shm_snapshot_t",525,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_get"
+	Set gtmtypes("shm_snapshot_t",525,"off")=8296
 	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_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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_get")=525
+	Set gtmtypes("shm_snapshot_t",526,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_data"
+	Set gtmtypes("shm_snapshot_t",526,"off")=8304
 	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.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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_data")=526
+	Set gtmtypes("shm_snapshot_t",527,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_order"
+	Set gtmtypes("shm_snapshot_t",527,"off")=8312
 	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_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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_order")=527
+	Set gtmtypes("shm_snapshot_t",528,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_zprev"
+	Set gtmtypes("shm_snapshot_t",528,"off")=8320
 	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_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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_zprev")=528
+	Set gtmtypes("shm_snapshot_t",529,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_query"
+	Set gtmtypes("shm_snapshot_t",529,"off")=8328
 	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_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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_query")=529
+	Set gtmtypes("shm_snapshot_t",530,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_lock_success"
+	Set gtmtypes("shm_snapshot_t",530,"off")=8336
 	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_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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_lock_success")=530
+	Set gtmtypes("shm_snapshot_t",531,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_lock_fail"
+	Set gtmtypes("shm_snapshot_t",531,"off")=8344
 	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_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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_lock_fail")=531
+	Set gtmtypes("shm_snapshot_t",532,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.db_curr_tn"
+	Set gtmtypes("shm_snapshot_t",532,"off")=8352
 	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_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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.db_curr_tn")=532
+	Set gtmtypes("shm_snapshot_t",533,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_dsk_read"
+	Set gtmtypes("shm_snapshot_t",533,"off")=8360
 	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_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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_dsk_read")=533
+	Set gtmtypes("shm_snapshot_t",534,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_dsk_write"
+	Set gtmtypes("shm_snapshot_t",534,"off")=8368
 	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_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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_dsk_write")=534
+	Set gtmtypes("shm_snapshot_t",535,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_nontp_readwrite"
+	Set gtmtypes("shm_snapshot_t",535,"off")=8376
 	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_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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_nontp_readwrite")=535
+	Set gtmtypes("shm_snapshot_t",536,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_nontp_readonly"
+	Set gtmtypes("shm_snapshot_t",536,"off")=8384
 	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_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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_nontp_readonly")=536
+	Set gtmtypes("shm_snapshot_t",537,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_nontp_blkwrite"
+	Set gtmtypes("shm_snapshot_t",537,"off")=8392
 	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_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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_nontp_blkwrite")=537
+	Set gtmtypes("shm_snapshot_t",538,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_nontp_blkread"
+	Set gtmtypes("shm_snapshot_t",538,"off")=8400
 	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_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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_nontp_blkread")=538
+	Set gtmtypes("shm_snapshot_t",539,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_nontp_retries_0"
+	Set gtmtypes("shm_snapshot_t",539,"off")=8408
 	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_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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_nontp_retries_0")=539
+	Set gtmtypes("shm_snapshot_t",540,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_nontp_retries_1"
+	Set gtmtypes("shm_snapshot_t",540,"off")=8416
 	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_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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_nontp_retries_1")=540
+	Set gtmtypes("shm_snapshot_t",541,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_nontp_retries_2"
+	Set gtmtypes("shm_snapshot_t",541,"off")=8424
 	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_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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_nontp_retries_2")=541
+	Set gtmtypes("shm_snapshot_t",542,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_nontp_retries_3"
+	Set gtmtypes("shm_snapshot_t",542,"off")=8432
 	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_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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_nontp_retries_3")=542
+	Set gtmtypes("shm_snapshot_t",543,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_tp_readwrite"
+	Set gtmtypes("shm_snapshot_t",543,"off")=8440
 	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_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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_tp_readwrite")=543
+	Set gtmtypes("shm_snapshot_t",544,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_tp_readonly"
+	Set gtmtypes("shm_snapshot_t",544,"off")=8448
 	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_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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_tp_readonly")=544
+	Set gtmtypes("shm_snapshot_t",545,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_tp_rolledback"
+	Set gtmtypes("shm_snapshot_t",545,"off")=8456
 	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_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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_tp_rolledback")=545
+	Set gtmtypes("shm_snapshot_t",546,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_tp_blkwrite"
+	Set gtmtypes("shm_snapshot_t",546,"off")=8464
 	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_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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_tp_blkwrite")=546
+	Set gtmtypes("shm_snapshot_t",547,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_tp_blkread"
+	Set gtmtypes("shm_snapshot_t",547,"off")=8472
 	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_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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_tp_blkread")=547
+	Set gtmtypes("shm_snapshot_t",548,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_tp_tot_retries_0"
+	Set gtmtypes("shm_snapshot_t",548,"off")=8480
 	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_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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_tp_tot_retries_0")=548
+	Set gtmtypes("shm_snapshot_t",549,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_tp_tot_retries_1"
+	Set gtmtypes("shm_snapshot_t",549,"off")=8488
 	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_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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_tp_tot_retries_1")=549
+	Set gtmtypes("shm_snapshot_t",550,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_tp_tot_retries_2"
+	Set gtmtypes("shm_snapshot_t",550,"off")=8496
 	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_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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_tp_tot_retries_2")=550
+	Set gtmtypes("shm_snapshot_t",551,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_tp_tot_retries_3"
+	Set gtmtypes("shm_snapshot_t",551,"off")=8504
 	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_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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_tp_tot_retries_3")=551
+	Set gtmtypes("shm_snapshot_t",552,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_tp_tot_retries_4"
+	Set gtmtypes("shm_snapshot_t",552,"off")=8512
 	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.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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_tp_tot_retries_4")=552
+	Set gtmtypes("shm_snapshot_t",553,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_tp_cnflct_retries_0"
+	Set gtmtypes("shm_snapshot_t",553,"off")=8520
 	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_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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_tp_cnflct_retries_0")=553
+	Set gtmtypes("shm_snapshot_t",554,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_tp_cnflct_retries_1"
+	Set gtmtypes("shm_snapshot_t",554,"off")=8528
 	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.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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_tp_cnflct_retries_1")=554
+	Set gtmtypes("shm_snapshot_t",555,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_tp_cnflct_retries_2"
+	Set gtmtypes("shm_snapshot_t",555,"off")=8536
 	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_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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_tp_cnflct_retries_2")=555
+	Set gtmtypes("shm_snapshot_t",556,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_tp_cnflct_retries_3"
+	Set gtmtypes("shm_snapshot_t",556,"off")=8544
 	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.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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_tp_cnflct_retries_3")=556
+	Set gtmtypes("shm_snapshot_t",557,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_tp_cnflct_retries_4"
+	Set gtmtypes("shm_snapshot_t",557,"off")=8552
 	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_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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_tp_cnflct_retries_4")=557
+	Set gtmtypes("shm_snapshot_t",558,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_ztrigger"
+	Set gtmtypes("shm_snapshot_t",558,"off")=8560
 	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_ztrigger")=558
+	Set gtmtypes("shm_snapshot_t",559,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_db_flush"
+	Set gtmtypes("shm_snapshot_t",559,"off")=8568
 	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_db_flush")=559
+	Set gtmtypes("shm_snapshot_t",560,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_db_fsync"
+	Set gtmtypes("shm_snapshot_t",560,"off")=8576
 	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.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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_db_fsync")=560
+	Set gtmtypes("shm_snapshot_t",561,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_jnl_flush"
+	Set gtmtypes("shm_snapshot_t",561,"off")=8584
 	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_jnl_flush")=561
+	Set gtmtypes("shm_snapshot_t",562,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_jnl_fsync"
+	Set gtmtypes("shm_snapshot_t",562,"off")=8592
 	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_jnl_fsync")=562
+	Set gtmtypes("shm_snapshot_t",563,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_jbuff_bytes"
+	Set gtmtypes("shm_snapshot_t",563,"off")=8600
 	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_jbuff_bytes")=563
+	Set gtmtypes("shm_snapshot_t",564,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_jfile_bytes"
+	Set gtmtypes("shm_snapshot_t",564,"off")=8608
 	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_jfile_bytes")=564
+	Set gtmtypes("shm_snapshot_t",565,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_jfile_writes"
+	Set gtmtypes("shm_snapshot_t",565,"off")=8616
 	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_jfile_writes")=565
+	Set gtmtypes("shm_snapshot_t",566,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_jrec_logical"
+	Set gtmtypes("shm_snapshot_t",566,"off")=8624
 	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_jrec_logical")=566
+	Set gtmtypes("shm_snapshot_t",567,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_jrec_pblk"
+	Set gtmtypes("shm_snapshot_t",567,"off")=8632
 	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_jrec_pblk")=567
+	Set gtmtypes("shm_snapshot_t",568,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_jrec_epoch_regular"
+	Set gtmtypes("shm_snapshot_t",568,"off")=8640
 	Set gtmtypes("shm_snapshot_t",568,"len")=8
 	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_jrec_epoch_regular")=568
+	Set gtmtypes("shm_snapshot_t",569,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_jrec_epoch_idle"
+	Set gtmtypes("shm_snapshot_t",569,"off")=8648
 	Set gtmtypes("shm_snapshot_t",569,"len")=8
 	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_jrec_epoch_idle")=569
+	Set gtmtypes("shm_snapshot_t",570,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_jrec_other"
+	Set gtmtypes("shm_snapshot_t",570,"off")=8656
 	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.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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_jrec_other")=570
+	Set gtmtypes("shm_snapshot_t",571,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_jnl_extends"
+	Set gtmtypes("shm_snapshot_t",571,"off")=8664
 	Set gtmtypes("shm_snapshot_t",571,"len")=8
 	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_jnl_extends")=571
+	Set gtmtypes("shm_snapshot_t",572,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_db_extends"
+	Set gtmtypes("shm_snapshot_t",572,"off")=8672
 	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_db_extends")=572
+	Set gtmtypes("shm_snapshot_t",573,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_crit_success"
+	Set gtmtypes("shm_snapshot_t",573,"off")=8680
 	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_crit_success")=573
+	Set gtmtypes("shm_snapshot_t",574,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_crits_in_epch"
+	Set gtmtypes("shm_snapshot_t",574,"off")=8688
 	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_crits_in_epch")=574
+	Set gtmtypes("shm_snapshot_t",575,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.sq_crit_failed"
+	Set gtmtypes("shm_snapshot_t",575,"off")=8696
 	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.sq_crit_failed")=575
+	Set gtmtypes("shm_snapshot_t",576,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_crit_failed"
+	Set gtmtypes("shm_snapshot_t",576,"off")=8704
+	Set gtmtypes("shm_snapshot_t",576,"len")=8
+	Set gtmtypes("shm_snapshot_t",576,"type")="uint64_t"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_crit_failed")=576
+	Set gtmtypes("shm_snapshot_t",577,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.sq_crit_que_slps"
+	Set gtmtypes("shm_snapshot_t",577,"off")=8712
+	Set gtmtypes("shm_snapshot_t",577,"len")=8
+	Set gtmtypes("shm_snapshot_t",577,"type")="uint64_t"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.sq_crit_que_slps")=577
+	Set gtmtypes("shm_snapshot_t",578,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_crit_que_slps"
+	Set gtmtypes("shm_snapshot_t",578,"off")=8720
+	Set gtmtypes("shm_snapshot_t",578,"len")=8
 	Set gtmtypes("shm_snapshot_t",578,"type")="uint64_t"
-	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.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")="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")="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")="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")="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")="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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_crit_que_slps")=578
+	Set gtmtypes("shm_snapshot_t",579,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.sq_crit_yields"
+	Set gtmtypes("shm_snapshot_t",579,"off")=8728
+	Set gtmtypes("shm_snapshot_t",579,"len")=8
+	Set gtmtypes("shm_snapshot_t",579,"type")="uint64_t"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.sq_crit_yields")=579
+	Set gtmtypes("shm_snapshot_t",580,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_crit_yields"
+	Set gtmtypes("shm_snapshot_t",580,"off")=8736
+	Set gtmtypes("shm_snapshot_t",580,"len")=8
+	Set gtmtypes("shm_snapshot_t",580,"type")="uint64_t"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_crit_yields")=580
+	Set gtmtypes("shm_snapshot_t",581,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_clean2dirty"
+	Set gtmtypes("shm_snapshot_t",581,"off")=8744
+	Set gtmtypes("shm_snapshot_t",581,"len")=8
+	Set gtmtypes("shm_snapshot_t",581,"type")="uint64_t"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_clean2dirty")=581
+	Set gtmtypes("shm_snapshot_t",582,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec_filler_4k_plus_512"
+	Set gtmtypes("shm_snapshot_t",582,"off")=8752
+	Set gtmtypes("shm_snapshot_t",582,"len")=40
+	Set gtmtypes("shm_snapshot_t",582,"type")="char"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec_filler_4k_plus_512")=582
+	Set gtmtypes("shm_snapshot_t",583,"name")="shm_snapshot_t.shadow_file_header.filler_4k_plus_512"
+	Set gtmtypes("shm_snapshot_t",583,"off")=8792
+	Set gtmtypes("shm_snapshot_t",583,"len")=368
+	Set gtmtypes("shm_snapshot_t",583,"type")="char"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.filler_4k_plus_512")=583
+	Set gtmtypes("shm_snapshot_t",584,"name")="shm_snapshot_t.shadow_file_header.intrpt_recov_resync_strm_seqno"
+	Set gtmtypes("shm_snapshot_t",584,"off")=9160
+	Set gtmtypes("shm_snapshot_t",584,"len")=128
+	Set gtmtypes("shm_snapshot_t",584,"type")="uint64_t"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.intrpt_recov_resync_strm_seqno")=584
+	Set gtmtypes("shm_snapshot_t",584,"dim")=16
+	Set gtmtypes("shm_snapshot_t",585,"name")="shm_snapshot_t.shadow_file_header.creation_db_ver"
+	Set gtmtypes("shm_snapshot_t",585,"off")=9288
+	Set gtmtypes("shm_snapshot_t",585,"len")=4
+	Set gtmtypes("shm_snapshot_t",585,"type")="int"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.creation_db_ver")=585
+	Set gtmtypes("shm_snapshot_t",586,"name")="shm_snapshot_t.shadow_file_header.creation_mdb_ver"
+	Set gtmtypes("shm_snapshot_t",586,"off")=9292
+	Set gtmtypes("shm_snapshot_t",586,"len")=4
+	Set gtmtypes("shm_snapshot_t",586,"type")="int"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.creation_mdb_ver")=586
+	Set gtmtypes("shm_snapshot_t",587,"name")="shm_snapshot_t.shadow_file_header.certified_for_upgrade_to"
+	Set gtmtypes("shm_snapshot_t",587,"off")=9296
+	Set gtmtypes("shm_snapshot_t",587,"len")=4
+	Set gtmtypes("shm_snapshot_t",587,"type")="int"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.certified_for_upgrade_to")=587
+	Set gtmtypes("shm_snapshot_t",588,"name")="shm_snapshot_t.shadow_file_header.filler_5k"
+	Set gtmtypes("shm_snapshot_t",588,"off")=9300
+	Set gtmtypes("shm_snapshot_t",588,"len")=4
+	Set gtmtypes("shm_snapshot_t",588,"type")="int"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.filler_5k")=588
+	Set gtmtypes("shm_snapshot_t",589,"name")="shm_snapshot_t.shadow_file_header.secshr_ops_index_filler"
+	Set gtmtypes("shm_snapshot_t",589,"off")=9304
+	Set gtmtypes("shm_snapshot_t",589,"len")=4
+	Set gtmtypes("shm_snapshot_t",589,"type")="int"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.secshr_ops_index_filler")=589
+	Set gtmtypes("shm_snapshot_t",590,"name")="shm_snapshot_t.shadow_file_header.secshr_ops_array_filler"
+	Set gtmtypes("shm_snapshot_t",590,"off")=9308
+	Set gtmtypes("shm_snapshot_t",590,"len")=1020
 	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.secshr_ops_array_filler")=590
+	Set gtmtypes("shm_snapshot_t",590,"dim")=255
+	Set gtmtypes("shm_snapshot_t",591,"name")="shm_snapshot_t.shadow_file_header.next_upgrd_warn"
+	Set gtmtypes("shm_snapshot_t",591,"off")=10328
+	Set gtmtypes("shm_snapshot_t",591,"len")=24
+	Set gtmtypes("shm_snapshot_t",591,"type")="compswap_time_field"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.next_upgrd_warn")=591
+	Set gtmtypes("shm_snapshot_t",592,"name")="shm_snapshot_t.shadow_file_header.next_upgrd_warn.time_latch"
+	Set gtmtypes("shm_snapshot_t",592,"off")=10328
+	Set gtmtypes("shm_snapshot_t",592,"len")=8
+	Set gtmtypes("shm_snapshot_t",592,"type")="global_latch_t"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.next_upgrd_warn.time_latch")=592
+	Set gtmtypes("shm_snapshot_t",593,"name")="shm_snapshot_t.shadow_file_header.next_upgrd_warn.time_latch.u"
+	Set gtmtypes("shm_snapshot_t",593,"off")=10328
+	Set gtmtypes("shm_snapshot_t",593,"len")=8
+	Set gtmtypes("shm_snapshot_t",593,"type")="union"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.next_upgrd_warn.time_latch.u")=593
+	Set gtmtypes("shm_snapshot_t",594,"name")="shm_snapshot_t.shadow_file_header.next_upgrd_warn.time_latch.u.pid_imgcnt"
+	Set gtmtypes("shm_snapshot_t",594,"off")=10328
+	Set gtmtypes("shm_snapshot_t",594,"len")=8
+	Set gtmtypes("shm_snapshot_t",594,"type")="uint64_t"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.next_upgrd_warn.time_latch.u.pid_imgcnt")=594
+	Set gtmtypes("shm_snapshot_t",595,"name")="shm_snapshot_t.shadow_file_header.next_upgrd_warn.time_latch.u.parts"
+	Set gtmtypes("shm_snapshot_t",595,"off")=10328
+	Set gtmtypes("shm_snapshot_t",595,"len")=8
+	Set gtmtypes("shm_snapshot_t",595,"type")="struct"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.next_upgrd_warn.time_latch.u.parts")=595
+	Set gtmtypes("shm_snapshot_t",596,"name")="shm_snapshot_t.shadow_file_header.next_upgrd_warn.time_latch.u.parts.latch_pid"
+	Set gtmtypes("shm_snapshot_t",596,"off")=10328
+	Set gtmtypes("shm_snapshot_t",596,"len")=4
+	Set gtmtypes("shm_snapshot_t",596,"type")="int"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.next_upgrd_warn.time_latch.u.parts.latch_pid")=596
+	Set gtmtypes("shm_snapshot_t",597,"name")="shm_snapshot_t.shadow_file_header.next_upgrd_warn.time_latch.u.parts.latch_word"
+	Set gtmtypes("shm_snapshot_t",597,"off")=10332
 	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",597,"type")="int"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.next_upgrd_warn.time_latch.u.parts.latch_word")=597
+	Set gtmtypes("shm_snapshot_t",598,"name")="shm_snapshot_t.shadow_file_header.next_upgrd_warn.hp_latch_space"
+	Set gtmtypes("shm_snapshot_t",598,"off")=10336
+	Set gtmtypes("shm_snapshot_t",598,"len")=16
+	Set gtmtypes("shm_snapshot_t",598,"type")="int"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.next_upgrd_warn.hp_latch_space")=598
+	Set gtmtypes("shm_snapshot_t",598,"dim")=4
+	Set gtmtypes("shm_snapshot_t",599,"name")="shm_snapshot_t.shadow_file_header.is_encrypted"
+	Set gtmtypes("shm_snapshot_t",599,"off")=10352
 	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",599,"type")="unsigned-int"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.is_encrypted")=599
+	Set gtmtypes("shm_snapshot_t",600,"name")="shm_snapshot_t.shadow_file_header.db_trigger_cycle"
+	Set gtmtypes("shm_snapshot_t",600,"off")=10356
 	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",600,"type")="unsigned-int"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.db_trigger_cycle")=600
+	Set gtmtypes("shm_snapshot_t",601,"name")="shm_snapshot_t.shadow_file_header.strm_reg_seqno"
+	Set gtmtypes("shm_snapshot_t",601,"off")=10360
+	Set gtmtypes("shm_snapshot_t",601,"len")=128
+	Set gtmtypes("shm_snapshot_t",601,"type")="uint64_t"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.strm_reg_seqno")=601
+	Set gtmtypes("shm_snapshot_t",601,"dim")=16
+	Set gtmtypes("shm_snapshot_t",602,"name")="shm_snapshot_t.shadow_file_header.save_strm_reg_seqno"
+	Set gtmtypes("shm_snapshot_t",602,"off")=10488
+	Set gtmtypes("shm_snapshot_t",602,"len")=128
+	Set gtmtypes("shm_snapshot_t",602,"type")="uint64_t"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.save_strm_reg_seqno")=602
+	Set gtmtypes("shm_snapshot_t",602,"dim")=16
+	Set gtmtypes("shm_snapshot_t",603,"name")="shm_snapshot_t.shadow_file_header.freeze_on_fail"
+	Set gtmtypes("shm_snapshot_t",603,"off")=10616
 	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.freeze_on_fail")=603
+	Set gtmtypes("shm_snapshot_t",604,"name")="shm_snapshot_t.shadow_file_header.span_node_absent"
+	Set gtmtypes("shm_snapshot_t",604,"off")=10620
 	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 gtmtypfldindx("shm_snapshot_t","shadow_file_header.span_node_absent")=604
+	Set gtmtypes("shm_snapshot_t",605,"name")="shm_snapshot_t.shadow_file_header.maxkeysz_assured"
+	Set gtmtypes("shm_snapshot_t",605,"off")=10624
 	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("shm_snapshot_t",605,"type")="boolean_t"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.maxkeysz_assured")=605
+	Set gtmtypes("shm_snapshot_t",606,"name")="shm_snapshot_t.shadow_file_header.hasht_upgrade_needed"
+	Set gtmtypes("shm_snapshot_t",606,"off")=10628
+	Set gtmtypes("shm_snapshot_t",606,"len")=4
+	Set gtmtypes("shm_snapshot_t",606,"type")="boolean_t"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.hasht_upgrade_needed")=606
+	Set gtmtypes("shm_snapshot_t",607,"name")="shm_snapshot_t.shadow_file_header.defer_allocate"
+	Set gtmtypes("shm_snapshot_t",607,"off")=10632
+	Set gtmtypes("shm_snapshot_t",607,"len")=4
+	Set gtmtypes("shm_snapshot_t",607,"type")="boolean_t"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.defer_allocate")=607
+	Set gtmtypes("shm_snapshot_t",608,"name")="shm_snapshot_t.shadow_file_header.filler_ftok_counter_halted"
+	Set gtmtypes("shm_snapshot_t",608,"off")=10636
+	Set gtmtypes("shm_snapshot_t",608,"len")=4
+	Set gtmtypes("shm_snapshot_t",608,"type")="boolean_t"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.filler_ftok_counter_halted")=608
+	Set gtmtypes("shm_snapshot_t",609,"name")="shm_snapshot_t.shadow_file_header.filler_access_counter_halted"
+	Set gtmtypes("shm_snapshot_t",609,"off")=10640
+	Set gtmtypes("shm_snapshot_t",609,"len")=4
+	Set gtmtypes("shm_snapshot_t",609,"type")="boolean_t"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.filler_access_counter_halted")=609
+	Set gtmtypes("shm_snapshot_t",610,"name")="shm_snapshot_t.shadow_file_header.lock_crit_with_db"
+	Set gtmtypes("shm_snapshot_t",610,"off")=10644
+	Set gtmtypes("shm_snapshot_t",610,"len")=4
+	Set gtmtypes("shm_snapshot_t",610,"type")="boolean_t"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.lock_crit_with_db")=610
+	Set gtmtypes("shm_snapshot_t",611,"name")="shm_snapshot_t.shadow_file_header.basedb_fname_len"
+	Set gtmtypes("shm_snapshot_t",611,"off")=10648
+	Set gtmtypes("shm_snapshot_t",611,"len")=4
+	Set gtmtypes("shm_snapshot_t",611,"type")="unsigned-int"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.basedb_fname_len")=611
+	Set gtmtypes("shm_snapshot_t",612,"name")="shm_snapshot_t.shadow_file_header.basedb_fname"
+	Set gtmtypes("shm_snapshot_t",612,"off")=10652
+	Set gtmtypes("shm_snapshot_t",612,"len")=256
+	Set gtmtypes("shm_snapshot_t",612,"type")="unsigned-char"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.basedb_fname")=612
+	Set gtmtypes("shm_snapshot_t",613,"name")="shm_snapshot_t.shadow_file_header.filler_7k"
+	Set gtmtypes("shm_snapshot_t",613,"off")=10908
+	Set gtmtypes("shm_snapshot_t",613,"len")=444
+	Set gtmtypes("shm_snapshot_t",613,"type")="char"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.filler_7k")=613
+	Set gtmtypes("shm_snapshot_t",614,"name")="shm_snapshot_t.shadow_file_header.filler_8k"
+	Set gtmtypes("shm_snapshot_t",614,"off")=11352
+	Set gtmtypes("shm_snapshot_t",614,"len")=1024
+	Set gtmtypes("shm_snapshot_t",614,"type")="char"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.filler_8k")=614
 	;
 	Set gtmtypes("shmpool_blk_hdr")="struct"
 	Set gtmtypes("shmpool_blk_hdr",0)=11
@@ -33272,7 +34281,7 @@ Init
 	Set gtmtypfldindx("shmpool_blk_hdr","image_count")=11
 	;
 	Set gtmtypes("shmpool_buff_hdr")="struct"
-	Set gtmtypes("shmpool_buff_hdr",0)=615
+	Set gtmtypes("shmpool_buff_hdr",0)=621
 	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
@@ -34300,11 +35309,11 @@ Init
 	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.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,"name")="shmpool_buff_hdr.shadow_file_header.wcb_gds_rundown2_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_bgtrcrec1_tn")=204
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_gds_rundown2_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
@@ -34595,11 +35604,11 @@ Init
 	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_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,"name")="shmpool_buff_hdr.shadow_file_header.wcb_wcs_flu0_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_tp_grab_crit_tn")=263
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_wcs_flu0_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
@@ -34620,11 +35629,11 @@ Init
 	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_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,"name")="shmpool_buff_hdr.shadow_file_header.wcb_gds_rundown1_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_gds_rundown_tn")=268
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_gds_rundown1_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
@@ -34980,1391 +35989,1421 @@ Init
 	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,"name")="shmpool_buff_hdr.shadow_file_header.jnlbuff_phs2cmt_array_full_tn"
 	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.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.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.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",340,"len")=8
+	Set gtmtypes("shmpool_buff_hdr",340,"type")="uint64_t"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.jnlbuff_phs2cmt_array_full_tn")=340
+	Set gtmtypes("shmpool_buff_hdr",341,"name")="shmpool_buff_hdr.shadow_file_header.jnl_phase2_cleanup_if_possible_tn"
+	Set gtmtypes("shmpool_buff_hdr",341,"off")=3576
+	Set gtmtypes("shmpool_buff_hdr",341,"len")=8
+	Set gtmtypes("shmpool_buff_hdr",341,"type")="uint64_t"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.jnl_phase2_cleanup_if_possible_tn")=341
+	Set gtmtypes("shmpool_buff_hdr",342,"name")="shmpool_buff_hdr.shadow_file_header.jnlbuff_phs2cmt_isprcalv_tn"
+	Set gtmtypes("shmpool_buff_hdr",342,"off")=3584
+	Set gtmtypes("shmpool_buff_hdr",342,"len")=8
+	Set gtmtypes("shmpool_buff_hdr",342,"type")="uint64_t"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.jnlbuff_phs2cmt_isprcalv_tn")=342
+	Set gtmtypes("shmpool_buff_hdr",343,"name")="shmpool_buff_hdr.shadow_file_header.bg_trc_rec_tn_filler"
+	Set gtmtypes("shmpool_buff_hdr",343,"off")=3592
+	Set gtmtypes("shmpool_buff_hdr",343,"len")=24
+	Set gtmtypes("shmpool_buff_hdr",343,"type")="char"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.bg_trc_rec_tn_filler")=343
+	Set gtmtypes("shmpool_buff_hdr",344,"name")="shmpool_buff_hdr.shadow_file_header.total_buffer_flush_cntr"
+	Set gtmtypes("shmpool_buff_hdr",344,"off")=3616
 	Set gtmtypes("shmpool_buff_hdr",344,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",344,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.total_buffer_flush_cntr")=344
+	Set gtmtypes("shmpool_buff_hdr",345,"name")="shmpool_buff_hdr.shadow_file_header.bufct_buffer_flush_cntr"
+	Set gtmtypes("shmpool_buff_hdr",345,"off")=3620
 	Set gtmtypes("shmpool_buff_hdr",345,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",345,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.bufct_buffer_flush_cntr")=345
+	Set gtmtypes("shmpool_buff_hdr",346,"name")="shmpool_buff_hdr.shadow_file_header.bufct_buffer_flush_loop_cntr"
+	Set gtmtypes("shmpool_buff_hdr",346,"off")=3624
 	Set gtmtypes("shmpool_buff_hdr",346,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",346,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.bufct_buffer_flush_loop_cntr")=346
+	Set gtmtypes("shmpool_buff_hdr",347,"name")="shmpool_buff_hdr.shadow_file_header.wrt_calls_cntr"
+	Set gtmtypes("shmpool_buff_hdr",347,"off")=3628
 	Set gtmtypes("shmpool_buff_hdr",347,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",347,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wrt_calls_cntr")=347
+	Set gtmtypes("shmpool_buff_hdr",348,"name")="shmpool_buff_hdr.shadow_file_header.wrt_count_cntr"
+	Set gtmtypes("shmpool_buff_hdr",348,"off")=3632
 	Set gtmtypes("shmpool_buff_hdr",348,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",348,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wrt_count_cntr")=348
+	Set gtmtypes("shmpool_buff_hdr",349,"name")="shmpool_buff_hdr.shadow_file_header.wrt_blocked_cntr"
+	Set gtmtypes("shmpool_buff_hdr",349,"off")=3636
 	Set gtmtypes("shmpool_buff_hdr",349,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",349,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wrt_blocked_cntr")=349
+	Set gtmtypes("shmpool_buff_hdr",350,"name")="shmpool_buff_hdr.shadow_file_header.wrt_busy_cntr"
+	Set gtmtypes("shmpool_buff_hdr",350,"off")=3640
 	Set gtmtypes("shmpool_buff_hdr",350,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",350,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wrt_busy_cntr")=350
+	Set gtmtypes("shmpool_buff_hdr",351,"name")="shmpool_buff_hdr.shadow_file_header.wrt_noblks_wrtn_cntr"
+	Set gtmtypes("shmpool_buff_hdr",351,"off")=3644
 	Set gtmtypes("shmpool_buff_hdr",351,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",351,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wrt_noblks_wrtn_cntr")=351
+	Set gtmtypes("shmpool_buff_hdr",352,"name")="shmpool_buff_hdr.shadow_file_header.wcb_gds_rundown2_cntr"
+	Set gtmtypes("shmpool_buff_hdr",352,"off")=3648
 	Set gtmtypes("shmpool_buff_hdr",352,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",352,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_gds_rundown2_cntr")=352
+	Set gtmtypes("shmpool_buff_hdr",353,"name")="shmpool_buff_hdr.shadow_file_header.reserved_bgtrcrec2_cntr"
+	Set gtmtypes("shmpool_buff_hdr",353,"off")=3652
 	Set gtmtypes("shmpool_buff_hdr",353,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",353,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.reserved_bgtrcrec2_cntr")=353
+	Set gtmtypes("shmpool_buff_hdr",354,"name")="shmpool_buff_hdr.shadow_file_header.reserved_bgtrcrec3_cntr"
+	Set gtmtypes("shmpool_buff_hdr",354,"off")=3656
 	Set gtmtypes("shmpool_buff_hdr",354,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",354,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.reserved_bgtrcrec3_cntr")=354
+	Set gtmtypes("shmpool_buff_hdr",355,"name")="shmpool_buff_hdr.shadow_file_header.lost_block_recovery_cntr"
+	Set gtmtypes("shmpool_buff_hdr",355,"off")=3660
 	Set gtmtypes("shmpool_buff_hdr",355,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",355,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.lost_block_recovery_cntr")=355
+	Set gtmtypes("shmpool_buff_hdr",356,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_onln_rlbk_cntr"
+	Set gtmtypes("shmpool_buff_hdr",356,"off")=3664
 	Set gtmtypes("shmpool_buff_hdr",356,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",356,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_onln_rlbk_cntr")=356
+	Set gtmtypes("shmpool_buff_hdr",357,"name")="shmpool_buff_hdr.shadow_file_header.stale_cntr"
+	Set gtmtypes("shmpool_buff_hdr",357,"off")=3668
 	Set gtmtypes("shmpool_buff_hdr",357,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",357,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.stale_cntr")=357
+	Set gtmtypes("shmpool_buff_hdr",358,"name")="shmpool_buff_hdr.shadow_file_header.starved_cntr"
+	Set gtmtypes("shmpool_buff_hdr",358,"off")=3672
 	Set gtmtypes("shmpool_buff_hdr",358,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",358,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.starved_cntr")=358
+	Set gtmtypes("shmpool_buff_hdr",359,"name")="shmpool_buff_hdr.shadow_file_header.stale_timer_started_cntr"
+	Set gtmtypes("shmpool_buff_hdr",359,"off")=3676
 	Set gtmtypes("shmpool_buff_hdr",359,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",359,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.stale_timer_started_cntr")=359
+	Set gtmtypes("shmpool_buff_hdr",360,"name")="shmpool_buff_hdr.shadow_file_header.stale_timer_pop_cntr"
+	Set gtmtypes("shmpool_buff_hdr",360,"off")=3680
 	Set gtmtypes("shmpool_buff_hdr",360,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",360,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.stale_timer_pop_cntr")=360
+	Set gtmtypes("shmpool_buff_hdr",361,"name")="shmpool_buff_hdr.shadow_file_header.stale_process_defer_cntr"
+	Set gtmtypes("shmpool_buff_hdr",361,"off")=3684
 	Set gtmtypes("shmpool_buff_hdr",361,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",361,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.stale_process_defer_cntr")=361
+	Set gtmtypes("shmpool_buff_hdr",362,"name")="shmpool_buff_hdr.shadow_file_header.stale_defer_processed_cntr"
+	Set gtmtypes("shmpool_buff_hdr",362,"off")=3688
 	Set gtmtypes("shmpool_buff_hdr",362,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",362,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.stale_defer_processed_cntr")=362
+	Set gtmtypes("shmpool_buff_hdr",363,"name")="shmpool_buff_hdr.shadow_file_header.spcfc_buffer_flush_cntr"
+	Set gtmtypes("shmpool_buff_hdr",363,"off")=3692
 	Set gtmtypes("shmpool_buff_hdr",363,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",363,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.spcfc_buffer_flush_cntr")=363
+	Set gtmtypes("shmpool_buff_hdr",364,"name")="shmpool_buff_hdr.shadow_file_header.spcfc_buffer_flush_loop_cntr"
+	Set gtmtypes("shmpool_buff_hdr",364,"off")=3696
 	Set gtmtypes("shmpool_buff_hdr",364,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",364,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.spcfc_buffer_flush_loop_cntr")=364
+	Set gtmtypes("shmpool_buff_hdr",365,"name")="shmpool_buff_hdr.shadow_file_header.spcfc_buffer_flush_retries_cntr"
+	Set gtmtypes("shmpool_buff_hdr",365,"off")=3700
 	Set gtmtypes("shmpool_buff_hdr",365,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",365,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.spcfc_buffer_flush_retries_cntr")=365
+	Set gtmtypes("shmpool_buff_hdr",366,"name")="shmpool_buff_hdr.shadow_file_header.spcfc_buffer_flushed_during_lockwait_cntr"
+	Set gtmtypes("shmpool_buff_hdr",366,"off")=3704
 	Set gtmtypes("shmpool_buff_hdr",366,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",366,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.spcfc_buffer_flushed_during_lockwait_cntr")=366
+	Set gtmtypes("shmpool_buff_hdr",367,"name")="shmpool_buff_hdr.shadow_file_header.tp_crit_retries_cntr"
+	Set gtmtypes("shmpool_buff_hdr",367,"off")=3708
 	Set gtmtypes("shmpool_buff_hdr",367,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",367,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.tp_crit_retries_cntr")=367
+	Set gtmtypes("shmpool_buff_hdr",368,"name")="shmpool_buff_hdr.shadow_file_header.db_csh_getn_flush_dirty_cntr"
+	Set gtmtypes("shmpool_buff_hdr",368,"off")=3712
 	Set gtmtypes("shmpool_buff_hdr",368,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",368,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.db_csh_getn_flush_dirty_cntr")=368
+	Set gtmtypes("shmpool_buff_hdr",369,"name")="shmpool_buff_hdr.shadow_file_header.db_csh_getn_rip_wait_cntr"
+	Set gtmtypes("shmpool_buff_hdr",369,"off")=3716
 	Set gtmtypes("shmpool_buff_hdr",369,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",369,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.db_csh_getn_rip_wait_cntr")=369
+	Set gtmtypes("shmpool_buff_hdr",370,"name")="shmpool_buff_hdr.shadow_file_header.db_csh_getn_buf_owner_stuck_cntr"
+	Set gtmtypes("shmpool_buff_hdr",370,"off")=3720
 	Set gtmtypes("shmpool_buff_hdr",370,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",370,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.db_csh_getn_buf_owner_stuck_cntr")=370
+	Set gtmtypes("shmpool_buff_hdr",371,"name")="shmpool_buff_hdr.shadow_file_header.db_csh_getn_out_of_design_cntr"
+	Set gtmtypes("shmpool_buff_hdr",371,"off")=3724
 	Set gtmtypes("shmpool_buff_hdr",371,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",371,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.db_csh_getn_out_of_design_cntr")=371
+	Set gtmtypes("shmpool_buff_hdr",372,"name")="shmpool_buff_hdr.shadow_file_header.t_qread_buf_owner_stuck_cntr"
+	Set gtmtypes("shmpool_buff_hdr",372,"off")=3728
 	Set gtmtypes("shmpool_buff_hdr",372,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",372,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.t_qread_buf_owner_stuck_cntr")=372
+	Set gtmtypes("shmpool_buff_hdr",373,"name")="shmpool_buff_hdr.shadow_file_header.t_qread_out_of_design_cntr"
+	Set gtmtypes("shmpool_buff_hdr",373,"off")=3732
 	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_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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.t_qread_out_of_design_cntr")=373
+	Set gtmtypes("shmpool_buff_hdr",374,"name")="shmpool_buff_hdr.shadow_file_header.bt_put_flush_dirty_cntr"
+	Set gtmtypes("shmpool_buff_hdr",374,"off")=3736
 	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_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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.bt_put_flush_dirty_cntr")=374
+	Set gtmtypes("shmpool_buff_hdr",375,"name")="shmpool_buff_hdr.shadow_file_header.mlock_wakeups_cntr"
+	Set gtmtypes("shmpool_buff_hdr",375,"off")=3740
 	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_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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.mlock_wakeups_cntr")=375
+	Set gtmtypes("shmpool_buff_hdr",376,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_wcs_recover_invoked_cntr"
+	Set gtmtypes("shmpool_buff_hdr",376,"off")=3744
 	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_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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_wcs_recover_invoked_cntr")=376
+	Set gtmtypes("shmpool_buff_hdr",377,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_wcs_verify_passed_cntr"
+	Set gtmtypes("shmpool_buff_hdr",377,"off")=3748
 	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_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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_wcs_verify_passed_cntr")=377
+	Set gtmtypes("shmpool_buff_hdr",378,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_t_qread_db_csh_getn_invalid_blk_cntr"
+	Set gtmtypes("shmpool_buff_hdr",378,"off")=3752
 	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_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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_t_qread_db_csh_getn_invalid_blk_cntr")=378
+	Set gtmtypes("shmpool_buff_hdr",379,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_t_qread_db_csh_get_invalid_blk_cntr"
+	Set gtmtypes("shmpool_buff_hdr",379,"off")=3756
 	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_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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_t_qread_db_csh_get_invalid_blk_cntr")=379
+	Set gtmtypes("shmpool_buff_hdr",380,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_db_csh_getn_loopexceed_cntr"
+	Set gtmtypes("shmpool_buff_hdr",380,"off")=3760
 	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_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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_db_csh_getn_loopexceed_cntr")=380
+	Set gtmtypes("shmpool_buff_hdr",381,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_db_csh_getn_wcsstarvewrt_cntr"
+	Set gtmtypes("shmpool_buff_hdr",381,"off")=3764
 	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_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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_db_csh_getn_wcsstarvewrt_cntr")=381
+	Set gtmtypes("shmpool_buff_hdr",382,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_db_csh_get_cntr"
+	Set gtmtypes("shmpool_buff_hdr",382,"off")=3768
 	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_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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_db_csh_get_cntr")=382
+	Set gtmtypes("shmpool_buff_hdr",383,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_tp_tend_wcsgetspace_cntr"
+	Set gtmtypes("shmpool_buff_hdr",383,"off")=3772
 	Set gtmtypes("shmpool_buff_hdr",383,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",383,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_tp_tend_wcsgetspace_cntr")=383
+	Set gtmtypes("shmpool_buff_hdr",384,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_tp_tend_t1_cntr"
+	Set gtmtypes("shmpool_buff_hdr",384,"off")=3776
 	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_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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_tp_tend_t1_cntr")=384
+	Set gtmtypes("shmpool_buff_hdr",385,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_tp_tend_bitmap_cntr"
+	Set gtmtypes("shmpool_buff_hdr",385,"off")=3780
 	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_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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_tp_tend_bitmap_cntr")=385
+	Set gtmtypes("shmpool_buff_hdr",386,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_tp_tend_jnl_cwset_cntr"
+	Set gtmtypes("shmpool_buff_hdr",386,"off")=3784
 	Set gtmtypes("shmpool_buff_hdr",386,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",386,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_tp_tend_jnl_cwset_cntr")=386
+	Set gtmtypes("shmpool_buff_hdr",387,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_tp_tend_jnl_wcsflu_cntr"
+	Set gtmtypes("shmpool_buff_hdr",387,"off")=3788
 	Set gtmtypes("shmpool_buff_hdr",387,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",387,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_tp_tend_jnl_wcsflu_cntr")=387
+	Set gtmtypes("shmpool_buff_hdr",388,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_t_end_hist_cntr"
+	Set gtmtypes("shmpool_buff_hdr",388,"off")=3792
 	Set gtmtypes("shmpool_buff_hdr",388,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",388,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_t_end_hist_cntr")=388
+	Set gtmtypes("shmpool_buff_hdr",389,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_t_end_hist1_nullbt_cntr"
+	Set gtmtypes("shmpool_buff_hdr",389,"off")=3796
 	Set gtmtypes("shmpool_buff_hdr",389,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",389,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_t_end_hist1_nullbt_cntr")=389
+	Set gtmtypes("shmpool_buff_hdr",390,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_t_end_hist1_nonnullbt_cntr"
+	Set gtmtypes("shmpool_buff_hdr",390,"off")=3800
 	Set gtmtypes("shmpool_buff_hdr",390,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",390,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_t_end_hist1_nonnullbt_cntr")=390
+	Set gtmtypes("shmpool_buff_hdr",391,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_t_end_bitmap_nullbt_cntr"
+	Set gtmtypes("shmpool_buff_hdr",391,"off")=3804
 	Set gtmtypes("shmpool_buff_hdr",391,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",391,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_t_end_bitmap_nullbt_cntr")=391
+	Set gtmtypes("shmpool_buff_hdr",392,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_t_end_bitmap_nonnullbt_cntr"
+	Set gtmtypes("shmpool_buff_hdr",392,"off")=3808
 	Set gtmtypes("shmpool_buff_hdr",392,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",392,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_t_end_bitmap_nonnullbt_cntr")=392
+	Set gtmtypes("shmpool_buff_hdr",393,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_t_end_jnl_cwset_cntr"
+	Set gtmtypes("shmpool_buff_hdr",393,"off")=3812
 	Set gtmtypes("shmpool_buff_hdr",393,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",393,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_t_end_jnl_cwset_cntr")=393
+	Set gtmtypes("shmpool_buff_hdr",394,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_t_end_jnl_wcsflu_cntr"
+	Set gtmtypes("shmpool_buff_hdr",394,"off")=3816
 	Set gtmtypes("shmpool_buff_hdr",394,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",394,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_t_end_jnl_wcsflu_cntr")=394
+	Set gtmtypes("shmpool_buff_hdr",395,"name")="shmpool_buff_hdr.shadow_file_header.db_csh_get_too_many_loops_cntr"
+	Set gtmtypes("shmpool_buff_hdr",395,"off")=3820
 	Set gtmtypes("shmpool_buff_hdr",395,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",395,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.db_csh_get_too_many_loops_cntr")=395
+	Set gtmtypes("shmpool_buff_hdr",396,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_tpckh_hist1_nullbt_cntr"
+	Set gtmtypes("shmpool_buff_hdr",396,"off")=3824
 	Set gtmtypes("shmpool_buff_hdr",396,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",396,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_tpckh_hist1_nullbt_cntr")=396
+	Set gtmtypes("shmpool_buff_hdr",397,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_tpckh_hist1_nonnullbt_cntr"
+	Set gtmtypes("shmpool_buff_hdr",397,"off")=3828
 	Set gtmtypes("shmpool_buff_hdr",397,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",397,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_tpckh_hist1_nonnullbt_cntr")=397
+	Set gtmtypes("shmpool_buff_hdr",398,"name")="shmpool_buff_hdr.shadow_file_header.jnl_blocked_writer_lost_cntr"
+	Set gtmtypes("shmpool_buff_hdr",398,"off")=3832
 	Set gtmtypes("shmpool_buff_hdr",398,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",398,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.jnl_blocked_writer_lost_cntr")=398
+	Set gtmtypes("shmpool_buff_hdr",399,"name")="shmpool_buff_hdr.shadow_file_header.jnl_blocked_writer_stuck_cntr"
+	Set gtmtypes("shmpool_buff_hdr",399,"off")=3836
 	Set gtmtypes("shmpool_buff_hdr",399,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",399,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.jnl_blocked_writer_stuck_cntr")=399
+	Set gtmtypes("shmpool_buff_hdr",400,"name")="shmpool_buff_hdr.shadow_file_header.jnl_blocked_writer_blocked_cntr"
+	Set gtmtypes("shmpool_buff_hdr",400,"off")=3840
 	Set gtmtypes("shmpool_buff_hdr",400,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",400,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.jnl_blocked_writer_blocked_cntr")=400
+	Set gtmtypes("shmpool_buff_hdr",401,"name")="shmpool_buff_hdr.shadow_file_header.n_jnl_fsyncs_cntr"
+	Set gtmtypes("shmpool_buff_hdr",401,"off")=3844
 	Set gtmtypes("shmpool_buff_hdr",401,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",401,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_jnl_fsyncs_cntr")=401
+	Set gtmtypes("shmpool_buff_hdr",402,"name")="shmpool_buff_hdr.shadow_file_header.n_jnl_fsync_tries_cntr"
+	Set gtmtypes("shmpool_buff_hdr",402,"off")=3848
 	Set gtmtypes("shmpool_buff_hdr",402,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",402,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_jnl_fsync_tries_cntr")=402
+	Set gtmtypes("shmpool_buff_hdr",403,"name")="shmpool_buff_hdr.shadow_file_header.n_jnl_fsync_recovers_cntr"
+	Set gtmtypes("shmpool_buff_hdr",403,"off")=3852
 	Set gtmtypes("shmpool_buff_hdr",403,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",403,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_jnl_fsync_recovers_cntr")=403
+	Set gtmtypes("shmpool_buff_hdr",404,"name")="shmpool_buff_hdr.shadow_file_header.n_db_fsyncs_cntr"
+	Set gtmtypes("shmpool_buff_hdr",404,"off")=3856
 	Set gtmtypes("shmpool_buff_hdr",404,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",404,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_db_fsyncs_cntr")=404
+	Set gtmtypes("shmpool_buff_hdr",405,"name")="shmpool_buff_hdr.shadow_file_header.n_db_fsyncs_in_crit_cntr"
+	Set gtmtypes("shmpool_buff_hdr",405,"off")=3860
 	Set gtmtypes("shmpool_buff_hdr",405,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",405,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_db_fsyncs_in_crit_cntr")=405
+	Set gtmtypes("shmpool_buff_hdr",406,"name")="shmpool_buff_hdr.shadow_file_header.n_dbsync_timers_cntr"
+	Set gtmtypes("shmpool_buff_hdr",406,"off")=3864
 	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_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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_dbsync_timers_cntr")=406
+	Set gtmtypes("shmpool_buff_hdr",407,"name")="shmpool_buff_hdr.shadow_file_header.n_dbsync_writes_cntr"
+	Set gtmtypes("shmpool_buff_hdr",407,"off")=3868
 	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_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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_dbsync_writes_cntr")=407
+	Set gtmtypes("shmpool_buff_hdr",408,"name")="shmpool_buff_hdr.shadow_file_header.mutex_queue_full_cntr"
+	Set gtmtypes("shmpool_buff_hdr",408,"off")=3872
 	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_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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.mutex_queue_full_cntr")=408
+	Set gtmtypes("shmpool_buff_hdr",409,"name")="shmpool_buff_hdr.shadow_file_header.wcb_bt_put_cntr"
+	Set gtmtypes("shmpool_buff_hdr",409,"off")=3876
 	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_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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_bt_put_cntr")=409
+	Set gtmtypes("shmpool_buff_hdr",410,"name")="shmpool_buff_hdr.shadow_file_header.wcb_mutex_salvage_cntr"
+	Set gtmtypes("shmpool_buff_hdr",410,"off")=3880
 	Set gtmtypes("shmpool_buff_hdr",410,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",410,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_mutex_salvage_cntr")=410
+	Set gtmtypes("shmpool_buff_hdr",411,"name")="shmpool_buff_hdr.shadow_file_header.wcb_wcs_flu0_cntr"
+	Set gtmtypes("shmpool_buff_hdr",411,"off")=3884
 	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_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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_wcs_flu0_cntr")=411
+	Set gtmtypes("shmpool_buff_hdr",412,"name")="shmpool_buff_hdr.shadow_file_header.wcb_t_end_sysops_nocr_invcr_cntr"
+	Set gtmtypes("shmpool_buff_hdr",412,"off")=3888
 	Set gtmtypes("shmpool_buff_hdr",412,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",412,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_t_end_sysops_nocr_invcr_cntr")=412
+	Set gtmtypes("shmpool_buff_hdr",413,"name")="shmpool_buff_hdr.shadow_file_header.wcb_t_end_sysops_cr_invcr_cntr"
+	Set gtmtypes("shmpool_buff_hdr",413,"off")=3892
 	Set gtmtypes("shmpool_buff_hdr",413,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",413,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_t_end_sysops_cr_invcr_cntr")=413
+	Set gtmtypes("shmpool_buff_hdr",414,"name")="shmpool_buff_hdr.shadow_file_header.wcb_t_end_sysops_rip_wait_cntr"
+	Set gtmtypes("shmpool_buff_hdr",414,"off")=3896
 	Set gtmtypes("shmpool_buff_hdr",414,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",414,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_t_end_sysops_rip_wait_cntr")=414
+	Set gtmtypes("shmpool_buff_hdr",415,"name")="shmpool_buff_hdr.shadow_file_header.wcb_t_end_sysops_dirtyripwait_cntr"
+	Set gtmtypes("shmpool_buff_hdr",415,"off")=3900
 	Set gtmtypes("shmpool_buff_hdr",415,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",415,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_t_end_sysops_dirtyripwait_cntr")=415
+	Set gtmtypes("shmpool_buff_hdr",416,"name")="shmpool_buff_hdr.shadow_file_header.wcb_gds_rundown1_cntr"
+	Set gtmtypes("shmpool_buff_hdr",416,"off")=3904
 	Set gtmtypes("shmpool_buff_hdr",416,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",416,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_gds_rundown1_cntr")=416
+	Set gtmtypes("shmpool_buff_hdr",417,"name")="shmpool_buff_hdr.shadow_file_header.wcb_wcs_flu1_cntr"
+	Set gtmtypes("shmpool_buff_hdr",417,"off")=3908
 	Set gtmtypes("shmpool_buff_hdr",417,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",417,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_wcs_flu1_cntr")=417
+	Set gtmtypes("shmpool_buff_hdr",418,"name")="shmpool_buff_hdr.shadow_file_header.wcb_mu_back_cntr"
+	Set gtmtypes("shmpool_buff_hdr",418,"off")=3912
 	Set gtmtypes("shmpool_buff_hdr",418,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",418,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_mu_back_cntr")=418
+	Set gtmtypes("shmpool_buff_hdr",419,"name")="shmpool_buff_hdr.shadow_file_header.wcb_t_end_sysops_dirty_invcr_cntr"
+	Set gtmtypes("shmpool_buff_hdr",419,"off")=3916
 	Set gtmtypes("shmpool_buff_hdr",419,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",419,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_t_end_sysops_dirty_invcr_cntr")=419
+	Set gtmtypes("shmpool_buff_hdr",420,"name")="shmpool_buff_hdr.shadow_file_header.wcb_t_end_sysops_wtfini_fail_cntr"
+	Set gtmtypes("shmpool_buff_hdr",420,"off")=3920
 	Set gtmtypes("shmpool_buff_hdr",420,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",420,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_t_end_sysops_wtfini_fail_cntr")=420
+	Set gtmtypes("shmpool_buff_hdr",421,"name")="shmpool_buff_hdr.shadow_file_header.wcb_t_end_sysops_twin_stuck_cntr"
+	Set gtmtypes("shmpool_buff_hdr",421,"off")=3924
 	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_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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_t_end_sysops_twin_stuck_cntr")=421
+	Set gtmtypes("shmpool_buff_hdr",422,"name")="shmpool_buff_hdr.shadow_file_header.db_csh_getn_wrt_latch_stuck_cntr"
+	Set gtmtypes("shmpool_buff_hdr",422,"off")=3928
 	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_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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.db_csh_getn_wrt_latch_stuck_cntr")=422
+	Set gtmtypes("shmpool_buff_hdr",423,"name")="shmpool_buff_hdr.shadow_file_header.wcb_secshr_db_clnup_now_crit_cntr"
+	Set gtmtypes("shmpool_buff_hdr",423,"off")=3932
 	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_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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_secshr_db_clnup_now_crit_cntr")=423
+	Set gtmtypes("shmpool_buff_hdr",424,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_t_qread_bad_bt_index1_cntr"
+	Set gtmtypes("shmpool_buff_hdr",424,"off")=3936
 	Set gtmtypes("shmpool_buff_hdr",424,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",424,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_t_qread_bad_bt_index1_cntr")=424
+	Set gtmtypes("shmpool_buff_hdr",425,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_t_qread_bad_bt_index2_cntr"
+	Set gtmtypes("shmpool_buff_hdr",425,"off")=3940
 	Set gtmtypes("shmpool_buff_hdr",425,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",425,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_t_qread_bad_bt_index2_cntr")=425
+	Set gtmtypes("shmpool_buff_hdr",426,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_t_end_crbtmismatch1_cntr"
+	Set gtmtypes("shmpool_buff_hdr",426,"off")=3944
 	Set gtmtypes("shmpool_buff_hdr",426,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",426,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_t_end_crbtmismatch1_cntr")=426
+	Set gtmtypes("shmpool_buff_hdr",427,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_t_end_crbtmismatch2_cntr"
+	Set gtmtypes("shmpool_buff_hdr",427,"off")=3948
 	Set gtmtypes("shmpool_buff_hdr",427,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",427,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_t_end_crbtmismatch2_cntr")=427
+	Set gtmtypes("shmpool_buff_hdr",428,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_t_end_crbtmismatch3_cntr"
+	Set gtmtypes("shmpool_buff_hdr",428,"off")=3952
 	Set gtmtypes("shmpool_buff_hdr",428,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",428,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_t_end_crbtmismatch3_cntr")=428
+	Set gtmtypes("shmpool_buff_hdr",429,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_tp_tend_crbtmismatch1_cntr"
+	Set gtmtypes("shmpool_buff_hdr",429,"off")=3956
 	Set gtmtypes("shmpool_buff_hdr",429,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",429,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_tp_tend_crbtmismatch1_cntr")=429
+	Set gtmtypes("shmpool_buff_hdr",430,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_tp_tend_crbtmismatch2_cntr"
+	Set gtmtypes("shmpool_buff_hdr",430,"off")=3960
 	Set gtmtypes("shmpool_buff_hdr",430,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",430,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_tp_tend_crbtmismatch2_cntr")=430
+	Set gtmtypes("shmpool_buff_hdr",431,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_tp_tend_crbtmismatch3_cntr"
+	Set gtmtypes("shmpool_buff_hdr",431,"off")=3964
 	Set gtmtypes("shmpool_buff_hdr",431,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",431,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_tp_tend_crbtmismatch3_cntr")=431
+	Set gtmtypes("shmpool_buff_hdr",432,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_wcs_wtstart_bad_cr_cntr"
+	Set gtmtypes("shmpool_buff_hdr",432,"off")=3968
 	Set gtmtypes("shmpool_buff_hdr",432,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",432,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_wcs_wtstart_bad_cr_cntr")=432
+	Set gtmtypes("shmpool_buff_hdr",433,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_wcs_wtfini_bad_cr_cntr"
+	Set gtmtypes("shmpool_buff_hdr",433,"off")=3972
 	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_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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_wcs_wtfini_bad_cr_cntr")=433
+	Set gtmtypes("shmpool_buff_hdr",434,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_bt_get_cntr"
+	Set gtmtypes("shmpool_buff_hdr",434,"off")=3976
 	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_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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_bt_get_cntr")=434
+	Set gtmtypes("shmpool_buff_hdr",435,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_wcs_cdb_sc_final_retry_cntr"
+	Set gtmtypes("shmpool_buff_hdr",435,"off")=3980
 	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_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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_wcs_cdb_sc_final_retry_cntr")=435
+	Set gtmtypes("shmpool_buff_hdr",436,"name")="shmpool_buff_hdr.shadow_file_header.wcb_bg_update_lckfail1_cntr"
+	Set gtmtypes("shmpool_buff_hdr",436,"off")=3984
 	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_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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_bg_update_lckfail1_cntr")=436
+	Set gtmtypes("shmpool_buff_hdr",437,"name")="shmpool_buff_hdr.shadow_file_header.wcb_bg_update_lckfail2_cntr"
+	Set gtmtypes("shmpool_buff_hdr",437,"off")=3988
 	Set gtmtypes("shmpool_buff_hdr",437,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",437,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_bg_update_lckfail2_cntr")=437
+	Set gtmtypes("shmpool_buff_hdr",438,"name")="shmpool_buff_hdr.shadow_file_header.wcb_wtstart_lckfail1_cntr"
+	Set gtmtypes("shmpool_buff_hdr",438,"off")=3992
 	Set gtmtypes("shmpool_buff_hdr",438,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",438,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_wtstart_lckfail1_cntr")=438
+	Set gtmtypes("shmpool_buff_hdr",439,"name")="shmpool_buff_hdr.shadow_file_header.wcb_wtstart_lckfail2_cntr"
+	Set gtmtypes("shmpool_buff_hdr",439,"off")=3996
 	Set gtmtypes("shmpool_buff_hdr",439,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",439,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_wtstart_lckfail2_cntr")=439
+	Set gtmtypes("shmpool_buff_hdr",440,"name")="shmpool_buff_hdr.shadow_file_header.wcb_wtstart_lckfail3_cntr"
+	Set gtmtypes("shmpool_buff_hdr",440,"off")=4000
 	Set gtmtypes("shmpool_buff_hdr",440,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",440,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_wtstart_lckfail3_cntr")=440
+	Set gtmtypes("shmpool_buff_hdr",441,"name")="shmpool_buff_hdr.shadow_file_header.wcb_wtstart_lckfail4_cntr"
+	Set gtmtypes("shmpool_buff_hdr",441,"off")=4004
 	Set gtmtypes("shmpool_buff_hdr",441,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",441,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_wtstart_lckfail4_cntr")=441
+	Set gtmtypes("shmpool_buff_hdr",442,"name")="shmpool_buff_hdr.shadow_file_header.wcb_wtfini_lckfail1_cntr"
+	Set gtmtypes("shmpool_buff_hdr",442,"off")=4008
 	Set gtmtypes("shmpool_buff_hdr",442,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",442,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_wtfini_lckfail1_cntr")=442
+	Set gtmtypes("shmpool_buff_hdr",443,"name")="shmpool_buff_hdr.shadow_file_header.wcb_wtfini_lckfail2_cntr"
+	Set gtmtypes("shmpool_buff_hdr",443,"off")=4012
 	Set gtmtypes("shmpool_buff_hdr",443,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",443,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_wtfini_lckfail2_cntr")=443
+	Set gtmtypes("shmpool_buff_hdr",444,"name")="shmpool_buff_hdr.shadow_file_header.wcb_wtfini_lckfail3_cntr"
+	Set gtmtypes("shmpool_buff_hdr",444,"off")=4016
 	Set gtmtypes("shmpool_buff_hdr",444,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",444,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_wtfini_lckfail3_cntr")=444
+	Set gtmtypes("shmpool_buff_hdr",445,"name")="shmpool_buff_hdr.shadow_file_header.wcb_wtfini_lckfail4_cntr"
+	Set gtmtypes("shmpool_buff_hdr",445,"off")=4020
 	Set gtmtypes("shmpool_buff_hdr",445,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",445,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_wtfini_lckfail4_cntr")=445
+	Set gtmtypes("shmpool_buff_hdr",446,"name")="shmpool_buff_hdr.shadow_file_header.wcb_t_end_sysops_dirtystuck1_cntr"
+	Set gtmtypes("shmpool_buff_hdr",446,"off")=4024
 	Set gtmtypes("shmpool_buff_hdr",446,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",446,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_t_end_sysops_dirtystuck1_cntr")=446
+	Set gtmtypes("shmpool_buff_hdr",447,"name")="shmpool_buff_hdr.shadow_file_header.wcb_t_end_sysops_dirtystuck2_cntr"
+	Set gtmtypes("shmpool_buff_hdr",447,"off")=4028
 	Set gtmtypes("shmpool_buff_hdr",447,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",447,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_t_end_sysops_dirtystuck2_cntr")=447
+	Set gtmtypes("shmpool_buff_hdr",448,"name")="shmpool_buff_hdr.shadow_file_header.wcb_secshr_db_clnup_wbuf_dqd_cntr"
+	Set gtmtypes("shmpool_buff_hdr",448,"off")=4032
 	Set gtmtypes("shmpool_buff_hdr",448,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",448,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_secshr_db_clnup_wbuf_dqd_cntr")=448
+	Set gtmtypes("shmpool_buff_hdr",449,"name")="shmpool_buff_hdr.shadow_file_header.dwngrd_refmts_syncio_cntr"
+	Set gtmtypes("shmpool_buff_hdr",449,"off")=4036
 	Set gtmtypes("shmpool_buff_hdr",449,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",449,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.dwngrd_refmts_syncio_cntr")=449
+	Set gtmtypes("shmpool_buff_hdr",450,"name")="shmpool_buff_hdr.shadow_file_header.dwngrd_refmts_asyncio_cntr"
+	Set gtmtypes("shmpool_buff_hdr",450,"off")=4040
 	Set gtmtypes("shmpool_buff_hdr",450,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",450,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.dwngrd_refmts_asyncio_cntr")=450
+	Set gtmtypes("shmpool_buff_hdr",451,"name")="shmpool_buff_hdr.shadow_file_header.shmpool_refmt_harvests_cntr"
+	Set gtmtypes("shmpool_buff_hdr",451,"off")=4044
 	Set gtmtypes("shmpool_buff_hdr",451,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",451,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.shmpool_refmt_harvests_cntr")=451
+	Set gtmtypes("shmpool_buff_hdr",452,"name")="shmpool_buff_hdr.shadow_file_header.shmpool_recovery_cntr"
+	Set gtmtypes("shmpool_buff_hdr",452,"off")=4048
 	Set gtmtypes("shmpool_buff_hdr",452,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",452,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.shmpool_recovery_cntr")=452
+	Set gtmtypes("shmpool_buff_hdr",453,"name")="shmpool_buff_hdr.shadow_file_header.shmpool_blkd_by_sdc_cntr"
+	Set gtmtypes("shmpool_buff_hdr",453,"off")=4052
 	Set gtmtypes("shmpool_buff_hdr",453,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",453,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.shmpool_blkd_by_sdc_cntr")=453
+	Set gtmtypes("shmpool_buff_hdr",454,"name")="shmpool_buff_hdr.shadow_file_header.shmpool_alloc_bbflush_cntr"
+	Set gtmtypes("shmpool_buff_hdr",454,"off")=4056
 	Set gtmtypes("shmpool_buff_hdr",454,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",454,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.shmpool_alloc_bbflush_cntr")=454
+	Set gtmtypes("shmpool_buff_hdr",455,"name")="shmpool_buff_hdr.shadow_file_header.refmt_hvst_blk_released_replaced_cntr"
+	Set gtmtypes("shmpool_buff_hdr",455,"off")=4060
 	Set gtmtypes("shmpool_buff_hdr",455,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",455,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.refmt_hvst_blk_released_replaced_cntr")=455
+	Set gtmtypes("shmpool_buff_hdr",456,"name")="shmpool_buff_hdr.shadow_file_header.refmt_hvst_blk_released_io_complete_cntr"
+	Set gtmtypes("shmpool_buff_hdr",456,"off")=4064
 	Set gtmtypes("shmpool_buff_hdr",456,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",456,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.refmt_hvst_blk_released_io_complete_cntr")=456
+	Set gtmtypes("shmpool_buff_hdr",457,"name")="shmpool_buff_hdr.shadow_file_header.refmt_hvst_blk_kept_cntr"
+	Set gtmtypes("shmpool_buff_hdr",457,"off")=4068
 	Set gtmtypes("shmpool_buff_hdr",457,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",457,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.refmt_hvst_blk_kept_cntr")=457
+	Set gtmtypes("shmpool_buff_hdr",458,"name")="shmpool_buff_hdr.shadow_file_header.refmt_hvst_blk_ignored_cntr"
+	Set gtmtypes("shmpool_buff_hdr",458,"off")=4072
 	Set gtmtypes("shmpool_buff_hdr",458,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",458,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.refmt_hvst_blk_ignored_cntr")=458
+	Set gtmtypes("shmpool_buff_hdr",459,"name")="shmpool_buff_hdr.shadow_file_header.refmt_blk_chk_blk_freed_cntr"
+	Set gtmtypes("shmpool_buff_hdr",459,"off")=4076
 	Set gtmtypes("shmpool_buff_hdr",459,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",459,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.refmt_blk_chk_blk_freed_cntr")=459
+	Set gtmtypes("shmpool_buff_hdr",460,"name")="shmpool_buff_hdr.shadow_file_header.refmt_blk_chk_blk_kept_cntr"
+	Set gtmtypes("shmpool_buff_hdr",460,"off")=4080
 	Set gtmtypes("shmpool_buff_hdr",460,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",460,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.refmt_blk_chk_blk_kept_cntr")=460
+	Set gtmtypes("shmpool_buff_hdr",461,"name")="shmpool_buff_hdr.shadow_file_header.active_lvl_trigger_cntr"
+	Set gtmtypes("shmpool_buff_hdr",461,"off")=4084
 	Set gtmtypes("shmpool_buff_hdr",461,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",461,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.active_lvl_trigger_cntr")=461
+	Set gtmtypes("shmpool_buff_hdr",462,"name")="shmpool_buff_hdr.shadow_file_header.new_buff_cntr"
+	Set gtmtypes("shmpool_buff_hdr",462,"off")=4088
 	Set gtmtypes("shmpool_buff_hdr",462,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",462,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.new_buff_cntr")=462
+	Set gtmtypes("shmpool_buff_hdr",463,"name")="shmpool_buff_hdr.shadow_file_header.phase2_commit_wait_sleep_in_crit_cntr"
+	Set gtmtypes("shmpool_buff_hdr",463,"off")=4092
 	Set gtmtypes("shmpool_buff_hdr",463,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",463,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.phase2_commit_wait_sleep_in_crit_cntr")=463
+	Set gtmtypes("shmpool_buff_hdr",464,"name")="shmpool_buff_hdr.shadow_file_header.phase2_commit_wait_sleep_no_crit_cntr"
+	Set gtmtypes("shmpool_buff_hdr",464,"off")=4096
 	Set gtmtypes("shmpool_buff_hdr",464,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",464,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.phase2_commit_wait_sleep_no_crit_cntr")=464
+	Set gtmtypes("shmpool_buff_hdr",465,"name")="shmpool_buff_hdr.shadow_file_header.phase2_commit_wait_pidcnt_cntr"
+	Set gtmtypes("shmpool_buff_hdr",465,"off")=4100
 	Set gtmtypes("shmpool_buff_hdr",465,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",465,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.phase2_commit_wait_pidcnt_cntr")=465
+	Set gtmtypes("shmpool_buff_hdr",466,"name")="shmpool_buff_hdr.shadow_file_header.wcb_t_end_sysops_intend_wait_cntr"
+	Set gtmtypes("shmpool_buff_hdr",466,"off")=4104
 	Set gtmtypes("shmpool_buff_hdr",466,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",466,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_t_end_sysops_intend_wait_cntr")=466
+	Set gtmtypes("shmpool_buff_hdr",467,"name")="shmpool_buff_hdr.shadow_file_header.wcb_secshr_db_clnup_phase2_clnup_cntr"
+	Set gtmtypes("shmpool_buff_hdr",467,"off")=4108
 	Set gtmtypes("shmpool_buff_hdr",467,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",467,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_secshr_db_clnup_phase2_clnup_cntr")=467
+	Set gtmtypes("shmpool_buff_hdr",468,"name")="shmpool_buff_hdr.shadow_file_header.wcb_phase2_commit_wait_cntr"
+	Set gtmtypes("shmpool_buff_hdr",468,"off")=4112
 	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_phase2_commit_wait_cntr")=468
+	Set gtmtypes("shmpool_buff_hdr",469,"name")="shmpool_buff_hdr.shadow_file_header.recompute_upd_array_calls_cntr"
+	Set gtmtypes("shmpool_buff_hdr",469,"off")=4116
 	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.recompute_upd_array_calls_cntr")=469
+	Set gtmtypes("shmpool_buff_hdr",470,"name")="shmpool_buff_hdr.shadow_file_header.recompute_upd_array_rip_cntr"
+	Set gtmtypes("shmpool_buff_hdr",470,"off")=4120
 	Set gtmtypes("shmpool_buff_hdr",470,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",470,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.recompute_upd_array_rip_cntr")=470
+	Set gtmtypes("shmpool_buff_hdr",471,"name")="shmpool_buff_hdr.shadow_file_header.recompute_upd_array_in_tend_cntr"
+	Set gtmtypes("shmpool_buff_hdr",471,"off")=4124
 	Set gtmtypes("shmpool_buff_hdr",471,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",471,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.recompute_upd_array_in_tend_cntr")=471
+	Set gtmtypes("shmpool_buff_hdr",472,"name")="shmpool_buff_hdr.shadow_file_header.recompute_upd_array_search_blk_cntr"
+	Set gtmtypes("shmpool_buff_hdr",472,"off")=4128
 	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.recompute_upd_array_search_blk_cntr")=472
+	Set gtmtypes("shmpool_buff_hdr",473,"name")="shmpool_buff_hdr.shadow_file_header.recompute_upd_array_new_rec_cntr"
+	Set gtmtypes("shmpool_buff_hdr",473,"off")=4132
 	Set gtmtypes("shmpool_buff_hdr",473,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",473,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.recompute_upd_array_new_rec_cntr")=473
+	Set gtmtypes("shmpool_buff_hdr",474,"name")="shmpool_buff_hdr.shadow_file_header.recompute_upd_array_rec_size_cntr"
+	Set gtmtypes("shmpool_buff_hdr",474,"off")=4136
 	Set gtmtypes("shmpool_buff_hdr",474,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",474,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.recompute_upd_array_rec_size_cntr")=474
+	Set gtmtypes("shmpool_buff_hdr",475,"name")="shmpool_buff_hdr.shadow_file_header.recompute_upd_array_rec_cmpc_cntr"
+	Set gtmtypes("shmpool_buff_hdr",475,"off")=4140
 	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.recompute_upd_array_rec_cmpc_cntr")=475
+	Set gtmtypes("shmpool_buff_hdr",476,"name")="shmpool_buff_hdr.shadow_file_header.recompute_upd_array_blk_fini_cntr"
+	Set gtmtypes("shmpool_buff_hdr",476,"off")=4144
 	Set gtmtypes("shmpool_buff_hdr",476,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",476,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.recompute_upd_array_blk_fini_cntr")=476
+	Set gtmtypes("shmpool_buff_hdr",477,"name")="shmpool_buff_hdr.shadow_file_header.recompute_upd_array_blk_split_cntr"
+	Set gtmtypes("shmpool_buff_hdr",477,"off")=4148
 	Set gtmtypes("shmpool_buff_hdr",477,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",477,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.recompute_upd_array_blk_split_cntr")=477
+	Set gtmtypes("shmpool_buff_hdr",478,"name")="shmpool_buff_hdr.shadow_file_header.t_qread_ripsleep_cnt_cntr"
+	Set gtmtypes("shmpool_buff_hdr",478,"off")=4152
 	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.t_qread_ripsleep_cnt_cntr")=478
+	Set gtmtypes("shmpool_buff_hdr",479,"name")="shmpool_buff_hdr.shadow_file_header.t_qread_ripsleep_nblks_cntr"
+	Set gtmtypes("shmpool_buff_hdr",479,"off")=4156
 	Set gtmtypes("shmpool_buff_hdr",479,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",479,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.t_qread_ripsleep_nblks_cntr")=479
+	Set gtmtypes("shmpool_buff_hdr",480,"name")="shmpool_buff_hdr.shadow_file_header.wcs_wtfini_invoked_cntr"
+	Set gtmtypes("shmpool_buff_hdr",480,"off")=4160
 	Set gtmtypes("shmpool_buff_hdr",480,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",480,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcs_wtfini_invoked_cntr")=480
+	Set gtmtypes("shmpool_buff_hdr",481,"name")="shmpool_buff_hdr.shadow_file_header.wcs_wterror_invoked_cntr"
+	Set gtmtypes("shmpool_buff_hdr",481,"off")=4164
 	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcs_wterror_invoked_cntr")=481
+	Set gtmtypes("shmpool_buff_hdr",482,"name")="shmpool_buff_hdr.shadow_file_header.wcs_wt_restart_invoked_cntr"
+	Set gtmtypes("shmpool_buff_hdr",482,"off")=4168
 	Set gtmtypes("shmpool_buff_hdr",482,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",482,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcs_wt_restart_invoked_cntr")=482
+	Set gtmtypes("shmpool_buff_hdr",483,"name")="shmpool_buff_hdr.shadow_file_header.wcs_wt_restart_eagain_cntr"
+	Set gtmtypes("shmpool_buff_hdr",483,"off")=4172
 	Set gtmtypes("shmpool_buff_hdr",483,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",483,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcs_wt_restart_eagain_cntr")=483
+	Set gtmtypes("shmpool_buff_hdr",484,"name")="shmpool_buff_hdr.shadow_file_header.wcs_wt_restart_reinsert_cntr"
+	Set gtmtypes("shmpool_buff_hdr",484,"off")=4176
 	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcs_wt_restart_reinsert_cntr")=484
+	Set gtmtypes("shmpool_buff_hdr",485,"name")="shmpool_buff_hdr.shadow_file_header.wcs_wtstart_eagain_cntr"
+	Set gtmtypes("shmpool_buff_hdr",485,"off")=4180
+	Set gtmtypes("shmpool_buff_hdr",485,"len")=4
+	Set gtmtypes("shmpool_buff_hdr",485,"type")="int"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcs_wtstart_eagain_cntr")=485
+	Set gtmtypes("shmpool_buff_hdr",486,"name")="shmpool_buff_hdr.shadow_file_header.wcs_wtstart_eagain_incrit_cntr"
+	Set gtmtypes("shmpool_buff_hdr",486,"off")=4184
+	Set gtmtypes("shmpool_buff_hdr",486,"len")=4
+	Set gtmtypes("shmpool_buff_hdr",486,"type")="int"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcs_wtstart_eagain_incrit_cntr")=486
+	Set gtmtypes("shmpool_buff_hdr",487,"name")="shmpool_buff_hdr.shadow_file_header.async_restart_eagain_cntr"
+	Set gtmtypes("shmpool_buff_hdr",487,"off")=4188
 	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.async_restart_eagain_cntr")=487
+	Set gtmtypes("shmpool_buff_hdr",488,"name")="shmpool_buff_hdr.shadow_file_header.jnlbuff_phs2cmt_array_full_cntr"
+	Set gtmtypes("shmpool_buff_hdr",488,"off")=4192
 	Set gtmtypes("shmpool_buff_hdr",488,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",488,"type")="int"
-	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.jnlbuff_phs2cmt_array_full_cntr")=488
+	Set gtmtypes("shmpool_buff_hdr",489,"name")="shmpool_buff_hdr.shadow_file_header.jnl_phase2_cleanup_if_possible_cntr"
+	Set gtmtypes("shmpool_buff_hdr",489,"off")=4196
+	Set gtmtypes("shmpool_buff_hdr",489,"len")=4
+	Set gtmtypes("shmpool_buff_hdr",489,"type")="int"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.jnl_phase2_cleanup_if_possible_cntr")=489
+	Set gtmtypes("shmpool_buff_hdr",490,"name")="shmpool_buff_hdr.shadow_file_header.jnlbuff_phs2cmt_isprcalv_cntr"
+	Set gtmtypes("shmpool_buff_hdr",490,"off")=4200
 	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_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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.jnlbuff_phs2cmt_isprcalv_cntr")=490
+	Set gtmtypes("shmpool_buff_hdr",491,"name")="shmpool_buff_hdr.shadow_file_header.bg_trc_rec_cntr_filler"
+	Set gtmtypes("shmpool_buff_hdr",491,"off")=4204
+	Set gtmtypes("shmpool_buff_hdr",491,"len")=12
+	Set gtmtypes("shmpool_buff_hdr",491,"type")="char"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.bg_trc_rec_cntr_filler")=491
+	Set gtmtypes("shmpool_buff_hdr",492,"name")="shmpool_buff_hdr.shadow_file_header.n_gvcst_srches"
+	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")=4232
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_gvcst_srches")=492
+	Set gtmtypes("shmpool_buff_hdr",493,"name")="shmpool_buff_hdr.shadow_file_header.n_gvcst_srches.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")=4236
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_gvcst_srches.curr_count")=493
+	Set gtmtypes("shmpool_buff_hdr",494,"name")="shmpool_buff_hdr.shadow_file_header.n_gvcst_srches.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.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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_gvcst_srches.cumul_count")=494
+	Set gtmtypes("shmpool_buff_hdr",495,"name")="shmpool_buff_hdr.shadow_file_header.n_gvcst_srch_clues"
+	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")=4240
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_gvcst_srch_clues")=495
+	Set gtmtypes("shmpool_buff_hdr",496,"name")="shmpool_buff_hdr.shadow_file_header.n_gvcst_srch_clues.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")=4244
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_gvcst_srch_clues.curr_count")=496
+	Set gtmtypes("shmpool_buff_hdr",497,"name")="shmpool_buff_hdr.shadow_file_header.n_gvcst_srch_clues.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_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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_gvcst_srch_clues.cumul_count")=497
+	Set gtmtypes("shmpool_buff_hdr",498,"name")="shmpool_buff_hdr.shadow_file_header.n_clue_used_head"
+	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")=4248
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_clue_used_head")=498
+	Set gtmtypes("shmpool_buff_hdr",499,"name")="shmpool_buff_hdr.shadow_file_header.n_clue_used_head.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")=4252
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_clue_used_head.curr_count")=499
+	Set gtmtypes("shmpool_buff_hdr",500,"name")="shmpool_buff_hdr.shadow_file_header.n_clue_used_head.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_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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_clue_used_head.cumul_count")=500
+	Set gtmtypes("shmpool_buff_hdr",501,"name")="shmpool_buff_hdr.shadow_file_header.n_clue_used_same"
+	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")=4256
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_clue_used_same")=501
+	Set gtmtypes("shmpool_buff_hdr",502,"name")="shmpool_buff_hdr.shadow_file_header.n_clue_used_same.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")=4260
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_clue_used_same.curr_count")=502
+	Set gtmtypes("shmpool_buff_hdr",503,"name")="shmpool_buff_hdr.shadow_file_header.n_clue_used_same.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_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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_clue_used_same.cumul_count")=503
+	Set gtmtypes("shmpool_buff_hdr",504,"name")="shmpool_buff_hdr.shadow_file_header.n_clue_used_tail"
+	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")=4264
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_clue_used_tail")=504
+	Set gtmtypes("shmpool_buff_hdr",505,"name")="shmpool_buff_hdr.shadow_file_header.n_clue_used_tail.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")=4268
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_clue_used_tail.curr_count")=505
+	Set gtmtypes("shmpool_buff_hdr",506,"name")="shmpool_buff_hdr.shadow_file_header.n_clue_used_tail.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")=4272
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_clue_used_tail.cumul_count")=506
+	Set gtmtypes("shmpool_buff_hdr",507,"name")="shmpool_buff_hdr.shadow_file_header.n_t_qreads"
+	Set gtmtypes("shmpool_buff_hdr",507,"off")=4256
 	Set gtmtypes("shmpool_buff_hdr",507,"len")=8
 	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_t_qreads")=507
+	Set gtmtypes("shmpool_buff_hdr",508,"name")="shmpool_buff_hdr.shadow_file_header.n_t_qreads.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")=4276
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_t_qreads.curr_count")=508
+	Set gtmtypes("shmpool_buff_hdr",509,"name")="shmpool_buff_hdr.shadow_file_header.n_t_qreads.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")=4280
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_t_qreads.cumul_count")=509
+	Set gtmtypes("shmpool_buff_hdr",510,"name")="shmpool_buff_hdr.shadow_file_header.unused_dsk_reads"
+	Set gtmtypes("shmpool_buff_hdr",510,"off")=4264
 	Set gtmtypes("shmpool_buff_hdr",510,"len")=8
 	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.unused_dsk_reads")=510
+	Set gtmtypes("shmpool_buff_hdr",511,"name")="shmpool_buff_hdr.shadow_file_header.unused_dsk_reads.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")=4284
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.unused_dsk_reads.curr_count")=511
+	Set gtmtypes("shmpool_buff_hdr",512,"name")="shmpool_buff_hdr.shadow_file_header.unused_dsk_reads.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")=4288
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.unused_dsk_reads.cumul_count")=512
+	Set gtmtypes("shmpool_buff_hdr",513,"name")="shmpool_buff_hdr.shadow_file_header.n_bgmm_updates"
+	Set gtmtypes("shmpool_buff_hdr",513,"off")=4272
 	Set gtmtypes("shmpool_buff_hdr",513,"len")=8
 	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_bgmm_updates")=513
+	Set gtmtypes("shmpool_buff_hdr",514,"name")="shmpool_buff_hdr.shadow_file_header.n_bgmm_updates.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")=4292
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_bgmm_updates.curr_count")=514
+	Set gtmtypes("shmpool_buff_hdr",515,"name")="shmpool_buff_hdr.shadow_file_header.n_bgmm_updates.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")=4296
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_bgmm_updates.cumul_count")=515
+	Set gtmtypes("shmpool_buff_hdr",516,"name")="shmpool_buff_hdr.shadow_file_header.unused_dsk_writes"
+	Set gtmtypes("shmpool_buff_hdr",516,"off")=4280
 	Set gtmtypes("shmpool_buff_hdr",516,"len")=8
 	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.unused_dsk_writes")=516
+	Set gtmtypes("shmpool_buff_hdr",517,"name")="shmpool_buff_hdr.shadow_file_header.unused_dsk_writes.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")=4300
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.unused_dsk_writes.curr_count")=517
+	Set gtmtypes("shmpool_buff_hdr",518,"name")="shmpool_buff_hdr.shadow_file_header.unused_dsk_writes.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")=4304
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.unused_dsk_writes.cumul_count")=518
+	Set gtmtypes("shmpool_buff_hdr",519,"name")="shmpool_buff_hdr.shadow_file_header.n_bg_update_creates"
+	Set gtmtypes("shmpool_buff_hdr",519,"off")=4288
 	Set gtmtypes("shmpool_buff_hdr",519,"len")=8
 	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_bg_update_creates")=519
+	Set gtmtypes("shmpool_buff_hdr",520,"name")="shmpool_buff_hdr.shadow_file_header.n_bg_update_creates.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")=4308
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_bg_update_creates.curr_count")=520
+	Set gtmtypes("shmpool_buff_hdr",521,"name")="shmpool_buff_hdr.shadow_file_header.n_bg_update_creates.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")=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_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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_bg_update_creates.cumul_count")=521
+	Set gtmtypes("shmpool_buff_hdr",522,"name")="shmpool_buff_hdr.shadow_file_header.n_db_csh_getns"
+	Set gtmtypes("shmpool_buff_hdr",522,"off")=4296
+	Set gtmtypes("shmpool_buff_hdr",522,"len")=8
+	Set gtmtypes("shmpool_buff_hdr",522,"type")="db_csh_acct_rec"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_db_csh_getns")=522
+	Set gtmtypes("shmpool_buff_hdr",523,"name")="shmpool_buff_hdr.shadow_file_header.n_db_csh_getns.curr_count"
+	Set gtmtypes("shmpool_buff_hdr",523,"off")=4296
+	Set gtmtypes("shmpool_buff_hdr",523,"len")=4
+	Set gtmtypes("shmpool_buff_hdr",523,"type")="int"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_db_csh_getns.curr_count")=523
+	Set gtmtypes("shmpool_buff_hdr",524,"name")="shmpool_buff_hdr.shadow_file_header.n_db_csh_getns.cumul_count"
+	Set gtmtypes("shmpool_buff_hdr",524,"off")=4300
+	Set gtmtypes("shmpool_buff_hdr",524,"len")=4
+	Set gtmtypes("shmpool_buff_hdr",524,"type")="int"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_db_csh_getns.cumul_count")=524
+	Set gtmtypes("shmpool_buff_hdr",525,"name")="shmpool_buff_hdr.shadow_file_header.n_db_csh_getn_lcnt"
+	Set gtmtypes("shmpool_buff_hdr",525,"off")=4304
 	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_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_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_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_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_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",525,"type")="db_csh_acct_rec"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_db_csh_getn_lcnt")=525
+	Set gtmtypes("shmpool_buff_hdr",526,"name")="shmpool_buff_hdr.shadow_file_header.n_db_csh_getn_lcnt.curr_count"
+	Set gtmtypes("shmpool_buff_hdr",526,"off")=4304
+	Set gtmtypes("shmpool_buff_hdr",526,"len")=4
+	Set gtmtypes("shmpool_buff_hdr",526,"type")="int"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_db_csh_getn_lcnt.curr_count")=526
+	Set gtmtypes("shmpool_buff_hdr",527,"name")="shmpool_buff_hdr.shadow_file_header.n_db_csh_getn_lcnt.cumul_count"
+	Set gtmtypes("shmpool_buff_hdr",527,"off")=4308
+	Set gtmtypes("shmpool_buff_hdr",527,"len")=4
+	Set gtmtypes("shmpool_buff_hdr",527,"type")="int"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_db_csh_getn_lcnt.cumul_count")=527
+	Set gtmtypes("shmpool_buff_hdr",528,"name")="shmpool_buff_hdr.shadow_file_header.db_csh_acct_rec_filler_4k"
+	Set gtmtypes("shmpool_buff_hdr",528,"off")=4312
+	Set gtmtypes("shmpool_buff_hdr",528,"len")=152
+	Set gtmtypes("shmpool_buff_hdr",528,"type")="char"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.db_csh_acct_rec_filler_4k")=528
+	Set gtmtypes("shmpool_buff_hdr",529,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec"
+	Set gtmtypes("shmpool_buff_hdr",529,"off")=4464
+	Set gtmtypes("shmpool_buff_hdr",529,"len")=472
+	Set gtmtypes("shmpool_buff_hdr",529,"type")="gvstats_rec_t"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec")=529
+	Set gtmtypes("shmpool_buff_hdr",530,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_set"
+	Set gtmtypes("shmpool_buff_hdr",530,"off")=4464
 	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_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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_set")=530
+	Set gtmtypes("shmpool_buff_hdr",531,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_kill"
+	Set gtmtypes("shmpool_buff_hdr",531,"off")=4472
 	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_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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_kill")=531
+	Set gtmtypes("shmpool_buff_hdr",532,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_get"
+	Set gtmtypes("shmpool_buff_hdr",532,"off")=4480
 	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_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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_get")=532
+	Set gtmtypes("shmpool_buff_hdr",533,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_data"
+	Set gtmtypes("shmpool_buff_hdr",533,"off")=4488
 	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.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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_data")=533
+	Set gtmtypes("shmpool_buff_hdr",534,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_order"
+	Set gtmtypes("shmpool_buff_hdr",534,"off")=4496
 	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_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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_order")=534
+	Set gtmtypes("shmpool_buff_hdr",535,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_zprev"
+	Set gtmtypes("shmpool_buff_hdr",535,"off")=4504
 	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_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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_zprev")=535
+	Set gtmtypes("shmpool_buff_hdr",536,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_query"
+	Set gtmtypes("shmpool_buff_hdr",536,"off")=4512
 	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_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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_query")=536
+	Set gtmtypes("shmpool_buff_hdr",537,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_lock_success"
+	Set gtmtypes("shmpool_buff_hdr",537,"off")=4520
 	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_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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_lock_success")=537
+	Set gtmtypes("shmpool_buff_hdr",538,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_lock_fail"
+	Set gtmtypes("shmpool_buff_hdr",538,"off")=4528
 	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_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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_lock_fail")=538
+	Set gtmtypes("shmpool_buff_hdr",539,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.db_curr_tn"
+	Set gtmtypes("shmpool_buff_hdr",539,"off")=4536
 	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_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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.db_curr_tn")=539
+	Set gtmtypes("shmpool_buff_hdr",540,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_dsk_read"
+	Set gtmtypes("shmpool_buff_hdr",540,"off")=4544
 	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_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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_dsk_read")=540
+	Set gtmtypes("shmpool_buff_hdr",541,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_dsk_write"
+	Set gtmtypes("shmpool_buff_hdr",541,"off")=4552
 	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_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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_dsk_write")=541
+	Set gtmtypes("shmpool_buff_hdr",542,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_nontp_readwrite"
+	Set gtmtypes("shmpool_buff_hdr",542,"off")=4560
 	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_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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_nontp_readwrite")=542
+	Set gtmtypes("shmpool_buff_hdr",543,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_nontp_readonly"
+	Set gtmtypes("shmpool_buff_hdr",543,"off")=4568
 	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_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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_nontp_readonly")=543
+	Set gtmtypes("shmpool_buff_hdr",544,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_nontp_blkwrite"
+	Set gtmtypes("shmpool_buff_hdr",544,"off")=4576
 	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_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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_nontp_blkwrite")=544
+	Set gtmtypes("shmpool_buff_hdr",545,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_nontp_blkread"
+	Set gtmtypes("shmpool_buff_hdr",545,"off")=4584
 	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_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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_nontp_blkread")=545
+	Set gtmtypes("shmpool_buff_hdr",546,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_nontp_retries_0"
+	Set gtmtypes("shmpool_buff_hdr",546,"off")=4592
 	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_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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_nontp_retries_0")=546
+	Set gtmtypes("shmpool_buff_hdr",547,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_nontp_retries_1"
+	Set gtmtypes("shmpool_buff_hdr",547,"off")=4600
 	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_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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_nontp_retries_1")=547
+	Set gtmtypes("shmpool_buff_hdr",548,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_nontp_retries_2"
+	Set gtmtypes("shmpool_buff_hdr",548,"off")=4608
 	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_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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_nontp_retries_2")=548
+	Set gtmtypes("shmpool_buff_hdr",549,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_nontp_retries_3"
+	Set gtmtypes("shmpool_buff_hdr",549,"off")=4616
 	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_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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_nontp_retries_3")=549
+	Set gtmtypes("shmpool_buff_hdr",550,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_tp_readwrite"
+	Set gtmtypes("shmpool_buff_hdr",550,"off")=4624
 	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_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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_tp_readwrite")=550
+	Set gtmtypes("shmpool_buff_hdr",551,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_tp_readonly"
+	Set gtmtypes("shmpool_buff_hdr",551,"off")=4632
 	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_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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_tp_readonly")=551
+	Set gtmtypes("shmpool_buff_hdr",552,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_tp_rolledback"
+	Set gtmtypes("shmpool_buff_hdr",552,"off")=4640
 	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_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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_tp_rolledback")=552
+	Set gtmtypes("shmpool_buff_hdr",553,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_tp_blkwrite"
+	Set gtmtypes("shmpool_buff_hdr",553,"off")=4648
 	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_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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_tp_blkwrite")=553
+	Set gtmtypes("shmpool_buff_hdr",554,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_tp_blkread"
+	Set gtmtypes("shmpool_buff_hdr",554,"off")=4656
 	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_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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_tp_blkread")=554
+	Set gtmtypes("shmpool_buff_hdr",555,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_tp_tot_retries_0"
+	Set gtmtypes("shmpool_buff_hdr",555,"off")=4664
 	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_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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_tp_tot_retries_0")=555
+	Set gtmtypes("shmpool_buff_hdr",556,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_tp_tot_retries_1"
+	Set gtmtypes("shmpool_buff_hdr",556,"off")=4672
 	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_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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_tp_tot_retries_1")=556
+	Set gtmtypes("shmpool_buff_hdr",557,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_tp_tot_retries_2"
+	Set gtmtypes("shmpool_buff_hdr",557,"off")=4680
 	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_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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_tp_tot_retries_2")=557
+	Set gtmtypes("shmpool_buff_hdr",558,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_tp_tot_retries_3"
+	Set gtmtypes("shmpool_buff_hdr",558,"off")=4688
 	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_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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_tp_tot_retries_3")=558
+	Set gtmtypes("shmpool_buff_hdr",559,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_tp_tot_retries_4"
+	Set gtmtypes("shmpool_buff_hdr",559,"off")=4696
 	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.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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_tp_tot_retries_4")=559
+	Set gtmtypes("shmpool_buff_hdr",560,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_tp_cnflct_retries_0"
+	Set gtmtypes("shmpool_buff_hdr",560,"off")=4704
 	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_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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_tp_cnflct_retries_0")=560
+	Set gtmtypes("shmpool_buff_hdr",561,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_tp_cnflct_retries_1"
+	Set gtmtypes("shmpool_buff_hdr",561,"off")=4712
 	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.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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_tp_cnflct_retries_1")=561
+	Set gtmtypes("shmpool_buff_hdr",562,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_tp_cnflct_retries_2"
+	Set gtmtypes("shmpool_buff_hdr",562,"off")=4720
 	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_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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_tp_cnflct_retries_2")=562
+	Set gtmtypes("shmpool_buff_hdr",563,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_tp_cnflct_retries_3"
+	Set gtmtypes("shmpool_buff_hdr",563,"off")=4728
 	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.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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_tp_cnflct_retries_3")=563
+	Set gtmtypes("shmpool_buff_hdr",564,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_tp_cnflct_retries_4"
+	Set gtmtypes("shmpool_buff_hdr",564,"off")=4736
 	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_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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_tp_cnflct_retries_4")=564
+	Set gtmtypes("shmpool_buff_hdr",565,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_ztrigger"
+	Set gtmtypes("shmpool_buff_hdr",565,"off")=4744
 	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_ztrigger")=565
+	Set gtmtypes("shmpool_buff_hdr",566,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_db_flush"
+	Set gtmtypes("shmpool_buff_hdr",566,"off")=4752
 	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_db_flush")=566
+	Set gtmtypes("shmpool_buff_hdr",567,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_db_fsync"
+	Set gtmtypes("shmpool_buff_hdr",567,"off")=4760
 	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.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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_db_fsync")=567
+	Set gtmtypes("shmpool_buff_hdr",568,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_jnl_flush"
+	Set gtmtypes("shmpool_buff_hdr",568,"off")=4768
 	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_jnl_flush")=568
+	Set gtmtypes("shmpool_buff_hdr",569,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_jnl_fsync"
+	Set gtmtypes("shmpool_buff_hdr",569,"off")=4776
 	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_jnl_fsync")=569
+	Set gtmtypes("shmpool_buff_hdr",570,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_jbuff_bytes"
+	Set gtmtypes("shmpool_buff_hdr",570,"off")=4784
 	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_jbuff_bytes")=570
+	Set gtmtypes("shmpool_buff_hdr",571,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_jfile_bytes"
+	Set gtmtypes("shmpool_buff_hdr",571,"off")=4792
 	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_jfile_bytes")=571
+	Set gtmtypes("shmpool_buff_hdr",572,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_jfile_writes"
+	Set gtmtypes("shmpool_buff_hdr",572,"off")=4800
 	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_jfile_writes")=572
+	Set gtmtypes("shmpool_buff_hdr",573,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_jrec_logical"
+	Set gtmtypes("shmpool_buff_hdr",573,"off")=4808
 	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_jrec_logical")=573
+	Set gtmtypes("shmpool_buff_hdr",574,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_jrec_pblk"
+	Set gtmtypes("shmpool_buff_hdr",574,"off")=4816
 	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_jrec_pblk")=574
+	Set gtmtypes("shmpool_buff_hdr",575,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_jrec_epoch_regular"
+	Set gtmtypes("shmpool_buff_hdr",575,"off")=4824
 	Set gtmtypes("shmpool_buff_hdr",575,"len")=8
 	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_jrec_epoch_regular")=575
+	Set gtmtypes("shmpool_buff_hdr",576,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_jrec_epoch_idle"
+	Set gtmtypes("shmpool_buff_hdr",576,"off")=4832
 	Set gtmtypes("shmpool_buff_hdr",576,"len")=8
 	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_jrec_epoch_idle")=576
+	Set gtmtypes("shmpool_buff_hdr",577,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_jrec_other"
+	Set gtmtypes("shmpool_buff_hdr",577,"off")=4840
 	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.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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_jrec_other")=577
+	Set gtmtypes("shmpool_buff_hdr",578,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_jnl_extends"
+	Set gtmtypes("shmpool_buff_hdr",578,"off")=4848
 	Set gtmtypes("shmpool_buff_hdr",578,"len")=8
 	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_jnl_extends")=578
+	Set gtmtypes("shmpool_buff_hdr",579,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_db_extends"
+	Set gtmtypes("shmpool_buff_hdr",579,"off")=4856
 	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_db_extends")=579
+	Set gtmtypes("shmpool_buff_hdr",580,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_crit_success"
+	Set gtmtypes("shmpool_buff_hdr",580,"off")=4864
 	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_crit_success")=580
+	Set gtmtypes("shmpool_buff_hdr",581,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_crits_in_epch"
+	Set gtmtypes("shmpool_buff_hdr",581,"off")=4872
 	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_crits_in_epch")=581
+	Set gtmtypes("shmpool_buff_hdr",582,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.sq_crit_failed"
+	Set gtmtypes("shmpool_buff_hdr",582,"off")=4880
 	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.sq_crit_failed")=582
+	Set gtmtypes("shmpool_buff_hdr",583,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_crit_failed"
+	Set gtmtypes("shmpool_buff_hdr",583,"off")=4888
+	Set gtmtypes("shmpool_buff_hdr",583,"len")=8
+	Set gtmtypes("shmpool_buff_hdr",583,"type")="uint64_t"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_crit_failed")=583
+	Set gtmtypes("shmpool_buff_hdr",584,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.sq_crit_que_slps"
+	Set gtmtypes("shmpool_buff_hdr",584,"off")=4896
+	Set gtmtypes("shmpool_buff_hdr",584,"len")=8
+	Set gtmtypes("shmpool_buff_hdr",584,"type")="uint64_t"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.sq_crit_que_slps")=584
+	Set gtmtypes("shmpool_buff_hdr",585,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_crit_que_slps"
+	Set gtmtypes("shmpool_buff_hdr",585,"off")=4904
+	Set gtmtypes("shmpool_buff_hdr",585,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",585,"type")="uint64_t"
-	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.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")="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")="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")="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")="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")="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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_crit_que_slps")=585
+	Set gtmtypes("shmpool_buff_hdr",586,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.sq_crit_yields"
+	Set gtmtypes("shmpool_buff_hdr",586,"off")=4912
+	Set gtmtypes("shmpool_buff_hdr",586,"len")=8
+	Set gtmtypes("shmpool_buff_hdr",586,"type")="uint64_t"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.sq_crit_yields")=586
+	Set gtmtypes("shmpool_buff_hdr",587,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_crit_yields"
+	Set gtmtypes("shmpool_buff_hdr",587,"off")=4920
+	Set gtmtypes("shmpool_buff_hdr",587,"len")=8
+	Set gtmtypes("shmpool_buff_hdr",587,"type")="uint64_t"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_crit_yields")=587
+	Set gtmtypes("shmpool_buff_hdr",588,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_clean2dirty"
+	Set gtmtypes("shmpool_buff_hdr",588,"off")=4928
+	Set gtmtypes("shmpool_buff_hdr",588,"len")=8
+	Set gtmtypes("shmpool_buff_hdr",588,"type")="uint64_t"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_clean2dirty")=588
+	Set gtmtypes("shmpool_buff_hdr",589,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec_filler_4k_plus_512"
+	Set gtmtypes("shmpool_buff_hdr",589,"off")=4936
+	Set gtmtypes("shmpool_buff_hdr",589,"len")=40
+	Set gtmtypes("shmpool_buff_hdr",589,"type")="char"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec_filler_4k_plus_512")=589
+	Set gtmtypes("shmpool_buff_hdr",590,"name")="shmpool_buff_hdr.shadow_file_header.filler_4k_plus_512"
+	Set gtmtypes("shmpool_buff_hdr",590,"off")=4976
+	Set gtmtypes("shmpool_buff_hdr",590,"len")=368
+	Set gtmtypes("shmpool_buff_hdr",590,"type")="char"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.filler_4k_plus_512")=590
+	Set gtmtypes("shmpool_buff_hdr",591,"name")="shmpool_buff_hdr.shadow_file_header.intrpt_recov_resync_strm_seqno"
+	Set gtmtypes("shmpool_buff_hdr",591,"off")=5344
+	Set gtmtypes("shmpool_buff_hdr",591,"len")=128
+	Set gtmtypes("shmpool_buff_hdr",591,"type")="uint64_t"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.intrpt_recov_resync_strm_seqno")=591
+	Set gtmtypes("shmpool_buff_hdr",591,"dim")=16
+	Set gtmtypes("shmpool_buff_hdr",592,"name")="shmpool_buff_hdr.shadow_file_header.creation_db_ver"
+	Set gtmtypes("shmpool_buff_hdr",592,"off")=5472
+	Set gtmtypes("shmpool_buff_hdr",592,"len")=4
+	Set gtmtypes("shmpool_buff_hdr",592,"type")="int"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.creation_db_ver")=592
+	Set gtmtypes("shmpool_buff_hdr",593,"name")="shmpool_buff_hdr.shadow_file_header.creation_mdb_ver"
+	Set gtmtypes("shmpool_buff_hdr",593,"off")=5476
+	Set gtmtypes("shmpool_buff_hdr",593,"len")=4
+	Set gtmtypes("shmpool_buff_hdr",593,"type")="int"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.creation_mdb_ver")=593
+	Set gtmtypes("shmpool_buff_hdr",594,"name")="shmpool_buff_hdr.shadow_file_header.certified_for_upgrade_to"
+	Set gtmtypes("shmpool_buff_hdr",594,"off")=5480
+	Set gtmtypes("shmpool_buff_hdr",594,"len")=4
+	Set gtmtypes("shmpool_buff_hdr",594,"type")="int"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.certified_for_upgrade_to")=594
+	Set gtmtypes("shmpool_buff_hdr",595,"name")="shmpool_buff_hdr.shadow_file_header.filler_5k"
+	Set gtmtypes("shmpool_buff_hdr",595,"off")=5484
+	Set gtmtypes("shmpool_buff_hdr",595,"len")=4
+	Set gtmtypes("shmpool_buff_hdr",595,"type")="int"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.filler_5k")=595
+	Set gtmtypes("shmpool_buff_hdr",596,"name")="shmpool_buff_hdr.shadow_file_header.secshr_ops_index_filler"
+	Set gtmtypes("shmpool_buff_hdr",596,"off")=5488
+	Set gtmtypes("shmpool_buff_hdr",596,"len")=4
+	Set gtmtypes("shmpool_buff_hdr",596,"type")="int"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.secshr_ops_index_filler")=596
+	Set gtmtypes("shmpool_buff_hdr",597,"name")="shmpool_buff_hdr.shadow_file_header.secshr_ops_array_filler"
+	Set gtmtypes("shmpool_buff_hdr",597,"off")=5492
+	Set gtmtypes("shmpool_buff_hdr",597,"len")=1020
 	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.secshr_ops_array_filler")=597
+	Set gtmtypes("shmpool_buff_hdr",597,"dim")=255
+	Set gtmtypes("shmpool_buff_hdr",598,"name")="shmpool_buff_hdr.shadow_file_header.next_upgrd_warn"
+	Set gtmtypes("shmpool_buff_hdr",598,"off")=6512
+	Set gtmtypes("shmpool_buff_hdr",598,"len")=24
+	Set gtmtypes("shmpool_buff_hdr",598,"type")="compswap_time_field"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.next_upgrd_warn")=598
+	Set gtmtypes("shmpool_buff_hdr",599,"name")="shmpool_buff_hdr.shadow_file_header.next_upgrd_warn.time_latch"
+	Set gtmtypes("shmpool_buff_hdr",599,"off")=6512
+	Set gtmtypes("shmpool_buff_hdr",599,"len")=8
+	Set gtmtypes("shmpool_buff_hdr",599,"type")="global_latch_t"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.next_upgrd_warn.time_latch")=599
+	Set gtmtypes("shmpool_buff_hdr",600,"name")="shmpool_buff_hdr.shadow_file_header.next_upgrd_warn.time_latch.u"
+	Set gtmtypes("shmpool_buff_hdr",600,"off")=6512
+	Set gtmtypes("shmpool_buff_hdr",600,"len")=8
+	Set gtmtypes("shmpool_buff_hdr",600,"type")="union"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.next_upgrd_warn.time_latch.u")=600
+	Set gtmtypes("shmpool_buff_hdr",601,"name")="shmpool_buff_hdr.shadow_file_header.next_upgrd_warn.time_latch.u.pid_imgcnt"
+	Set gtmtypes("shmpool_buff_hdr",601,"off")=6512
+	Set gtmtypes("shmpool_buff_hdr",601,"len")=8
+	Set gtmtypes("shmpool_buff_hdr",601,"type")="uint64_t"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.next_upgrd_warn.time_latch.u.pid_imgcnt")=601
+	Set gtmtypes("shmpool_buff_hdr",602,"name")="shmpool_buff_hdr.shadow_file_header.next_upgrd_warn.time_latch.u.parts"
+	Set gtmtypes("shmpool_buff_hdr",602,"off")=6512
+	Set gtmtypes("shmpool_buff_hdr",602,"len")=8
+	Set gtmtypes("shmpool_buff_hdr",602,"type")="struct"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.next_upgrd_warn.time_latch.u.parts")=602
+	Set gtmtypes("shmpool_buff_hdr",603,"name")="shmpool_buff_hdr.shadow_file_header.next_upgrd_warn.time_latch.u.parts.latch_pid"
+	Set gtmtypes("shmpool_buff_hdr",603,"off")=6512
+	Set gtmtypes("shmpool_buff_hdr",603,"len")=4
+	Set gtmtypes("shmpool_buff_hdr",603,"type")="int"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.next_upgrd_warn.time_latch.u.parts.latch_pid")=603
+	Set gtmtypes("shmpool_buff_hdr",604,"name")="shmpool_buff_hdr.shadow_file_header.next_upgrd_warn.time_latch.u.parts.latch_word"
+	Set gtmtypes("shmpool_buff_hdr",604,"off")=6516
 	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",604,"type")="int"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.next_upgrd_warn.time_latch.u.parts.latch_word")=604
+	Set gtmtypes("shmpool_buff_hdr",605,"name")="shmpool_buff_hdr.shadow_file_header.next_upgrd_warn.hp_latch_space"
+	Set gtmtypes("shmpool_buff_hdr",605,"off")=6520
+	Set gtmtypes("shmpool_buff_hdr",605,"len")=16
+	Set gtmtypes("shmpool_buff_hdr",605,"type")="int"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.next_upgrd_warn.hp_latch_space")=605
+	Set gtmtypes("shmpool_buff_hdr",605,"dim")=4
+	Set gtmtypes("shmpool_buff_hdr",606,"name")="shmpool_buff_hdr.shadow_file_header.is_encrypted"
+	Set gtmtypes("shmpool_buff_hdr",606,"off")=6536
 	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",606,"type")="unsigned-int"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.is_encrypted")=606
+	Set gtmtypes("shmpool_buff_hdr",607,"name")="shmpool_buff_hdr.shadow_file_header.db_trigger_cycle"
+	Set gtmtypes("shmpool_buff_hdr",607,"off")=6540
 	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",607,"type")="unsigned-int"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.db_trigger_cycle")=607
+	Set gtmtypes("shmpool_buff_hdr",608,"name")="shmpool_buff_hdr.shadow_file_header.strm_reg_seqno"
+	Set gtmtypes("shmpool_buff_hdr",608,"off")=6544
+	Set gtmtypes("shmpool_buff_hdr",608,"len")=128
+	Set gtmtypes("shmpool_buff_hdr",608,"type")="uint64_t"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.strm_reg_seqno")=608
+	Set gtmtypes("shmpool_buff_hdr",608,"dim")=16
+	Set gtmtypes("shmpool_buff_hdr",609,"name")="shmpool_buff_hdr.shadow_file_header.save_strm_reg_seqno"
+	Set gtmtypes("shmpool_buff_hdr",609,"off")=6672
+	Set gtmtypes("shmpool_buff_hdr",609,"len")=128
+	Set gtmtypes("shmpool_buff_hdr",609,"type")="uint64_t"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.save_strm_reg_seqno")=609
+	Set gtmtypes("shmpool_buff_hdr",609,"dim")=16
+	Set gtmtypes("shmpool_buff_hdr",610,"name")="shmpool_buff_hdr.shadow_file_header.freeze_on_fail"
+	Set gtmtypes("shmpool_buff_hdr",610,"off")=6800
 	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.freeze_on_fail")=610
+	Set gtmtypes("shmpool_buff_hdr",611,"name")="shmpool_buff_hdr.shadow_file_header.span_node_absent"
+	Set gtmtypes("shmpool_buff_hdr",611,"off")=6804
 	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 gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.span_node_absent")=611
+	Set gtmtypes("shmpool_buff_hdr",612,"name")="shmpool_buff_hdr.shadow_file_header.maxkeysz_assured"
+	Set gtmtypes("shmpool_buff_hdr",612,"off")=6808
 	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("shmpool_buff_hdr",612,"type")="boolean_t"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.maxkeysz_assured")=612
+	Set gtmtypes("shmpool_buff_hdr",613,"name")="shmpool_buff_hdr.shadow_file_header.hasht_upgrade_needed"
+	Set gtmtypes("shmpool_buff_hdr",613,"off")=6812
+	Set gtmtypes("shmpool_buff_hdr",613,"len")=4
+	Set gtmtypes("shmpool_buff_hdr",613,"type")="boolean_t"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.hasht_upgrade_needed")=613
+	Set gtmtypes("shmpool_buff_hdr",614,"name")="shmpool_buff_hdr.shadow_file_header.defer_allocate"
+	Set gtmtypes("shmpool_buff_hdr",614,"off")=6816
+	Set gtmtypes("shmpool_buff_hdr",614,"len")=4
+	Set gtmtypes("shmpool_buff_hdr",614,"type")="boolean_t"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.defer_allocate")=614
+	Set gtmtypes("shmpool_buff_hdr",615,"name")="shmpool_buff_hdr.shadow_file_header.filler_ftok_counter_halted"
+	Set gtmtypes("shmpool_buff_hdr",615,"off")=6820
+	Set gtmtypes("shmpool_buff_hdr",615,"len")=4
+	Set gtmtypes("shmpool_buff_hdr",615,"type")="boolean_t"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.filler_ftok_counter_halted")=615
+	Set gtmtypes("shmpool_buff_hdr",616,"name")="shmpool_buff_hdr.shadow_file_header.filler_access_counter_halted"
+	Set gtmtypes("shmpool_buff_hdr",616,"off")=6824
+	Set gtmtypes("shmpool_buff_hdr",616,"len")=4
+	Set gtmtypes("shmpool_buff_hdr",616,"type")="boolean_t"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.filler_access_counter_halted")=616
+	Set gtmtypes("shmpool_buff_hdr",617,"name")="shmpool_buff_hdr.shadow_file_header.lock_crit_with_db"
+	Set gtmtypes("shmpool_buff_hdr",617,"off")=6828
+	Set gtmtypes("shmpool_buff_hdr",617,"len")=4
+	Set gtmtypes("shmpool_buff_hdr",617,"type")="boolean_t"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.lock_crit_with_db")=617
+	Set gtmtypes("shmpool_buff_hdr",618,"name")="shmpool_buff_hdr.shadow_file_header.basedb_fname_len"
+	Set gtmtypes("shmpool_buff_hdr",618,"off")=6832
+	Set gtmtypes("shmpool_buff_hdr",618,"len")=4
+	Set gtmtypes("shmpool_buff_hdr",618,"type")="unsigned-int"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.basedb_fname_len")=618
+	Set gtmtypes("shmpool_buff_hdr",619,"name")="shmpool_buff_hdr.shadow_file_header.basedb_fname"
+	Set gtmtypes("shmpool_buff_hdr",619,"off")=6836
+	Set gtmtypes("shmpool_buff_hdr",619,"len")=256
+	Set gtmtypes("shmpool_buff_hdr",619,"type")="unsigned-char"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.basedb_fname")=619
+	Set gtmtypes("shmpool_buff_hdr",620,"name")="shmpool_buff_hdr.shadow_file_header.filler_7k"
+	Set gtmtypes("shmpool_buff_hdr",620,"off")=7092
+	Set gtmtypes("shmpool_buff_hdr",620,"len")=444
+	Set gtmtypes("shmpool_buff_hdr",620,"type")="char"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.filler_7k")=620
+	Set gtmtypes("shmpool_buff_hdr",621,"name")="shmpool_buff_hdr.shadow_file_header.filler_8k"
+	Set gtmtypes("shmpool_buff_hdr",621,"off")=7536
+	Set gtmtypes("shmpool_buff_hdr",621,"len")=1024
+	Set gtmtypes("shmpool_buff_hdr",621,"type")="char"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.filler_8k")=621
 	;
 	Set gtmtypes("show_reply")="struct"
 	Set gtmtypes("show_reply",0)=2
@@ -37752,43 +38791,18 @@ Init
 	Set gtmtypfldindx("stringkey","filler")=6
 	;
 	Set gtmtypes("struct_jrec_align")="struct"
-	Set gtmtypes("struct_jrec_align",0)=7
-	Set gtmtypes("struct_jrec_align","len")=32
-	Set gtmtypes("struct_jrec_align",1,"name")="struct_jrec_align.prefix"
-	Set gtmtypes("struct_jrec_align",1,"off")=0
-	Set gtmtypes("struct_jrec_align",1,"len")=24
-	Set gtmtypes("struct_jrec_align",1,"type")="jrec_prefix"
-	Set gtmtypfldindx("struct_jrec_align","prefix")=1
-	Set gtmtypes("struct_jrec_align",2,"name")="struct_jrec_align.prefix.pini_addr"
-	Set gtmtypes("struct_jrec_align",2,"off")=4
+	Set gtmtypes("struct_jrec_align",0)=2
+	Set gtmtypes("struct_jrec_align","len")=12
+	Set gtmtypes("struct_jrec_align",1,"name")="struct_jrec_align.checksum"
+	Set gtmtypes("struct_jrec_align",1,"off")=4
+	Set gtmtypes("struct_jrec_align",1,"len")=4
+	Set gtmtypes("struct_jrec_align",1,"type")="unsigned-int"
+	Set gtmtypfldindx("struct_jrec_align","checksum")=1
+	Set gtmtypes("struct_jrec_align",2,"name")="struct_jrec_align.time"
+	Set gtmtypes("struct_jrec_align",2,"off")=8
 	Set gtmtypes("struct_jrec_align",2,"len")=4
 	Set gtmtypes("struct_jrec_align",2,"type")="unsigned-int"
-	Set gtmtypfldindx("struct_jrec_align","prefix.pini_addr")=2
-	Set gtmtypes("struct_jrec_align",3,"name")="struct_jrec_align.prefix.time"
-	Set gtmtypes("struct_jrec_align",3,"off")=8
-	Set gtmtypes("struct_jrec_align",3,"len")=4
-	Set gtmtypes("struct_jrec_align",3,"type")="unsigned-int"
-	Set gtmtypfldindx("struct_jrec_align","prefix.time")=3
-	Set gtmtypes("struct_jrec_align",4,"name")="struct_jrec_align.prefix.checksum"
-	Set gtmtypes("struct_jrec_align",4,"off")=12
-	Set gtmtypes("struct_jrec_align",4,"len")=4
-	Set gtmtypes("struct_jrec_align",4,"type")="unsigned-int"
-	Set gtmtypfldindx("struct_jrec_align","prefix.checksum")=4
-	Set gtmtypes("struct_jrec_align",5,"name")="struct_jrec_align.prefix.tn"
-	Set gtmtypes("struct_jrec_align",5,"off")=16
-	Set gtmtypes("struct_jrec_align",5,"len")=8
-	Set gtmtypes("struct_jrec_align",5,"type")="uint64_t"
-	Set gtmtypfldindx("struct_jrec_align","prefix.tn")=5
-	Set gtmtypes("struct_jrec_align",6,"name")="struct_jrec_align.align_str"
-	Set gtmtypes("struct_jrec_align",6,"off")=24
-	Set gtmtypes("struct_jrec_align",6,"len")=8
-	Set gtmtypes("struct_jrec_align",6,"type")="jnl_string"
-	Set gtmtypfldindx("struct_jrec_align","align_str")=6
-	Set gtmtypes("struct_jrec_align",7,"name")="struct_jrec_align.align_str.text"
-	Set gtmtypes("struct_jrec_align",7,"off")=28
-	Set gtmtypes("struct_jrec_align",7,"len")=1
-	Set gtmtypes("struct_jrec_align",7,"type")="char"
-	Set gtmtypfldindx("struct_jrec_align","align_str.text")=7
+	Set gtmtypfldindx("struct_jrec_align","time")=2
 	;
 	Set gtmtypes("struct_jrec_blk")="struct"
 	Set gtmtypes("struct_jrec_blk",0)=10
@@ -40758,7 +41772,7 @@ Init
 	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 gtmtypes("unix_db_info",121,"type")="int"
 	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
diff --git a/sr_x86_64/merrors_ansi.h b/sr_x86_64/merrors_ansi.h
index ddf134a..9b6ba07 100644
--- a/sr_x86_64/merrors_ansi.h
+++ b/sr_x86_64/merrors_ansi.h
@@ -402,7 +402,7 @@ const static readonly int error_ansi[] = {
 	   0,	/* CCECLSTPRCS */
 	   0,	/* ZSHOWBADFUNC */
 	   0,	/* NOTALLJNLEN */
-	   0,	/* UNUSEDMSG570 */
+	   0,	/* BADLOCKNEST */
 	   0,	/* NOLBRSRC */
 	   0,	/* INVZSTEP */
 	   0,	/* ZSTEPARG */
@@ -502,7 +502,7 @@ const static readonly int error_ansi[] = {
 	   0,	/* CETOOLONG */
 	   0,	/* CENOINDIR */
 	   0,	/* COLLATIONUNDEF */
-	   0,	/* UNUSEDMSG670 */
+	   0,	/* UNUSEDMSG673 */
 	   0,	/* GTMSECSHRSRVF */
 	   0,	/* FREEZECTRL */
 	   0,	/* JNLFLUSH */
@@ -608,7 +608,7 @@ const static readonly int error_ansi[] = {
 	   0,	/* MEMORYRECURSIVE */
 	   0,	/* FREEZEID */
 	   0,	/* BLKWRITERR */
-	   0,	/* UNUSEDMSG776 */
+	   0,	/* UNUSEDMSG779 */
 	   0,	/* PINENTRYERR */
 	   0,	/* BCKUPBUFLUSH */
 	   0,	/* NOFORKCORE */
@@ -1148,7 +1148,7 @@ const static readonly int error_ansi[] = {
 	   0,	/* CRYPTDLNOOPEN */
 	   0,	/* CRYPTNOV4 */
 	   0,	/* CRYPTNOMM */
-	   0,	/* UNUSEDMSG1316 */
+	   0,	/* UNUSEDMSG1319 */
 	   0,	/* CRYPTKEYFETCHFAILED */
 	   0,	/* CRYPTKEYFETCHFAILEDNF */
 	   0,	/* CRYPTHASHGENFAILED */
@@ -1206,7 +1206,7 @@ const static readonly int error_ansi[] = {
 	   0,	/* MUUSERLBK */
 	   0,	/* SETINSETTRIGONLY */
 	   0,	/* DZTRIGINTRIG */
-	   0,	/* UNUSEDMSG1374 */
+	   0,	/* UNUSEDMSG1377 */
 	   0,	/* BOOLSIDEFFECT */
 	   0,	/* DBBADUPGRDSTATE */
 	   0,	/* WRITEWAITPID */
@@ -1218,7 +1218,7 @@ const static readonly int error_ansi[] = {
 	   0,	/* JNLORDBFLU */
 	   0,	/* ZCCLNUPRTNMISNG */
 	   0,	/* ZCINVALIDKEYWORD */
-	   0,	/* UNUSEDMSG1386 */
+	   0,	/* UNUSEDMSG1389 */
 	   0,	/* DBSHMNAMEDIFF */
 	   0,	/* SHMREMOVED */
 	   0,	/* DEVICEWRITEONLY */
@@ -1359,7 +1359,7 @@ const static readonly int error_ansi[] = {
 	   0,	/* GETNAMEINFO */
 	   0,	/* SOCKBIND */
 	   0,	/* INSTFRZDEFER */
-	   0,	/* UNUSEDMSG1529 */
+	   0,	/* UNUSEDMSG1532 */
 	   0,	/* REGOPENFAIL */
 	   0,	/* REPLINSTNOSHM */
 	   0,	/* DEVPARMTOOSMALL */
@@ -1369,7 +1369,7 @@ const static readonly int error_ansi[] = {
 	   0,	/* GBLNOMAPTOREG */
 	   0,	/* ISSPANGBL */
 	   0,	/* TPNOSUPPORT */
-	   0,	/* UNUSEDMSG1539 */
+	   0,	/* UNUSEDMSG1542 */
 	   0,	/* ZATRANSERR */
 	   0,	/* FILTERTIMEDOUT */
 	   0,	/* TLSDLLNOOPEN */
@@ -1491,4 +1491,11 @@ const static readonly int error_ansi[] = {
 	   0,	/* JNLSWITCHRETRY */
 	   0,	/* JNLSWITCHFAIL */
 	   0,	/* CLISTRTOOLONG */
+	   0,	/* LVMONBADVAL */
+	   0,	/* RESTRICTEDOP */
+	   0,	/* RESTRICTSYNTAX */
+	   0,	/* MUCREFILERR */
+	   0,	/* JNLBUFFPHS2SALVAGE */
+	   0,	/* JNLPOOLPHS2SALVAGE */
+	   0,	/* MURNDWNARGLESS */
 	};
diff --git a/sr_x86_64/merrors_ctl.c b/sr_x86_64/merrors_ctl.c
index 47f0528..e9fb7da 100644
--- a/sr_x86_64/merrors_ctl.c
+++ b/sr_x86_64/merrors_ctl.c
@@ -258,7 +258,7 @@ LITDEF	err_msg merrors[] = {
 	{ "ZCCONVERT", "External call: error converting output argument", 0 },
 	{ "ZCRTENOTF", "External call routine !AD not found", 2 },
 	{ "GVRUNDOWN", "Error during global database rundown", 0 },
-	{ "LKRUNDOWN", "Error during lock database rundown", 0 },
+	{ "LKRUNDOWN", "Error during LOCK database rundown", 0 },
 	{ "IORUNDOWN", "Error during image rundown", 0 },
 	{ "FILENOTFND", "File !AD not found", 2 },
 	{ "MUFILRNDWNFL", "File !AD rundown failed", 2 },
@@ -349,7 +349,7 @@ LITDEF	err_msg merrors[] = {
 	{ "FNOTONSYS", "Function or special variable is not supported by this operating system", 0 },
 	{ "AMBISYIPARAM", "Parameter !AD is ambiguous to $ZGETSYI()", 2 },
 	{ "PREVJNLNOEOF", "A previous generation journal file !AD does not have valid EOF", 2 },
-	{ "LKSECINIT", "Error creating lock section for database !AD", 2 },
+	{ "LKSECINIT", "Error creating LOCK section for database !AD", 2 },
 	{ "MTDOSLAB", "Tape label is not in valid DOS-11 format", 0 },
 	{ "MTDOSFOR", "Use of DOS-11 labels requires stream format", 0 },
 	{ "MTINVLAB", "Invalid label type specified in magtape OPEN", 0 },
@@ -366,7 +366,7 @@ LITDEF	err_msg merrors[] = {
 	{ "EXTRACTCTRLY", "User interrupt encountered during extract -- halting", 0 },
 	{ "CCENOWORLD", "CCE does not have WORLD privilege.  Information may be incomplete.", 0 },
 	{ "GVQUERYFAIL", "Global variable $QUERY function failed.  Failure code: !AD.", 2 },
-	{ "LCKSCANCELLED", "Error on remote node holding locks or zallocates.  All locks and zallocates cancelled.", 0 },
+	{ "LCKSCANCELLED", "Error on remote node holding LOCKs or ZALLOCATEs.  All LOCKs and ZALLOCATEs cancelled.", 0 },
 	{ "INVNETFILNM", "Invalid file name following node designation in global directory", 0 },
 	{ "NETDBOPNERR", "Error while attempting to open database across net", 0 },
 	{ "BADSRVRNETMSG", "Invalid message received from GT.CM server", 0 },
@@ -404,7 +404,7 @@ LITDEF	err_msg merrors[] = {
 	{ "CCECLSTPRCS", "!UL processes are accessing clustered database files", 1 },
 	{ "ZSHOWBADFUNC", "An illegal function was specified for ZSHOW", 0 },
 	{ "NOTALLJNLEN", "Journaling disabled/off for !AD regions", 2 },
-	{ "UNUSEDMSG570", "ZSHOWGLOSMALL last used in V6.2-002A", 0 },
+	{ "BADLOCKNEST", "Unsupported nesting of LOCK commands", 0 },
 	{ "NOLBRSRC", "Object libraries cannot have SRC paths associated", 0 },
 	{ "INVZSTEP", "Invalid ZSTEP qualifier", 0 },
 	{ "ZSTEPARG", "ZSTEP argument expected", 0 },
@@ -453,7 +453,7 @@ LITDEF	err_msg merrors[] = {
 	{ "ZCWRONGDESC", "A string longer than 65535 is passed via 32-bit descriptor", 0 },
 	{ "MUTNWARN", "Database file !AD has 0x!16 at XQ more transactions to go before reaching the transaction number limit (0x!16 at XQ). Renew database with MUPIP INTEG TN_RESET", 4 },
 	{ "GTMSECSHRUPDDBHDR", "[client pid !UL] database fileheader (!AD) updated !AD", 5 },
-	{ "LCKSTIMOUT", "DAL timed lock request expired", 0 },
+	{ "LCKSTIMOUT", "DAL timed LOCK request expired", 0 },
 	{ "CTLMNEMAXLEN", "The maximum length of a control mnemonic has been exceeded", 0 },
 	{ "CTLMNEXPECTED", "Control mnemonic is expected in this context", 0 },
 	{ "USRIOINIT", "User-defined device driver not successfully initialized", 0 },
@@ -477,7 +477,7 @@ LITDEF	err_msg merrors[] = {
 	{ "TRIGZBREAKREM", "ZBREAK in trigger !AD removed due to trigger being reloaded", 2 },
 	{ "TLVLZERO", "Transaction is not in progress", 0 },
 	{ "TRESTNOT", "Cannot TRESTART, transaction is not restartable", 0 },
-	{ "TPLOCK", "Cannot release lock(s) held prior to current TSTART", 0 },
+	{ "TPLOCK", "Cannot release LOCK(s) held prior to current TSTART", 0 },
 	{ "TPQUIT", "Cannot QUIT out of a routine with an active transaction", 0 },
 	{ "TPFAIL", "Transaction COMMIT failed.  Failure code: !AD.", 2 },
 	{ "TPRETRY", "Restart transaction from non-concurrency DB failure", 0 },
@@ -504,7 +504,7 @@ LITDEF	err_msg merrors[] = {
 	{ "CETOOLONG", "Compiler escape substitution exceeds maximum line size", 0 },
 	{ "CENOINDIR", "Indirection type information not available for compiler escape feature", 0 },
 	{ "COLLATIONUNDEF", "Collation type !UL is not defined", 1 },
-	{ "UNUSEDMSG670", "RBWRNNOTCHG last used in V6.2-002A", 0 },
+	{ "UNUSEDMSG673", "RBWRNNOTCHG last used in V6.2-002A", 0 },
 	{ "GTMSECSHRSRVF", "!AD - !UL : Attempt to service request failed (retry = !UL)", 4 },
 	{ "FREEZECTRL", "Control Y or control C encountered during attempt to freeze the database. Aborting freeze.", 0 },
 	{ "JNLFLUSH", "Error flushing journal buffers to journal file !AD", 2 },
@@ -610,7 +610,7 @@ 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 },
-	{ "UNUSEDMSG776", "STOPTIMEOUT last used in V6.3-000A", 0 },
+	{ "UNUSEDMSG779", "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 },
@@ -817,16 +817,16 @@ LITDEF	err_msg merrors[] = {
 	{ "LOWSPACECRE", "Disk space for database file !AD is not enough for !UL future extensions.  !@ZQ !UL-byte blocks are needed, only !@ZQ available.", 6 },
 	{ "WAITDSKSPACE", "Process 0x!XL will wait !UL seconds for necessary disk space to become available for !AD ", 4 },
 	{ "OUTOFSPACE", "Database file !AD ran out of disk space.  Detected by process !UL.  !/Exit without clearing shared memory due to the disk space constraints.  !/Make space and then perform mupip rundown to ensure database integrity.", 3 },
-	{ "JNLPVTINFO", "Pid 0x!XL!/     cycle 0x!XL fd_mismatch 0x!XL     channel 0x!XL sync_io 0x!XL!/ pini_addr 0x!XL  qio_active 0x!XL old_channel 0x!XL", 8 },
+	{ "JNLPVTINFO", "Pid 0x!XL cycle 0x!XL fd_mismatch 0x!XL channel 0x!XL sync_io 0x!XL pini_addr 0x!XL qio_active 0x!XL old_channel 0x!XL", 8 },
 	{ "NOSPACEEXT", "Not enough disk space for file !AD to extend.  !UL blocks needed.  !UL blocks available.", 4 },
 	{ "WCBLOCKED", "Field !AD is set by process !UL at transaction number 0x!16 at XQ for database file !AD", 6 },
 	{ "REPLJNLCLOSED", "Replication in jeopardy as journaling got closed for database file !AD. Current region seqno is !@ZQ [0x!16 at XQ] and system seqno is !@ZQ [0x!16 at XQ]", 6 },
 	{ "RENAMEFAIL", "Rename of file !AD to !AD failed", 4 },
 	{ "FILERENAME", "File !AD is renamed to !AD", 4 },
-	{ "JNLBUFINFO", "Pid 0x!XL!/     dsk 0x!XL     free 0x!XL  bytcnt 0x!XL io_in_prog 0x!XL fsync_in_prog 0x!XL!/ dskaddr 0x!XL freeaddr 0x!XL  qiocnt 0x!XL now_writer 0x!XL     fsync_pid 0x!XL!/filesize 0x!XL    cycle 0x!XL  errcnt 0x!XL    wrtsize 0x!XL fsync_dskaddr 0x!XL", 16 },
+	{ "JNLBUFINFO", "Pid 0x!XL dsk 0x!XL free 0x!XL bytcnt 0x!XL io_in_prog 0x!XL fsync_in_prog 0x!XL dskaddr 0x!XL freeaddr 0x!XL qiocnt 0x!XL now_writer 0x!XL fsync_pid 0x!XL filesize 0x!XL cycle 0x!XL errcnt 0x!XL wrtsize 0x!XL fsync_dskaddr 0x!XL rsrv_free 0x!XL rsrv_freeaddr 0x!XL phase2_commit_index1 0x!XL phase2_commit_index2 0x!XL next_align_addr 0x!XL", 21 },
 	{ "SDSEEKERR", "Sequential device seek error - !AD", 2 },
 	{ "LOCALSOCKREQ", "LOCAL socket required", 0 },
-	{ "TPNOTACID", "!AD at !AD in a final TP retry violates ACID properties of a TRANSACTION; indefinite RESTARTs may occur !AD !AD", 8 },
+	{ "TPNOTACID", "!AD at !AD violates ACID properties of a TRANSACTION and could exceed !AD seconds; $TRESTART = !UL and indefinite RESTARTs may occur", 7 },
 	{ "JNLSETDATA2LONG", "SET journal record has data of length !UL.  Target system cannot handle data more than !UL bytes.", 2 },
 	{ "JNLNEWREC", "Target system cannot recognize journal record of type !UL, last recognized type is !UL", 2 },
 	{ "REPLFTOKSEM", "Error with replication semaphores for instance file !AD", 2 },
@@ -1150,7 +1150,7 @@ LITDEF	err_msg merrors[] = {
 	{ "CRYPTDLNOOPEN", "Could not load encryption library while opening encrypted file !AD. !AD", 4 },
 	{ "CRYPTNOV4", "!AD is an encrypted database. Cannot downgrade(to V4) with Encryption option enabled.", 2 },
 	{ "CRYPTNOMM", "!AD is an encrypted database. Cannot support MM access method.", 2 },
-	{ "UNUSEDMSG1316", "Last used in V6.2-002A", 0 },
+	{ "UNUSEDMSG1319", "Last used in V6.2-002A", 0 },
 	{ "CRYPTKEYFETCHFAILED", "Could not retrieve encryption key corresponding to file !AD. !AD", 4 },
 	{ "CRYPTKEYFETCHFAILEDNF", "Could not retrieve encryption key during !AD operation key. !AD", 4 },
 	{ "CRYPTHASHGENFAILED", "Could not generate cryptographic hash for symmetric key corresponding to file !AD. !AD", 4 },
@@ -1208,7 +1208,7 @@ LITDEF	err_msg merrors[] = {
 	{ "MUUSERLBK", "Abnormal shutdown of replication-enabled database !AD detected", 2 },
 	{ "SETINSETTRIGONLY", "ISV !AD can only be modified in a 'SET' type trigger", 2 },
 	{ "DZTRIGINTRIG", "$ZTRIGGER() is not allowed inside trigger context. Trigger name: !AD", 2 },
-	{ "UNUSEDMSG1374", "SECNODZTRIGINTP : Last used in V6.2-000", 0 },
+	{ "UNUSEDMSG1377", "SECNODZTRIGINTP : Last used in V6.2-000", 0 },
 	{ "BOOLSIDEFFECT", "Extrinsic ($$), External call ($&) or $INCREMENT() with potential side effects in Boolean expression", 0 },
 	{ "DBBADUPGRDSTATE", "Correcting conflicting values for fields describing database version upgrade state in the file header for region !AD (!AD) - make fresh backups with new journal files immediately.", 4 },
 	{ "WRITEWAITPID", "PID !UL waited !UL minute(s) for PID !UL to finish writing block 0x!XL in database file !AD", 6 },
@@ -1220,7 +1220,7 @@ LITDEF	err_msg merrors[] = {
 	{ "JNLORDBFLU", "Error flushing database blocks to !AD. See related messages in the operator log", 2 },
 	{ "ZCCLNUPRTNMISNG", "External call: Cleanup routine name missing. Cannot continue", 0 },
 	{ "ZCINVALIDKEYWORD", "External call: Invalid keyword found. Cannot continue", 0 },
-	{ "UNUSEDMSG1386", "REPLNOMULTILINETRG : Last used in V6.2-000", 0 },
+	{ "UNUSEDMSG1389", "REPLNOMULTILINETRG : Last used in V6.2-000", 0 },
 	{ "DBSHMNAMEDIFF", "Database file !AD points to shared memory (id = !UL) which points to a different database file !AZ", 4 },
 	{ "SHMREMOVED", "Removed Shared Memory id !UL corresponding to file !AD", 3 },
 	{ "DEVICEWRITEONLY", "Cannot read from a write-only device", 0 },
@@ -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 },
-	{ "UNUSEDMSG1529", "REGOPENRETRY last used in V6.3-000A", 0 },
+	{ "UNUSEDMSG1532", "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,7 +1371,7 @@ 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 },
-	{ "UNUSEDMSG1539", "GVSUBSERR last used in V6.3-000A", 0 },
+	{ "UNUSEDMSG1542", "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 },
@@ -1415,7 +1415,7 @@ LITDEF	err_msg merrors[] = {
 	{ "REPLNOHASHTREC", "Sequence number 0x!16 at XQ contains trigger definition updates. !AD side must be at least V6.2-000 for replication to continue", 3 },
 	{ "REMOTEDBNOTRIG", "Trigger operations on global !AD not supported as it maps to database region !AD that points to a remote file", 4 },
 	{ "NEEDTRIGUPGRD", "Cannot do trigger operation on database file !AD until it is upgraded; Run MUPIP TRIGGER -UPGRADE first", 2 },
-	{ "REQRLNKCTLRNDWN", "Error accessing relinkctl file for $ZROUTINES directory !AD. Must be rundown", 2 },
+	{ "REQRLNKCTLRNDWN", "Error accessing relinkctl file !AZ for $ZROUTINES directory !AD. Must be rundown", 3 },
 	{ "RLNKCTLRNDWNSUC", "Relinkctl file for $ZROUTINES directory !AD successfully rundown", 2 },
 	{ "RLNKCTLRNDWNFL", "Relinkctl file for $ZROUTINES directory !AD failed to rundown as it is open by !UL process(es)", 3 },
 	{ "MPROFRUNDOWN", "Error during M-profiling rundown", 0 },
@@ -1451,7 +1451,7 @@ LITDEF	err_msg merrors[] = {
 	{ "MUREENCRYPTSTART", "Database !AD : MUPIP REORG ENCRYPT started by pid !UL at transaction number [0x!16 at XQ]", 4 },
 	{ "MUREENCRYPTV4NOALLOW", "Database (re)encryption supported only on fully upgraded V5 databases. !AD has V4 format blocks", 2 },
 	{ "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 },
+	{ "JNLPOOLRECOVERY", "The size of the data written to the journal pool (!UL) does not match the size of the data in the journal files (!UL) at journal sequence number [0x!16 at XQ] for the replication instance file !AZ. The journal pool has been recovered.", 4 },
 	{ "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 },
@@ -1493,6 +1493,13 @@ LITDEF	err_msg merrors[] = {
 	{ "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 },
+	{ "LVMONBADVAL", "Value for local variable !AD changed inappropriately between two points for indexes !UL and !UL - expected value: !AD  actual value: !AD - Generating core", 8 },
+	{ "RESTRICTEDOP", "Attempt to perform a restricted operation: !AZ", 1 },
+	{ "RESTRICTSYNTAX", "Syntax error in file !AD at line number !UL. All facilities restricted for process.", 3 },
+	{ "MUCREFILERR", "Error in/at !AD creating database !AD (region !AD)", 6 },
+	{ "JNLBUFFPHS2SALVAGE", "Salvaged journal records from process !UL for database file !AD at transaction number [0x!16 at XQ] and journal-sequence-number/unique-token [0x!16 at XQ] with journal file starting offset [0x!XL] and length [0x!XL]", 7 },
+	{ "JNLPOOLPHS2SALVAGE", "Salvaged journal records from process !UL for replication instance file !AD at journal sequence number [0x!16 at XQ] with journal pool starting offset [0x!16 at XQ] and length [0x!XL]", 6 },
+	{ "MURNDWNARGLESS", "Argumentless MUPIP RUNDOWN started with process id !UL by userid !UL from directory !AD", 4 },
 };
 
 LITDEF	int ERR_ACK = 150372361;
@@ -1886,7 +1893,7 @@ LITDEF	int ERR_CCECCPPID = 150375459;
 LITDEF	int ERR_CCECLSTPRCS = 150375467;
 LITDEF	int ERR_ZSHOWBADFUNC = 150375474;
 LITDEF	int ERR_NOTALLJNLEN = 150375480;
-LITDEF	int ERR_UNUSEDMSG570 = 150375490;
+LITDEF	int ERR_BADLOCKNEST = 150375490;
 LITDEF	int ERR_NOLBRSRC = 150375498;
 LITDEF	int ERR_INVZSTEP = 150375506;
 LITDEF	int ERR_ZSTEPARG = 150375514;
@@ -1898,7 +1905,7 @@ LITDEF	int ERR_FILEDEL = 150375555;
 LITDEF	int ERR_JNLBADLABEL = 150375562;
 LITDEF	int ERR_JNLREADEOF = 150375570;
 LITDEF	int ERR_JNLRECFMT = 150375578;
-LITDEF	int ERR_BLKTOODEEP = 150375586;
+LITDEF	int ERR_BLKTOODEEP = 150375584;
 LITDEF	int ERR_NESTFORMP = 150375594;
 LITDEF	int ERR_BINHDR = 150375603;
 LITDEF	int ERR_GOQPREC = 150375611;
@@ -1986,7 +1993,7 @@ LITDEF	int ERR_CEBIGSKIP = 150376258;
 LITDEF	int ERR_CETOOLONG = 150376266;
 LITDEF	int ERR_CENOINDIR = 150376274;
 LITDEF	int ERR_COLLATIONUNDEF = 150376282;
-LITDEF	int ERR_UNUSEDMSG670 = 150376290;
+LITDEF	int ERR_UNUSEDMSG673 = 150376290;
 LITDEF	int ERR_GTMSECSHRSRVF = 150376298;
 LITDEF	int ERR_FREEZECTRL = 150376307;
 LITDEF	int ERR_JNLFLUSH = 150376315;
@@ -2092,7 +2099,7 @@ LITDEF	int ERR_KRNLKILL = 150377108;
 LITDEF	int ERR_MEMORYRECURSIVE = 150377116;
 LITDEF	int ERR_FREEZEID = 150377123;
 LITDEF	int ERR_BLKWRITERR = 150377131;
-LITDEF	int ERR_UNUSEDMSG776 = 150377138;
+LITDEF	int ERR_UNUSEDMSG779 = 150377138;
 LITDEF	int ERR_PINENTRYERR = 150377146;
 LITDEF	int ERR_BCKUPBUFLUSH = 150377154;
 LITDEF	int ERR_NOFORKCORE = 150377160;
@@ -2632,7 +2639,7 @@ LITDEF	int ERR_CRYPTOPFAILED = 150381426;
 LITDEF	int ERR_CRYPTDLNOOPEN = 150381434;
 LITDEF	int ERR_CRYPTNOV4 = 150381442;
 LITDEF	int ERR_CRYPTNOMM = 150381450;
-LITDEF	int ERR_UNUSEDMSG1316 = 150381458;
+LITDEF	int ERR_UNUSEDMSG1319 = 150381458;
 LITDEF	int ERR_CRYPTKEYFETCHFAILED = 150381466;
 LITDEF	int ERR_CRYPTKEYFETCHFAILEDNF = 150381474;
 LITDEF	int ERR_CRYPTHASHGENFAILED = 150381482;
@@ -2690,7 +2697,7 @@ LITDEF	int ERR_GVZTRIGFAIL = 150381890;
 LITDEF	int ERR_MUUSERLBK = 150381898;
 LITDEF	int ERR_SETINSETTRIGONLY = 150381906;
 LITDEF	int ERR_DZTRIGINTRIG = 150381914;
-LITDEF	int ERR_UNUSEDMSG1374 = 150381922;
+LITDEF	int ERR_UNUSEDMSG1377 = 150381922;
 LITDEF	int ERR_BOOLSIDEFFECT = 150381928;
 LITDEF	int ERR_DBBADUPGRDSTATE = 150381936;
 LITDEF	int ERR_WRITEWAITPID = 150381946;
@@ -2702,7 +2709,7 @@ LITDEF	int ERR_GTMSECSHRCHDIRF = 150381986;
 LITDEF	int ERR_JNLORDBFLU = 150381994;
 LITDEF	int ERR_ZCCLNUPRTNMISNG = 150382002;
 LITDEF	int ERR_ZCINVALIDKEYWORD = 150382010;
-LITDEF	int ERR_UNUSEDMSG1386 = 150382018;
+LITDEF	int ERR_UNUSEDMSG1389 = 150382018;
 LITDEF	int ERR_DBSHMNAMEDIFF = 150382026;
 LITDEF	int ERR_SHMREMOVED = 150382035;
 LITDEF	int ERR_DEVICEWRITEONLY = 150382042;
@@ -2843,7 +2850,7 @@ LITDEF	int ERR_GETADDRINFO = 150383114;
 LITDEF	int ERR_GETNAMEINFO = 150383122;
 LITDEF	int ERR_SOCKBIND = 150383130;
 LITDEF	int ERR_INSTFRZDEFER = 150383139;
-LITDEF	int ERR_UNUSEDMSG1529 = 150383146;
+LITDEF	int ERR_UNUSEDMSG1532 = 150383146;
 LITDEF	int ERR_REGOPENFAIL = 150383154;
 LITDEF	int ERR_REPLINSTNOSHM = 150383162;
 LITDEF	int ERR_DEVPARMTOOSMALL = 150383170;
@@ -2853,7 +2860,7 @@ LITDEF	int ERR_ACTCOLLMISMTCH = 150383194;
 LITDEF	int ERR_GBLNOMAPTOREG = 150383202;
 LITDEF	int ERR_ISSPANGBL = 150383210;
 LITDEF	int ERR_TPNOSUPPORT = 150383218;
-LITDEF	int ERR_UNUSEDMSG1539 = 150383226;
+LITDEF	int ERR_UNUSEDMSG1542 = 150383226;
 LITDEF	int ERR_ZATRANSERR = 150383234;
 LITDEF	int ERR_FILTERTIMEDOUT = 150383242;
 LITDEF	int ERR_TLSDLLNOOPEN = 150383250;
@@ -2975,9 +2982,16 @@ LITDEF	int ERR_STATSDBFNERR = 150384170;
 LITDEF	int ERR_JNLSWITCHRETRY = 150384179;
 LITDEF	int ERR_JNLSWITCHFAIL = 150384186;
 LITDEF	int ERR_CLISTRTOOLONG = 150384194;
+LITDEF	int ERR_LVMONBADVAL = 150384202;
+LITDEF	int ERR_RESTRICTEDOP = 150384210;
+LITDEF	int ERR_RESTRICTSYNTAX = 150384218;
+LITDEF	int ERR_MUCREFILERR = 150384226;
+LITDEF	int ERR_JNLBUFFPHS2SALVAGE = 150384235;
+LITDEF	int ERR_JNLPOOLPHS2SALVAGE = 150384243;
+LITDEF	int ERR_MURNDWNARGLESS = 150384251;
 
 GBLDEF	err_ctl merrors_ctl = {
 	246,
 	"GTM",
 	&merrors[0],
-	1480};
+	1487};
diff --git a/sr_x86_64/ttt.c b/sr_x86_64/ttt.c
index 9ed8bf7..a52c933 100644
--- a/sr_x86_64/ttt.c
+++ b/sr_x86_64/ttt.c
@@ -14,711 +14,711 @@
 #include "vxi.h"
 #include "vxt.h"
 #include "xfer_enum.h"
-LITDEF short ttt[4392] = {
+LITDEF short ttt[4391] = {
 
-/*    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};
+/*    0 */	0,0,0,0,332,3623,3096,577,
+/*    8 */	2420,3081,3111,2092,428,3573,2213,3199,
+/*   16 */	2296,2284,3806,3843,2257,2266,2338,2278,
+/*   24 */	2329,2308,2236,783,798,810,822,864,
+/*   32 */	882,903,932,962,977,992,1010,1169,
+/*   40 */	1082,1115,1148,1226,1277,1646,1679,1694,
+/*   48 */	1724,1790,1820,1844,1907,1928,1946,3638,
+/*   56 */	3660,0,0,0,0,592,0,530,
+/*   64 */	0,2078,0,3185,0,0,0,0,
+/*   72 */	0,0,364,440,2398,2404,2829,2856,
+/*   80 */	2874,2977,2915,2906,2992,3712,3796,3132,
+/*   88 */	0,3164,3265,3228,3213,3243,3587,3441,
+/*   96 */	3718,3730,3745,3769,3778,3763,3754,3474,
+/*  104 */	3839,3852,3874,3911,3923,3944,3968,4034,
+/*  112 */	0,0,3025,2380,3317,4340,671,4343,
+/*  120 */	725,2886,3283,544,553,4346,2483,2580,
+/*  128 */	2470,497,2506,2600,2245,2538,2610,4349,
+/*  136 */	2365,2356,4353,1295,4354,360,356,3465,
+/*  144 */	452,4358,4361,4364,3150,4367,4370,4373,
+/*  152 */	4376,4379,4382,3609,0,3001,2669,2647,
+/*  160 */	1607,2638,2416,2227,2952,2113,750,2942,
+/*  168 */	0,0,2435,3787,3815,1520,3739,2518,
+/*  176 */	2106,562,3935,1892,2347,1211,347,3269,
+/*  184 */	634,703,615,681,3899,1130,3867,3125,
+/*  192 */	2374,3016,3139,653,1022,2956,4385,2590,
+/*  200 */	3986,4004,4019,521,2971,3261,2039,4061,
+/*  208 */	4046,1313,3601,606,1709,1778,2553,4388,
+/*  216 */	3672,2626,759,840,3300,3827,3696,3682,
+/*  224 */	3689,3678,735,917,2493,1064,2457,1052,
+/*  232 */	2317,1037,1097,2565,1490,1433,1418,1472,
+/*  240 */	1388,1400,1445,1373,1457,1505,0,3559,
+/*  248 */	0,941,950,3420,1919,3399,2444,2528,
+/*  256 */	3051,3057,3069,3037,1250,1262,1184,1196,
+/*  264 */	1238,3650,1754,1958,0,1325,1532,1628,
+/*  272 */	3493,1661,1739,1766,1877,1856,3535,1802,
+/*  280 */	3514,2003,1544,1559,2066,4076,1985,3327,
+/*  288 */	3339,3351,3363,2865,2880,1595,461,1340,
+/*  296 */	2021,662,3375,3387,4055,4067,0,0,
+/*  304 */	0,0,3890,4091,4102,4114,4123,4137,
+/*  312 */	4150,4160,4177,4189,4198,4210,4222,4234,
+/*  320 */	4249,4261,4270,4282,4298,1973,4319,4331,
+/*  328 */	0,1577,1352,0,VXI_PUSHAB,VXT_VAL,0,VXI_PUSHAB,
+/*  336 */	VXT_VAL,2,VXI_PUSHAB,VXT_VAL,1,VXI_CALLS,VXT_LIT,3,
+/*  344 */	VXT_XFER,SIZEOF(char *) * (short int)xf_add,VXT_END,
+/*  347 */	VXT_IREPL,VXT_VAL,2,VXI_CALLS,VXT_VAL,1,VXT_XFER,SIZEOF(char *) * (short int)xf_bindparm,
+/*  355 */	VXT_END,
+/*  356 */	VXI_INCL,VXT_VAL,1,VXT_END,
+/*  360 */	VXI_CLRL,VXT_VAL,0,VXT_END,
+/*  364 */	VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_break,VXT_END,
+/*  368 */	VXI_PUSHL,VXT_VAL,2,VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_callb,VXI_BRB,VXT_JMP,
+/*  376 */	1,VXT_END,
+/*  378 */	VXI_PUSHL,VXT_VAL,2,VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_calll,VXI_JMP,VXT_JMP,
+/*  386 */	1,VXT_END,
+/*  388 */	VXI_PUSHL,VXT_VAL,2,VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_callw,VXI_BRW,VXT_JMP,
+/*  396 */	1,VXT_END,
+/*  398 */	VXI_PUSHL,VXT_VAL,2,VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_callspb,VXI_BRB,VXT_JMP,
+/*  406 */	1,VXT_END,
+/*  408 */	VXI_PUSHL,VXT_VAL,2,VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_callspl,VXI_JMP,VXT_JMP,
+/*  416 */	1,VXT_END,
+/*  418 */	VXI_PUSHL,VXT_VAL,2,VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_callspw,VXI_BRW,VXT_JMP,
+/*  426 */	1,VXT_END,
+/*  428 */	VXT_IREPAB,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,0,VXI_CALLS,VXT_VAL,
+/*  436 */	1,VXT_XFER,SIZEOF(char *) * (short int)xf_cat,VXT_END,
+/*  440 */	VXI_PUSHAB,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,1,VXI_CALLS,VXT_LIT,
+/*  448 */	2,VXT_XFER,SIZEOF(char *) * (short int)xf_close,VXT_END,
+/*  452 */	VXI_BICB2,VXT_LIT,1,VXT_REG,0x5A,VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_dt_false,
+/*  460 */	VXT_END,
+/*  461 */	VXI_PUSHAB,VXT_VAL,1,VXI_CALLS,VXT_LIT,1,VXT_XFER,SIZEOF(char *) * (short int)xf_clralsvars,
+/*  469 */	VXT_END,
+/*  470 */	VXI_TSTL,VXT_VAL,1,VXT_END,
+/*  474 */	VXI_MOVAB,VXT_VAL,1,VXT_REG,0x51,VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_mval2bool,
+/*  482 */	VXT_END,
+/*  483 */	VXI_MOVAB,VXT_VAL,1,VXT_REG,0x51,VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_mval2mint,
+/*  491 */	VXI_MOVL,VXT_REG,0x50,VXT_VAL,0,VXT_END,
+/*  497 */	VXI_PUSHL,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,1,VXI_JSB,VXT_XFER,
+/*  505 */	SIZEOF(char *) * (short int)xf_commarg,VXT_END,
+/*  507 */	VXI_MOVAB,VXT_VAL,0,VXT_REG,0x50,VXI_MOVL,VXT_VAL,1,
+/*  515 */	VXT_REG,0x51,VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_mint2mval,VXT_END,
+/*  521 */	VXI_MOVAB,VXT_VAL,1,VXT_REG,0x51,VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_mval2num,
+/*  529 */	VXT_END,
+/*  530 */	VXI_MOVAB,VXT_VAL,1,VXT_REG,0x50,VXI_MOVAB,VXT_VAL,2,
+/*  538 */	VXT_REG,0x51,VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_contain,VXT_END,
+/*  544 */	VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_currhd,VXI_MOVL,VXT_REG,0x50,VXT_VAL,0,
+/*  552 */	VXT_END,
+/*  553 */	VXI_MOVAB,VXT_VAL,0,VXT_REG,0x51,VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_currtn,
+/*  561 */	VXT_END,
+/*  562 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHAB,VXT_VAL,2,VXI_PUSHL,VXT_VAL,
+/*  570 */	1,VXI_CALLS,VXT_LIT,3,VXT_XFER,SIZEOF(char *) * (short int)xf_cvtparm,VXT_END,
+/*  577 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHAB,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,
+/*  585 */	1,VXI_CALLS,VXT_LIT,3,VXT_XFER,SIZEOF(char *) * (short int)xf_div,VXT_END,
+/*  592 */	VXI_MOVAB,VXT_VAL,2,VXT_REG,0x51,VXI_MOVAB,VXT_VAL,1,
+/*  600 */	VXT_REG,0x50,VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_equ,VXT_END,
+/*  606 */	VXI_MOVAB,VXT_VAL,1,VXT_REG,0x50,VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_equnul,
+/*  614 */	VXT_END,
+/*  615 */	VXT_IREPAB,VXT_VAL,5,VXI_PUSHL,VXT_VAL,4,VXI_PUSHL,VXT_VAL,
+/*  623 */	3,VXI_PUSHL,VXT_VAL,2,VXI_PUSHL,VXT_LIT,0,VXI_JSB,
+/*  631 */	VXT_XFER,SIZEOF(char *) * (short int)xf_exfun,VXT_END,
+/*  634 */	VXT_IREPAB,VXT_VAL,5,VXI_PUSHL,VXT_VAL,4,VXI_PUSHL,VXT_VAL,
+/*  642 */	3,VXI_PUSHL,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,0,VXI_JSB,
+/*  650 */	VXT_XFER,SIZEOF(char *) * (short int)xf_exfun,VXT_END,
+/*  653 */	VXI_PUSHAB,VXT_VAL,1,VXI_CALLS,VXT_LIT,1,VXT_XFER,SIZEOF(char *) * (short int)xf_exfunret,
+/*  661 */	VXT_END,
+/*  662 */	VXI_PUSHAB,VXT_VAL,1,VXI_CALLS,VXT_LIT,1,VXT_XFER,SIZEOF(char *) * (short int)xf_exfunretals,
+/*  670 */	VXT_END,
+/*  671 */	VXI_PUSHL,VXT_VAL,2,VXI_PUSHL,VXT_VAL,1,VXI_JSB,VXT_XFER,
+/*  679 */	SIZEOF(char *) * (short int)xf_extcall,VXT_END,
+/*  681 */	VXT_IREPAB,VXT_VAL,5,VXI_PUSHL,VXT_VAL,4,VXI_PUSHL,VXT_VAL,
+/*  689 */	3,VXI_PUSHL,VXT_LIT,0,VXI_PUSHL,VXT_VAL,2,VXI_PUSHL,
+/*  697 */	VXT_VAL,1,VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_extexfun,VXT_END,
+/*  703 */	VXT_IREPAB,VXT_VAL,5,VXI_PUSHL,VXT_VAL,4,VXI_PUSHL,VXT_VAL,
+/*  711 */	3,VXI_PUSHAB,VXT_VAL,0,VXI_PUSHL,VXT_VAL,2,VXI_PUSHL,
+/*  719 */	VXT_VAL,1,VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_extexfun,VXT_END,
+/*  725 */	VXI_PUSHL,VXT_VAL,2,VXI_PUSHL,VXT_VAL,1,VXI_JSB,VXT_XFER,
+/*  733 */	SIZEOF(char *) * (short int)xf_extjmp,VXT_END,
+/*  735 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHAB,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,
+/*  743 */	1,VXI_CALLS,VXT_LIT,3,VXT_XFER,SIZEOF(char *) * (short int)xf_exp,VXT_END,
+/*  750 */	VXT_IREPL,VXT_VAL,2,VXI_CALLS,VXT_VAL,1,VXT_XFER,SIZEOF(char *) * (short int)xf_fetch,
+/*  758 */	VXT_END,
+/*  759 */	VXT_IREPAB,VXT_VAL,6,VXI_PUSHL,VXT_VAL,5,VXI_PUSHL,VXT_VAL,
+/*  767 */	4,VXI_PUSHAB,VXT_VAL,3,VXI_PUSHAB,VXT_VAL,2,VXI_PUSHL,
+/*  775 */	VXT_LIT,0,VXI_CALLS,VXT_VAL,1,VXT_XFER,SIZEOF(char *) * (short int)xf_fnfgncal,VXT_END,
+/*  783 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHAB,VXT_VAL,1,VXI_PUSHL,VXT_VAL,
+/*  791 */	2,VXI_CALLS,VXT_LIT,3,VXT_XFER,SIZEOF(char *) * (short int)xf_fnascii,VXT_END,
+/*  798 */	VXT_IREPL,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,0,VXI_CALLS,VXT_VAL,
+/*  806 */	1,VXT_XFER,SIZEOF(char *) * (short int)xf_fnchar,VXT_END,
+/*  810 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHAB,VXT_VAL,1,VXI_CALLS,VXT_LIT,
+/*  818 */	2,VXT_XFER,SIZEOF(char *) * (short int)xf_fndata,VXT_END,
+/*  822 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHAB,VXT_VAL,1,VXI_PUSHL,VXT_VAL,
+/*  830 */	2,VXI_PUSHL,VXT_VAL,3,VXI_CALLS,VXT_LIT,4,VXT_XFER,
+/*  838 */	SIZEOF(char *) * (short int)xf_fnextract,VXT_END,
+/*  840 */	VXT_IREPAB,VXT_VAL,6,VXI_PUSHL,VXT_VAL,5,VXI_PUSHL,VXT_VAL,
+/*  848 */	4,VXI_PUSHAB,VXT_VAL,3,VXI_PUSHAB,VXT_VAL,2,VXI_PUSHAB,
+/*  856 */	VXT_VAL,0,VXI_CALLS,VXT_VAL,1,VXT_XFER,SIZEOF(char *) * (short int)xf_fnfgncal,VXT_END,
+/*  864 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHL,VXT_VAL,3,VXI_PUSHAB,VXT_VAL,
+/*  872 */	2,VXI_PUSHAB,VXT_VAL,1,VXI_CALLS,VXT_LIT,4,VXT_XFER,
+/*  880 */	SIZEOF(char *) * (short int)xf_fnfind,VXT_END,
+/*  882 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHL,VXT_VAL,4,VXI_PUSHL,VXT_VAL,
+/*  890 */	3,VXI_PUSHAB,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,1,VXI_CALLS,
+/*  898 */	VXT_LIT,5,VXT_XFER,SIZEOF(char *) * (short int)xf_fnfnumber,VXT_END,
+/*  903 */	VXI_MOVAB,VXT_VAL,1,VXT_REG,0x51,VXI_MOVAB,VXT_VAL,0,
+/*  911 */	VXT_REG,0x50,VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_fnget,VXT_END,
+/*  917 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHAB,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,
+/*  925 */	1,VXI_CALLS,VXT_LIT,3,VXT_XFER,SIZEOF(char *) * (short int)xf_fnget2,VXT_END,
+/*  932 */	VXI_PUSHAB,VXT_VAL,0,VXI_CALLS,VXT_LIT,1,VXT_XFER,SIZEOF(char *) * (short int)xf_fngvget,
+/*  940 */	VXT_END,
+/*  941 */	VXI_PUSHAB,VXT_VAL,0,VXI_CALLS,VXT_LIT,1,VXT_XFER,SIZEOF(char *) * (short int)xf_fngvget1,
+/*  949 */	VXT_END,
+/*  950 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHAB,VXT_VAL,1,VXI_CALLS,VXT_LIT,
+/*  958 */	2,VXT_XFER,SIZEOF(char *) * (short int)xf_fnget1,VXT_END,
+/*  962 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHAB,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,
+/*  970 */	1,VXI_CALLS,VXT_LIT,3,VXT_XFER,SIZEOF(char *) * (short int)xf_fnincr,VXT_END,
+/*  977 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHL,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,
+/*  985 */	1,VXI_CALLS,VXT_LIT,3,VXT_XFER,SIZEOF(char *) * (short int)xf_fnj2,VXT_END,
+/*  992 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHL,VXT_VAL,3,VXI_PUSHL,VXT_VAL,
+/* 1000 */	2,VXI_PUSHAB,VXT_VAL,1,VXI_CALLS,VXT_LIT,4,VXT_XFER,
+/* 1008 */	SIZEOF(char *) * (short int)xf_fnj3,VXT_END,
+/* 1010 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHAB,VXT_VAL,1,VXI_CALLS,VXT_LIT,
+/* 1018 */	2,VXT_XFER,SIZEOF(char *) * (short int)xf_fnlength,VXT_END,
+/* 1022 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHL,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,
+/* 1030 */	1,VXI_CALLS,VXT_LIT,3,VXT_XFER,SIZEOF(char *) * (short int)xf_fnlvname,VXT_END,
+/* 1037 */	VXI_PUSHAB,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,0,VXI_PUSHAB,VXT_VAL,
+/* 1045 */	1,VXI_CALLS,VXT_LIT,3,VXT_XFER,SIZEOF(char *) * (short int)xf_fnlvnameo2,VXT_END,
+/* 1052 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHAB,VXT_VAL,1,VXI_CALLS,VXT_LIT,
+/* 1060 */	2,VXT_XFER,SIZEOF(char *) * (short int)xf_fnlvprvname,VXT_END,
+/* 1064 */	VXT_IREPAB,VXT_VAL,4,VXI_PUSHAB,VXT_VAL,1,VXI_PUSHL,VXT_VAL,
+/* 1072 */	3,VXI_PUSHAB,VXT_VAL,0,VXI_CALLS,VXT_VAL,2,VXT_XFER,
+/* 1080 */	SIZEOF(char *) * (short int)xf_fnname,VXT_END,
+/* 1082 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHAB,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,
+/* 1090 */	1,VXI_CALLS,VXT_LIT,3,VXT_XFER,SIZEOF(char *) * (short int)xf_fnnext,VXT_END,
+/* 1097 */	VXI_PUSHAB,VXT_VAL,3,VXI_PUSHAB,VXT_VAL,0,VXI_PUSHAB,VXT_VAL,
+/* 1105 */	2,VXI_PUSHAB,VXT_VAL,1,VXI_CALLS,VXT_LIT,4,VXT_XFER,
+/* 1113 */	SIZEOF(char *) * (short int)xf_fno2,VXT_END,
+/* 1115 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHAB,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,
+/* 1123 */	1,VXI_CALLS,VXT_LIT,3,VXT_XFER,SIZEOF(char *) * (short int)xf_fnorder,VXT_END,
+/* 1130 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHL,VXT_VAL,3,VXI_PUSHL,VXT_VAL,
+/* 1138 */	2,VXI_PUSHAB,VXT_VAL,1,VXI_CALLS,VXT_LIT,4,VXT_XFER,
+/* 1146 */	SIZEOF(char *) * (short int)xf_fnp1,VXT_END,
+/* 1148 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHL,VXT_VAL,4,VXI_PUSHL,VXT_VAL,
+/* 1156 */	3,VXI_PUSHAB,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,1,VXI_CALLS,
+/* 1164 */	VXT_LIT,5,VXT_XFER,SIZEOF(char *) * (short int)xf_fnpiece,VXT_END,
+/* 1169 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHAB,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,
+/* 1177 */	1,VXI_CALLS,VXT_LIT,3,VXT_XFER,SIZEOF(char *) * (short int)xf_fnpopulation,VXT_END,
+/* 1184 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHAB,VXT_VAL,1,VXI_CALLS,VXT_LIT,
+/* 1192 */	2,VXT_XFER,SIZEOF(char *) * (short int)xf_fnqlength,VXT_END,
+/* 1196 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHL,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,
+/* 1204 */	1,VXI_CALLS,VXT_LIT,3,VXT_XFER,SIZEOF(char *) * (short int)xf_fnqsubscript,VXT_END,
+/* 1211 */	VXT_IREPAB,VXT_VAL,3,VXI_PUSHAB,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,
+/* 1219 */	0,VXI_CALLS,VXT_VAL,1,VXT_XFER,SIZEOF(char *) * (short int)xf_fnquery,VXT_END,
+/* 1226 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHL,VXT_VAL,1,VXI_CALLS,VXT_LIT,
+/* 1234 */	2,VXT_XFER,SIZEOF(char *) * (short int)xf_fnrandom,VXT_END,
+/* 1238 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHAB,VXT_VAL,1,VXI_CALLS,VXT_LIT,
+/* 1246 */	2,VXT_XFER,SIZEOF(char *) * (short int)xf_fnreverse,VXT_END,
+/* 1250 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHL,VXT_VAL,1,VXI_CALLS,VXT_LIT,
+/* 1258 */	2,VXT_XFER,SIZEOF(char *) * (short int)xf_fnstack1,VXT_END,
+/* 1262 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHAB,VXT_VAL,2,VXI_PUSHL,VXT_VAL,
+/* 1270 */	1,VXI_CALLS,VXT_LIT,3,VXT_XFER,SIZEOF(char *) * (short int)xf_fnstack2,VXT_END,
+/* 1277 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHAB,VXT_VAL,3,VXI_PUSHL,VXT_VAL,
+/* 1285 */	2,VXI_PUSHAB,VXT_VAL,1,VXI_CALLS,VXT_LIT,4,VXT_XFER,
+/* 1293 */	SIZEOF(char *) * (short int)xf_fntext,VXT_END,
+/* 1295 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHAB,VXT_VAL,3,VXI_PUSHAB,VXT_VAL,
+/* 1303 */	2,VXI_PUSHAB,VXT_VAL,1,VXI_CALLS,VXT_LIT,4,VXT_XFER,
+/* 1311 */	SIZEOF(char *) * (short int)xf_fntranslate,VXT_END,
+/* 1313 */	VXT_IREPAB,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,0,VXI_CALLS,VXT_VAL,
+/* 1321 */	1,VXT_XFER,SIZEOF(char *) * (short int)xf_fnview,VXT_END,
+/* 1325 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHAB,VXT_VAL,1,VXI_PUSHL,VXT_VAL,
+/* 1333 */	2,VXI_CALLS,VXT_LIT,3,VXT_XFER,SIZEOF(char *) * (short int)xf_fnzascii,VXT_END,
+/* 1340 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHAB,VXT_VAL,1,VXI_CALLS,VXT_LIT,
+/* 1348 */	2,VXT_XFER,SIZEOF(char *) * (short int)xf_fnzahandle,VXT_END,
+/* 1352 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHL,VXT_VAL,4,VXI_PUSHL,VXT_VAL,
+/* 1360 */	3,VXI_PUSHL,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,1,VXI_CALLS,
+/* 1368 */	VXT_LIT,5,VXT_XFER,SIZEOF(char *) * (short int)xf_fnzatransform,VXT_END,
+/* 1373 */	VXI_PUSHAB,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,1,VXI_PUSHAB,VXT_VAL,
+/* 1381 */	0,VXI_CALLS,VXT_LIT,3,VXT_XFER,SIZEOF(char *) * (short int)xf_fnzbitand,VXT_END,
+/* 1388 */	VXI_PUSHAB,VXT_VAL,1,VXI_PUSHAB,VXT_VAL,0,VXI_CALLS,VXT_LIT,
+/* 1396 */	2,VXT_XFER,SIZEOF(char *) * (short int)xf_fnzbitcoun,VXT_END,
+/* 1400 */	VXI_PUSHL,VXT_VAL,3,VXI_PUSHL,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,
+/* 1408 */	1,VXI_PUSHAB,VXT_VAL,0,VXI_CALLS,VXT_LIT,4,VXT_XFER,
+/* 1416 */	SIZEOF(char *) * (short int)xf_fnzbitfind,VXT_END,
+/* 1418 */	VXI_PUSHL,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,1,VXI_PUSHAB,VXT_VAL,
+/* 1426 */	0,VXI_CALLS,VXT_LIT,3,VXT_XFER,SIZEOF(char *) * (short int)xf_fnzbitget,VXT_END,
+/* 1433 */	VXI_PUSHAB,VXT_VAL,1,VXI_PUSHAB,VXT_VAL,0,VXI_CALLS,VXT_LIT,
+/* 1441 */	2,VXT_XFER,SIZEOF(char *) * (short int)xf_fnzbitlen,VXT_END,
+/* 1445 */	VXI_PUSHAB,VXT_VAL,1,VXI_PUSHAB,VXT_VAL,0,VXI_CALLS,VXT_LIT,
+/* 1453 */	2,VXT_XFER,SIZEOF(char *) * (short int)xf_fnzbitnot,VXT_END,
+/* 1457 */	VXI_PUSHAB,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,1,VXI_PUSHAB,VXT_VAL,
+/* 1465 */	0,VXI_CALLS,VXT_LIT,3,VXT_XFER,SIZEOF(char *) * (short int)xf_fnzbitor,VXT_END,
+/* 1472 */	VXI_PUSHL,VXT_VAL,3,VXI_PUSHL,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,
+/* 1480 */	1,VXI_PUSHAB,VXT_VAL,0,VXI_CALLS,VXT_LIT,4,VXT_XFER,
+/* 1488 */	SIZEOF(char *) * (short int)xf_fnzbitset,VXT_END,
+/* 1490 */	VXI_PUSHL,VXT_VAL,2,VXI_PUSHL,VXT_VAL,1,VXI_PUSHAB,VXT_VAL,
+/* 1498 */	0,VXI_CALLS,VXT_LIT,3,VXT_XFER,SIZEOF(char *) * (short int)xf_fnzbitstr,VXT_END,
+/* 1505 */	VXI_PUSHAB,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,1,VXI_PUSHAB,VXT_VAL,
+/* 1513 */	0,VXI_CALLS,VXT_LIT,3,VXT_XFER,SIZEOF(char *) * (short int)xf_fnzbitxor,VXT_END,
+/* 1520 */	VXT_IREPAB,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,0,VXI_CALLS,VXT_VAL,
+/* 1528 */	1,VXT_XFER,SIZEOF(char *) * (short int)xf_fnzcall,VXT_END,
+/* 1532 */	VXT_IREPL,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,0,VXI_CALLS,VXT_VAL,
+/* 1540 */	1,VXT_XFER,SIZEOF(char *) * (short int)xf_fnzchar,VXT_END,
+/* 1544 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHAB,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,
+/* 1552 */	1,VXI_CALLS,VXT_LIT,3,VXT_XFER,SIZEOF(char *) * (short int)xf_fnzconvert2,VXT_END,
+/* 1559 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHAB,VXT_VAL,3,VXI_PUSHAB,VXT_VAL,
+/* 1567 */	2,VXI_PUSHAB,VXT_VAL,1,VXI_CALLS,VXT_LIT,4,VXT_XFER,
+/* 1575 */	SIZEOF(char *) * (short int)xf_fnzconvert3,VXT_END,
+/* 1577 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHL,VXT_VAL,3,VXI_PUSHL,VXT_VAL,
+/* 1585 */	2,VXI_PUSHAB,VXT_VAL,1,VXI_CALLS,VXT_LIT,4,VXT_XFER,
+/* 1593 */	SIZEOF(char *) * (short int)xf_fnzcollate,VXT_END,
+/* 1595 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHAB,VXT_VAL,1,VXI_CALLS,VXT_LIT,
+/* 1603 */	2,VXT_XFER,SIZEOF(char *) * (short int)xf_fnzdata,VXT_END,
+/* 1607 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHAB,VXT_VAL,4,VXI_PUSHAB,VXT_VAL,
+/* 1615 */	3,VXI_PUSHAB,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,1,VXI_CALLS,
+/* 1623 */	VXT_LIT,5,VXT_XFER,SIZEOF(char *) * (short int)xf_fnzdate,VXT_END,
+/* 1628 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHAB,VXT_VAL,1,VXI_PUSHL,VXT_VAL,
+/* 1636 */	2,VXI_PUSHL,VXT_VAL,3,VXI_CALLS,VXT_LIT,4,VXT_XFER,
+/* 1644 */	SIZEOF(char *) * (short int)xf_fnzextract,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_PUSHL,VXT_VAL,3,VXI_PUSHAB,VXT_VAL,
+/* 1669 */	2,VXI_PUSHAB,VXT_VAL,1,VXI_CALLS,VXT_LIT,4,VXT_XFER,
+/* 1677 */	SIZEOF(char *) * (short int)xf_fnzfind,VXT_END,
+/* 1679 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHAB,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,
+/* 1687 */	1,VXI_CALLS,VXT_LIT,3,VXT_XFER,SIZEOF(char *) * (short int)xf_fngetdvi,VXT_END,
+/* 1694 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHAB,VXT_VAL,2,VXI_PUSHL,VXT_VAL,
+/* 1702 */	1,VXI_CALLS,VXT_LIT,3,VXT_XFER,SIZEOF(char *) * (short int)xf_fngetjpi,VXT_END,
+/* 1709 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHAB,VXT_VAL,2,VXI_PUSHL,VXT_VAL,
+/* 1717 */	1,VXI_CALLS,VXT_LIT,3,VXT_XFER,SIZEOF(char *) * (short int)xf_fngetlki,VXT_END,
+/* 1724 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHAB,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,
+/* 1732 */	1,VXI_CALLS,VXT_LIT,3,VXT_XFER,SIZEOF(char *) * (short int)xf_fngetsyi,VXT_END,
+/* 1739 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHL,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,
+/* 1747 */	1,VXI_CALLS,VXT_LIT,3,VXT_XFER,SIZEOF(char *) * (short int)xf_fnzj2,VXT_END,
+/* 1754 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHAB,VXT_VAL,1,VXI_CALLS,VXT_LIT,
+/* 1762 */	2,VXT_XFER,SIZEOF(char *) * (short int)xf_fnzjobexam,VXT_END,
+/* 1766 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHAB,VXT_VAL,1,VXI_CALLS,VXT_LIT,
+/* 1774 */	2,VXT_XFER,SIZEOF(char *) * (short int)xf_fnzlength,VXT_END,
+/* 1778 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHL,VXT_VAL,1,VXI_CALLS,VXT_LIT,
+/* 1786 */	2,VXT_XFER,SIZEOF(char *) * (short int)xf_fnzlkid,VXT_END,
+/* 1790 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHL,VXT_VAL,1,VXI_CALLS,VXT_LIT,
+/* 1798 */	2,VXT_XFER,SIZEOF(char *) * (short int)xf_fnzm,VXT_END,
+/* 1802 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHL,VXT_VAL,3,VXI_PUSHL,VXT_VAL,
+/* 1810 */	2,VXI_PUSHAB,VXT_VAL,1,VXI_CALLS,VXT_LIT,4,VXT_XFER,
+/* 1818 */	SIZEOF(char *) * (short int)xf_fnzp1,VXT_END,
+/* 1820 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHAB,VXT_VAL,5,VXI_PUSHAB,VXT_VAL,
+/* 1828 */	4,VXI_PUSHAB,VXT_VAL,3,VXI_PUSHAB,VXT_VAL,2,VXI_PUSHAB,
+/* 1836 */	VXT_VAL,1,VXI_CALLS,VXT_LIT,6,VXT_XFER,SIZEOF(char *) * (short int)xf_fnzparse,VXT_END,
+/* 1844 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHL,VXT_VAL,1,VXI_CALLS,VXT_LIT,
+/* 1852 */	2,VXT_XFER,SIZEOF(char *) * (short int)xf_fnzpid,VXT_END,
+/* 1856 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHL,VXT_VAL,4,VXI_PUSHL,VXT_VAL,
+/* 1864 */	3,VXI_PUSHAB,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,1,VXI_CALLS,
+/* 1872 */	VXT_LIT,5,VXT_XFER,SIZEOF(char *) * (short int)xf_fnzpiece,VXT_END,
+/* 1877 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHAB,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,
+/* 1885 */	1,VXI_CALLS,VXT_LIT,3,VXT_XFER,SIZEOF(char *) * (short int)xf_fnzpopulation,VXT_END,
+/* 1892 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHAB,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,
+/* 1900 */	1,VXI_CALLS,VXT_LIT,3,VXT_XFER,SIZEOF(char *) * (short int)xf_fnzprevious,VXT_END,
+/* 1907 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHAB,VXT_VAL,1,VXI_CALLS,VXT_LIT,
+/* 1915 */	2,VXT_XFER,SIZEOF(char *) * (short int)xf_fnzpriv,VXT_END,
+/* 1919 */	VXI_PUSHAB,VXT_VAL,0,VXI_CALLS,VXT_LIT,1,VXT_XFER,SIZEOF(char *) * (short int)xf_fnzqgblmod,
+/* 1927 */	VXT_END,
+/* 1928 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHL,VXT_VAL,3,VXI_PUSHL,VXT_VAL,
+/* 1936 */	2,VXI_PUSHAB,VXT_VAL,1,VXI_CALLS,VXT_LIT,4,VXT_XFER,
+/* 1944 */	SIZEOF(char *) * (short int)xf_fnzsearch,VXT_END,
+/* 1946 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHAB,VXT_VAL,1,VXI_CALLS,VXT_LIT,
+/* 1954 */	2,VXT_XFER,SIZEOF(char *) * (short int)xf_fnzsetprv,VXT_END,
+/* 1958 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHL,VXT_VAL,2,VXI_PUSHL,VXT_VAL,
+/* 1966 */	1,VXI_CALLS,VXT_LIT,3,VXT_XFER,SIZEOF(char *) * (short int)xf_fnzsigproc,VXT_END,
+/* 1973 */	VXT_IREPAB,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,0,VXI_CALLS,VXT_VAL,
+/* 1981 */	1,VXT_XFER,SIZEOF(char *) * (short int)xf_fnzsocket,VXT_END,
+/* 1985 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHL,VXT_VAL,3,VXI_PUSHL,VXT_VAL,
+/* 1993 */	2,VXI_PUSHAB,VXT_VAL,1,VXI_CALLS,VXT_LIT,4,VXT_XFER,
+/* 2001 */	SIZEOF(char *) * (short int)xf_fnzsubstr,VXT_END,
+/* 2003 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHAB,VXT_VAL,3,VXI_PUSHAB,VXT_VAL,
+/* 2011 */	2,VXI_PUSHAB,VXT_VAL,1,VXI_CALLS,VXT_LIT,4,VXT_XFER,
+/* 2019 */	SIZEOF(char *) * (short int)xf_fnztranslate,VXT_END,
+/* 2021 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHAB,VXT_VAL,3,VXI_PUSHAB,VXT_VAL,
+/* 2029 */	2,VXI_PUSHAB,VXT_VAL,1,VXI_CALLS,VXT_LIT,4,VXT_XFER,
+/* 2037 */	SIZEOF(char *) * (short int)xf_fnztrigger,VXT_END,
+/* 2039 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHAB,VXT_VAL,6,VXI_PUSHAB,VXT_VAL,
+/* 2047 */	5,VXI_PUSHAB,VXT_VAL,4,VXI_PUSHL,VXT_VAL,3,VXI_PUSHAB,
+/* 2055 */	VXT_VAL,2,VXI_PUSHAB,VXT_VAL,1,VXI_CALLS,VXT_LIT,7,
+/* 2063 */	VXT_XFER,SIZEOF(char *) * (short int)xf_fnztrnlnm,VXT_END,
+/* 2066 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHAB,VXT_VAL,1,VXI_CALLS,VXT_LIT,
+/* 2074 */	2,VXT_XFER,SIZEOF(char *) * (short int)xf_fnzwidth,VXT_END,
+/* 2078 */	VXI_MOVAB,VXT_VAL,1,VXT_REG,0x50,VXI_MOVAB,VXT_VAL,2,
+/* 2086 */	VXT_REG,0x51,VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_follow,VXT_END,
+/* 2092 */	VXI_MOVAB,VXT_VAL,0,VXT_REG,0x50,VXI_MOVAB,VXT_VAL,1,
+/* 2100 */	VXT_REG,0x51,VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_forcenum,VXT_END,
+/* 2106 */	VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_restartpc,VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_forchk1,VXT_END,
+/* 2113 */	VXI_PUSHAB,VXT_VAL,3,VXI_PUSHAB,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,
+/* 2121 */	1,VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_forinit,VXT_END,
+/* 2126 */	VXI_PUSHL,VXT_VAL,2,VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_forlcldob,VXI_BRB,VXT_JMP,
+/* 2134 */	1,VXT_END,
+/* 2136 */	VXI_PUSHL,VXT_VAL,2,VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_forlcldol,VXI_JMP,VXT_JMP,
+/* 2144 */	1,VXT_END,
+/* 2146 */	VXI_PUSHL,VXT_VAL,2,VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_forlcldow,VXI_BRW,VXT_JMP,
+/* 2154 */	1,VXT_END,
+/* 2156 */	VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_restartpc,VXI_PUSHAB,VXT_JMP,1,VXI_PUSHAB,VXT_VAL,
+/* 2164 */	4,VXI_PUSHAB,VXT_VAL,3,VXI_PUSHAB,VXT_VAL,2,VXI_JSB,
+/* 2172 */	VXT_XFER,SIZEOF(char *) * (short int)xf_forloop,VXT_END,
+/* 2175 */	VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_restartpc,VXI_PUSHAB,VXT_JMP,1,VXI_PUSHAB,VXT_VAL,
+/* 2183 */	4,VXI_PUSHAB,VXT_VAL,3,VXI_PUSHAB,VXT_VAL,2,VXI_JSB,
+/* 2191 */	VXT_XFER,SIZEOF(char *) * (short int)xf_forloop,VXT_END,
+/* 2194 */	VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_restartpc,VXI_PUSHAB,VXT_JMP,1,VXI_PUSHAB,VXT_VAL,
+/* 2202 */	4,VXI_PUSHAB,VXT_VAL,3,VXI_PUSHAB,VXT_VAL,2,VXI_JSB,
+/* 2210 */	VXT_XFER,SIZEOF(char *) * (short int)xf_forloop,VXT_END,
+/* 2213 */	VXT_IREPAB,VXT_VAL,2,VXI_CALLS,VXT_VAL,1,VXT_XFER,SIZEOF(char *) * (short int)xf_getindx,
+/* 2221 */	VXI_MOVL,VXT_REG,0x50,VXT_ADDR,0,VXT_END,
+/* 2227 */	VXI_MOVAB,VXT_VAL,0,VXT_REG,0x51,VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_gettruth,
+/* 2235 */	VXT_END,
+/* 2236 */	VXI_PUSHAB,VXT_VAL,0,VXI_CALLS,VXT_LIT,1,VXT_XFER,SIZEOF(char *) * (short int)xf_gvdata,
+/* 2244 */	VXT_END,
+/* 2245 */	VXT_IREPAB,VXT_VAL,3,VXI_PUSHL,VXT_VAL,2,VXI_CALLS,VXT_VAL,
+/* 2253 */	1,VXT_XFER,SIZEOF(char *) * (short int)xf_gvextnam,VXT_END,
+/* 2257 */	VXI_PUSHAB,VXT_VAL,0,VXI_CALLS,VXT_LIT,1,VXT_XFER,SIZEOF(char *) * (short int)xf_gvget,
+/* 2265 */	VXT_END,
+/* 2266 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHAB,VXT_VAL,2,VXI_CALLS,VXT_LIT,
+/* 2274 */	2,VXT_XFER,SIZEOF(char *) * (short int)xf_gvincr,VXT_END,
+/* 2278 */	VXI_CALLS,VXT_LIT,0,VXT_XFER,SIZEOF(char *) * (short int)xf_gvkill,VXT_END,
+/* 2284 */	VXT_IREPAB,VXT_VAL,3,VXI_PUSHL,VXT_VAL,2,VXI_CALLS,VXT_VAL,
+/* 2292 */	1,VXT_XFER,SIZEOF(char *) * (short int)xf_gvnaked,VXT_END,
+/* 2296 */	VXT_IREPAB,VXT_VAL,3,VXI_PUSHL,VXT_VAL,2,VXI_CALLS,VXT_VAL,
+/* 2304 */	1,VXT_XFER,SIZEOF(char *) * (short int)xf_gvname,VXT_END,
+/* 2308 */	VXI_PUSHAB,VXT_VAL,0,VXI_CALLS,VXT_LIT,1,VXT_XFER,SIZEOF(char *) * (short int)xf_gvnext,
+/* 2316 */	VXT_END,
+/* 2317 */	VXI_PUSHAB,VXT_VAL,1,VXI_PUSHAB,VXT_VAL,0,VXI_CALLS,VXT_LIT,
+/* 2325 */	2,VXT_XFER,SIZEOF(char *) * (short int)xf_gvo2,VXT_END,
+/* 2329 */	VXI_PUSHAB,VXT_VAL,0,VXI_CALLS,VXT_LIT,1,VXT_XFER,SIZEOF(char *) * (short int)xf_gvorder,
+/* 2337 */	VXT_END,
+/* 2338 */	VXI_PUSHAB,VXT_VAL,1,VXI_CALLS,VXT_LIT,1,VXT_XFER,SIZEOF(char *) * (short int)xf_gvput,
+/* 2346 */	VXT_END,
+/* 2347 */	VXI_PUSHAB,VXT_VAL,0,VXI_CALLS,VXT_LIT,1,VXT_XFER,SIZEOF(char *) * (short int)xf_gvquery,
+/* 2355 */	VXT_END,
+/* 2356 */	VXI_PUSHAB,VXT_VAL,1,VXI_CALLS,VXT_LIT,1,VXT_XFER,SIZEOF(char *) * (short int)xf_gvrectarg,
+/* 2364 */	VXT_END,
+/* 2365 */	VXI_PUSHAB,VXT_VAL,0,VXI_CALLS,VXT_LIT,1,VXT_XFER,SIZEOF(char *) * (short int)xf_gvsavtarg,
+/* 2373 */	VXT_END,
+/* 2374 */	VXI_CALLS,VXT_LIT,0,VXT_XFER,SIZEOF(char *) * (short int)xf_gvzwithdraw,VXT_END,
+/* 2380 */	VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_restartpc,VXT_IREPAB,VXT_VAL,4,VXI_PUSHL,VXT_VAL,
+/* 2388 */	3,VXI_PUSHL,VXT_VAL,2,VXI_CALLS,VXT_VAL,1,VXT_XFER,
+/* 2396 */	SIZEOF(char *) * (short int)xf_gvzwrite,VXT_END,
+/* 2398 */	VXI_CALLS,VXT_LIT,0,VXT_XFER,SIZEOF(char *) * (short int)xf_halt,VXT_END,
+/* 2404 */	VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_restartpc,VXI_PUSHAB,VXT_VAL,1,VXI_CALLS,VXT_LIT,
+/* 2412 */	1,VXT_XFER,SIZEOF(char *) * (short int)xf_hang,VXT_END,
+/* 2416 */	VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_hardret,VXT_END,
+/* 2420 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHAB,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,
+/* 2428 */	1,VXI_CALLS,VXT_LIT,3,VXT_XFER,SIZEOF(char *) * (short int)xf_idiv,VXT_END,
+/* 2435 */	VXI_PUSHAB,VXT_VAL,0,VXI_CALLS,VXT_LIT,1,VXT_XFER,SIZEOF(char *) * (short int)xf_igetsrc,
+/* 2443 */	VXT_END,
+/* 2444 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHL,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,
+/* 2452 */	1,VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_inddevparms,VXT_END,
+/* 2457 */	VXI_PUSHAB,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,1,VXI_PUSHAB,VXT_VAL,
+/* 2465 */	0,VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_indfnname,VXT_END,
+/* 2470 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHL,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,
+/* 2478 */	1,VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_indfun,VXT_END,
+/* 2483 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHAB,VXT_VAL,1,VXI_JSB,VXT_XFER,
+/* 2491 */	SIZEOF(char *) * (short int)xf_indglvn,VXT_END,
+/* 2493 */	VXI_PUSHAB,VXT_VAL,1,VXI_PUSHAB,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,
+/* 2501 */	0,VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_indincr,VXT_END,
+/* 2506 */	VXI_PUSHAB,VXT_VAL,1,VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_indlvadr,VXI_MOVL,VXT_REG,
+/* 2514 */	0x50,VXT_ADDR,0,VXT_END,
+/* 2518 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHAB,VXT_VAL,1,VXI_JSB,VXT_XFER,
+/* 2526 */	SIZEOF(char *) * (short int)xf_indlvarg,VXT_END,
+/* 2528 */	VXI_PUSHAB,VXT_VAL,1,VXI_PUSHAB,VXT_VAL,2,VXI_JSB,VXT_XFER,
+/* 2536 */	SIZEOF(char *) * (short int)xf_indmerge,VXT_END,
+/* 2538 */	VXI_PUSHAB,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,1,VXI_PUSHAB,VXT_VAL,
+/* 2546 */	0,VXI_CALLS,VXT_LIT,3,VXT_XFER,SIZEOF(char *) * (short int)xf_indname,VXT_END,
+/* 2553 */	VXI_PUSHAB,VXT_VAL,1,VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_indlvnamadr,VXI_MOVL,VXT_REG,
+/* 2561 */	0x50,VXT_ADDR,0,VXT_END,
+/* 2565 */	VXI_PUSHAB,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,1,VXI_PUSHAB,VXT_VAL,
+/* 2573 */	0,VXI_CALLS,VXT_LIT,3,VXT_XFER,SIZEOF(char *) * (short int)xf_indo2,VXT_END,
+/* 2580 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHAB,VXT_VAL,1,VXI_JSB,VXT_XFER,
+/* 2588 */	SIZEOF(char *) * (short int)xf_indpat,VXT_END,
+/* 2590 */	VXI_PUSHAB,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,1,VXI_JSB,VXT_XFER,
+/* 2598 */	SIZEOF(char *) * (short int)xf_indrzshow,VXT_END,
+/* 2600 */	VXI_PUSHAB,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,1,VXI_JSB,VXT_XFER,
+/* 2608 */	SIZEOF(char *) * (short int)xf_indset,VXT_END,
+/* 2610 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHAB,VXT_VAL,3,VXI_PUSHL,VXT_VAL,
+/* 2618 */	2,VXI_PUSHAB,VXT_VAL,1,VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_indtext,VXT_END,
+/* 2626 */	VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_restartpc,VXT_IREPAB,VXT_VAL,2,VXI_CALLS,VXT_VAL,
+/* 2634 */	1,VXT_XFER,SIZEOF(char *) * (short int)xf_iocontrol,VXT_END,
+/* 2638 */	VXI_MOVAB,VXT_VAL,1,VXT_REG,0x51,VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_iretmvad,
+/* 2646 */	VXT_END,
+/* 2647 */	VXI_PUSHAB,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,1,VXI_JSB,VXT_XFER,
+/* 2655 */	SIZEOF(char *) * (short int)xf_iretmval,VXT_END,
+/* 2657 */	VXI_BRB,VXT_JMP,1,VXT_END,
+/* 2661 */	VXI_JMP,VXT_JMP,1,VXT_END,
+/* 2665 */	VXI_BRW,VXT_JMP,1,VXT_END,
+/* 2669 */	VXI_JMP,VXT_VAL,1,VXT_END,
+/* 2673 */	VXI_BEQL,VXT_JMP,1,VXT_END,
+/* 2677 */	VXI_BNEQ,VXT_LIT,6,VXI_JMP,VXT_JMP,1,VXT_END,
+/* 2684 */	VXI_BNEQ,VXT_LIT,3,VXI_BRW,VXT_JMP,1,VXT_END,
+/* 2691 */	VXI_BGEQ,VXT_JMP,1,VXT_END,
+/* 2695 */	VXI_BLSS,VXT_LIT,6,VXI_JMP,VXT_JMP,1,VXT_END,
+/* 2702 */	VXI_BLSS,VXT_LIT,3,VXI_BRW,VXT_JMP,1,VXT_END,
+/* 2709 */	VXI_BGTR,VXT_JMP,1,VXT_END,
+/* 2713 */	VXI_BLEQ,VXT_LIT,6,VXI_JMP,VXT_JMP,1,VXT_END,
+/* 2720 */	VXI_BLEQ,VXT_LIT,3,VXI_BRW,VXT_JMP,1,VXT_END,
+/* 2727 */	VXI_BLEQ,VXT_JMP,1,VXT_END,
+/* 2731 */	VXI_BGTR,VXT_LIT,6,VXI_JMP,VXT_JMP,1,VXT_END,
+/* 2738 */	VXI_BGTR,VXT_LIT,3,VXI_BRW,VXT_JMP,1,VXT_END,
+/* 2745 */	VXI_BLSS,VXT_JMP,1,VXT_END,
+/* 2749 */	VXI_BGEQ,VXT_LIT,6,VXI_JMP,VXT_JMP,1,VXT_END,
+/* 2756 */	VXI_BGEQ,VXT_LIT,3,VXI_BRW,VXT_JMP,1,VXT_END,
+/* 2763 */	VXI_BNEQ,VXT_JMP,1,VXT_END,
+/* 2767 */	VXI_BNEQ,VXT_LIT,6,VXI_JMP,VXT_JMP,1,VXT_END,
+/* 2774 */	VXI_BEQL,VXT_LIT,3,VXI_BRW,VXT_JMP,1,VXT_END,
+/* 2781 */	VXI_BLBC,VXT_REG,0x5A,VXT_JMP,1,VXT_END,
+/* 2787 */	VXI_BLBS,VXT_REG,0x5A,VXT_LIT,6,VXI_JMP,VXT_JMP,1,
+/* 2795 */	VXT_END,
+/* 2796 */	VXI_BLBS,VXT_REG,0x5A,VXT_LIT,3,VXI_BRW,VXT_JMP,1,
+/* 2804 */	VXT_END,
+/* 2805 */	VXI_BLBS,VXT_REG,0x5A,VXT_JMP,1,VXT_END,
+/* 2811 */	VXI_BLBC,VXT_REG,0x5A,VXT_LIT,6,VXI_JMP,VXT_JMP,1,
+/* 2819 */	VXT_END,
+/* 2820 */	VXI_BLBC,VXT_REG,0x5A,VXT_LIT,3,VXI_BRW,VXT_JMP,1,
+/* 2828 */	VXT_END,
+/* 2829 */	VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_restartpc,VXT_IREPAB,VXT_VAL,7,VXI_PUSHAB,VXT_VAL,
+/* 2837 */	6,VXI_PUSHAB,VXT_VAL,5,VXI_PUSHAB,VXT_VAL,4,VXI_PUSHL,
+/* 2845 */	VXT_VAL,3,VXI_PUSHAB,VXT_VAL,2,VXI_CALLS,VXT_VAL,1,
+/* 2853 */	VXT_XFER,SIZEOF(char *) * (short int)xf_job,VXT_END,
+/* 2856 */	VXI_PUSHAB,VXT_VAL,1,VXI_CALLS,VXT_LIT,1,VXT_XFER,SIZEOF(char *) * (short int)xf_kill,
+/* 2864 */	VXT_END,
+/* 2865 */	VXI_PUSHL,VXT_VAL,1,VXI_CALLS,VXT_LIT,1,VXT_XFER,SIZEOF(char *) * (short int)xf_killalias,
+/* 2873 */	VXT_END,
+/* 2874 */	VXI_CALLS,VXT_LIT,0,VXT_XFER,SIZEOF(char *) * (short int)xf_killall,VXT_END,
+/* 2880 */	VXI_CALLS,VXT_LIT,0,VXT_XFER,SIZEOF(char *) * (short int)xf_killaliasall,VXT_END,
+/* 2886 */	VXI_PUSHL,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,1,VXI_PUSHL,VXT_VAL,
+/* 2894 */	3,VXI_CALLS,VXT_LIT,3,VXT_XFER,SIZEOF(char *) * (short int)xf_labaddr,VXI_MOVL,VXT_REG,
+/* 2902 */	0x50,VXT_VAL,0,VXT_END,
+/* 2906 */	VXI_PUSHAB,VXT_VAL,1,VXI_CALLS,VXT_LIT,1,VXT_XFER,SIZEOF(char *) * (short int)xf_lckdecr,
+/* 2914 */	VXT_END,
+/* 2915 */	VXI_PUSHAB,VXT_VAL,1,VXI_CALLS,VXT_LIT,1,VXT_XFER,SIZEOF(char *) * (short int)xf_lckincr,
+/* 2923 */	VXT_END,
+/* 2924 */	VXI_MOVAB,VXT_JMP,1,VXT_ADDR,0,VXT_END,
+/* 2930 */	VXI_MOVAB,VXT_JMP,1,VXT_ADDR,0,VXT_END,
+/* 2936 */	VXI_MOVAB,VXT_JMP,1,VXT_ADDR,0,VXT_END,
+/* 2942 */	VXT_IREPL,VXT_VAL,2,VXI_PUSHL,VXT_VAL,1,VXI_JSB,VXT_XFER,
+/* 2950 */	SIZEOF(char *) * (short int)xf_linefetch,VXT_END,
+/* 2952 */	VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_linestart,VXT_END,
+/* 2956 */	VXT_IREPAB,VXT_VAL,4,VXI_PUSHAB,VXT_VAL,3,VXI_PUSHAB,VXT_VAL,
+/* 2964 */	2,VXI_CALLS,VXT_VAL,1,VXT_XFER,SIZEOF(char *) * (short int)xf_lkname,VXT_END,
+/* 2971 */	VXI_CALLS,VXT_LIT,0,VXT_XFER,SIZEOF(char *) * (short int)xf_lkinit,VXT_END,
+/* 2977 */	VXT_IREPAB,VXT_VAL,4,VXI_PUSHAB,VXT_VAL,3,VXI_PUSHL,VXT_VAL,
+/* 2985 */	2,VXI_CALLS,VXT_VAL,1,VXT_XFER,SIZEOF(char *) * (short int)xf_lkname,VXT_END,
+/* 2992 */	VXI_PUSHAB,VXT_VAL,1,VXI_CALLS,VXT_LIT,1,VXT_XFER,SIZEOF(char *) * (short int)xf_lock,
+/* 3000 */	VXT_END,
+/* 3001 */	VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_restartpc,VXT_IREPAB,VXT_VAL,3,VXI_PUSHL,VXT_VAL,
+/* 3009 */	2,VXI_CALLS,VXT_VAL,1,VXT_XFER,SIZEOF(char *) * (short int)xf_lvpatwrite,VXT_END,
+/* 3016 */	VXI_PUSHAB,VXT_VAL,1,VXI_CALLS,VXT_LIT,1,VXT_XFER,SIZEOF(char *) * (short int)xf_lvzwithdraw,
+/* 3024 */	VXT_END,
+/* 3025 */	VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_restartpc,VXT_IREPAB,VXT_VAL,2,VXI_CALLS,VXT_VAL,
+/* 3033 */	1,VXT_XFER,SIZEOF(char *) * (short int)xf_lvzwrite,VXT_END,
+/* 3037 */	VXT_IREPAB,VXT_VAL,2,VXI_CALLS,VXT_VAL,1,VXT_XFER,SIZEOF(char *) * (short int)xf_m_srchindx,
+/* 3045 */	VXI_MOVL,VXT_REG,0x50,VXT_ADDR,0,VXT_END,
+/* 3051 */	VXI_CALLS,VXT_LIT,0,VXT_XFER,SIZEOF(char *) * (short int)xf_merge,VXT_END,
+/* 3057 */	VXI_PUSHL,VXT_LIT,0,VXI_PUSHL,VXT_VAL,1,VXI_CALLS,VXT_LIT,
+/* 3065 */	2,VXT_XFER,SIZEOF(char *) * (short int)xf_merge_arg,VXT_END,
+/* 3069 */	VXI_PUSHAB,VXT_VAL,2,VXI_PUSHL,VXT_VAL,1,VXI_CALLS,VXT_LIT,
+/* 3077 */	2,VXT_XFER,SIZEOF(char *) * (short int)xf_merge_arg,VXT_END,
+/* 3081 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHAB,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,
+/* 3089 */	1,VXI_CALLS,VXT_LIT,3,VXT_XFER,SIZEOF(char *) * (short int)xf_flt_mod,VXT_END,
+/* 3096 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHAB,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,
+/* 3104 */	1,VXI_CALLS,VXT_LIT,3,VXT_XFER,SIZEOF(char *) * (short int)xf_mul,VXT_END,
+/* 3111 */	VXI_MOVAB,VXT_VAL,0,VXT_REG,0x50,VXI_MOVAB,VXT_VAL,1,
+/* 3119 */	VXT_REG,0x51,VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_neg,VXT_END,
+/* 3125 */	VXI_PUSHL,VXT_VAL,1,VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_newintrinsic,VXT_END,
+/* 3132 */	VXI_PUSHL,VXT_VAL,1,VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_newvar,VXT_END,
+/* 3139 */	VXI_CALLS,VXT_LIT,0,VXT_XFER,SIZEOF(char *) * (short int)xf_nullexp,VXI_MOVL,VXT_REG,0x50,
+/* 3147 */	VXT_ADDR,0,VXT_END,
+/* 3150 */	VXI_MOVAB,VXT_VAL,1,VXT_REG,0x50,VXI_MOVAB,VXT_VAL,2,
+/* 3158 */	VXT_REG,0x51,VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_numcmp,VXT_END,
+/* 3164 */	VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_restartpc,VXI_PUSHAB,VXT_VAL,4,VXI_PUSHAB,VXT_VAL,
+/* 3172 */	3,VXI_PUSHAB,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,1,VXI_CALLS,
+/* 3180 */	VXT_LIT,4,VXT_XFER,SIZEOF(char *) * (short int)xf_open,VXT_END,
+/* 3185 */	VXI_MOVAB,VXT_VAL,1,VXT_REG,0x50,VXI_MOVAB,VXT_VAL,2,
+/* 3193 */	VXT_REG,0x51,VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_pattern,VXT_END,
+/* 3199 */	VXT_IREPAB,VXT_VAL,2,VXI_CALLS,VXT_VAL,1,VXT_XFER,SIZEOF(char *) * (short int)xf_putindx,
+/* 3207 */	VXI_MOVL,VXT_REG,0x50,VXT_ADDR,0,VXT_END,
+/* 3213 */	VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_restartpc,VXI_PUSHAB,VXT_VAL,1,VXI_PUSHAB,VXT_VAL,
+/* 3221 */	0,VXI_CALLS,VXT_LIT,2,VXT_XFER,SIZEOF(char *) * (short int)xf_rdone,VXT_END,
+/* 3228 */	VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_restartpc,VXI_PUSHAB,VXT_VAL,1,VXI_PUSHAB,VXT_VAL,
+/* 3236 */	0,VXI_CALLS,VXT_LIT,2,VXT_XFER,SIZEOF(char *) * (short int)xf_read,VXT_END,
+/* 3243 */	VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_restartpc,VXI_PUSHAB,VXT_VAL,2,VXI_PUSHL,VXT_VAL,
+/* 3251 */	1,VXI_PUSHAB,VXT_VAL,0,VXI_CALLS,VXT_LIT,3,VXT_XFER,
+/* 3259 */	SIZEOF(char *) * (short int)xf_readfl,VXT_END,
+/* 3261 */	VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_restartpc,VXT_END,
+/* 3265 */	VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_ret,VXT_END,
+/* 3269 */	VXI_MOVAB,VXT_VAL,1,VXT_REG,0x50,VXI_MOVL,VXT_VAL,2,
+/* 3277 */	VXT_REG,0x51,VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_retarg,VXT_END,
+/* 3283 */	VXI_PUSHL,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,1,VXI_CALLS,VXT_LIT,
+/* 3291 */	2,VXT_XFER,SIZEOF(char *) * (short int)xf_rhdaddr,VXI_MOVL,VXT_REG,0x50,VXT_VAL,0,
+/* 3299 */	VXT_END,
+/* 3300 */	VXI_PUSHL,VXT_LIT,-1,VXI_PUSHAB,VXT_VAL,1,VXI_CALLS,VXT_LIT,
+/* 3308 */	2,VXT_XFER,SIZEOF(char *) * (short int)xf_rhdaddr,VXI_MOVL,VXT_REG,0x50,VXT_VAL,0,
+/* 3316 */	VXT_END,
+/* 3317 */	VXI_PUSHL,VXT_VAL,2,VXI_PUSHL,VXT_VAL,1,VXI_JSB,VXT_XFER,
+/* 3325 */	SIZEOF(char *) * (short int)xf_rterror,VXT_END,
+/* 3327 */	VXI_PUSHL,VXT_VAL,1,VXI_PUSHAB,VXT_VAL,2,VXI_CALLS,VXT_LIT,
+/* 3335 */	2,VXT_XFER,SIZEOF(char *) * (short int)xf_setals2als,VXT_END,
+/* 3339 */	VXI_PUSHAB,VXT_VAL,1,VXI_PUSHAB,VXT_VAL,2,VXI_CALLS,VXT_LIT,
+/* 3347 */	2,VXT_XFER,SIZEOF(char *) * (short int)xf_setalsin2alsct,VXT_END,
+/* 3351 */	VXI_PUSHL,VXT_VAL,1,VXI_PUSHAB,VXT_VAL,2,VXI_CALLS,VXT_LIT,
+/* 3359 */	2,VXT_XFER,SIZEOF(char *) * (short int)xf_setalsctin2als,VXT_END,
+/* 3363 */	VXI_PUSHAB,VXT_VAL,1,VXI_PUSHAB,VXT_VAL,2,VXI_CALLS,VXT_LIT,
+/* 3371 */	2,VXT_XFER,SIZEOF(char *) * (short int)xf_setalsct2alsct,VXT_END,
+/* 3375 */	VXI_PUSHL,VXT_VAL,1,VXI_PUSHAB,VXT_VAL,2,VXI_CALLS,VXT_LIT,
+/* 3383 */	2,VXT_XFER,SIZEOF(char *) * (short int)xf_setfnretin2als,VXT_END,
+/* 3387 */	VXI_PUSHAB,VXT_VAL,1,VXI_PUSHAB,VXT_VAL,2,VXI_CALLS,VXT_LIT,
+/* 3395 */	2,VXT_XFER,SIZEOF(char *) * (short int)xf_setfnretin2alsct,VXT_END,
+/* 3399 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHL,VXT_VAL,3,VXI_PUSHL,VXT_VAL,
+/* 3407 */	2,VXI_PUSHAB,VXT_VAL,4,VXI_PUSHAB,VXT_VAL,1,VXI_CALLS,
+/* 3415 */	VXT_LIT,5,VXT_XFER,SIZEOF(char *) * (short int)xf_setextract,VXT_END,
+/* 3420 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHL,VXT_VAL,3,VXI_PUSHAB,VXT_VAL,
+/* 3428 */	4,VXI_PUSHL,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,1,VXI_CALLS,
+/* 3436 */	VXT_LIT,5,VXT_XFER,SIZEOF(char *) * (short int)xf_setp1,VXT_END,
+/* 3441 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHL,VXT_VAL,4,VXI_PUSHL,VXT_VAL,
+/* 3449 */	3,VXI_PUSHAB,VXT_VAL,5,VXI_PUSHAB,VXT_VAL,2,VXI_PUSHAB,
+/* 3457 */	VXT_VAL,1,VXI_CALLS,VXT_LIT,6,VXT_XFER,SIZEOF(char *) * (short int)xf_setpiece,VXT_END,
+/* 3465 */	VXI_BISB2,VXT_LIT,1,VXT_REG,0x5A,VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_dt_true,
+/* 3473 */	VXT_END,
+/* 3474 */	VXI_PUSHL,VXT_VAL,5,VXI_PUSHAB,VXT_VAL,4,VXI_PUSHL,VXT_VAL,
+/* 3482 */	2,VXI_PUSHAB,VXT_VAL,1,VXI_PUSHAB,VXT_VAL,3,VXI_JSB,
+/* 3490 */	VXT_XFER,SIZEOF(char *) * (short int)xf_setzbrk,VXT_END,
+/* 3493 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHL,VXT_VAL,3,VXI_PUSHL,VXT_VAL,
+/* 3501 */	2,VXI_PUSHAB,VXT_VAL,4,VXI_PUSHAB,VXT_VAL,1,VXI_CALLS,
+/* 3509 */	VXT_LIT,5,VXT_XFER,SIZEOF(char *) * (short int)xf_setzextract,VXT_END,
+/* 3514 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHL,VXT_VAL,3,VXI_PUSHAB,VXT_VAL,
+/* 3522 */	4,VXI_PUSHL,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,1,VXI_CALLS,
+/* 3530 */	VXT_LIT,5,VXT_XFER,SIZEOF(char *) * (short int)xf_setzp1,VXT_END,
+/* 3535 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHL,VXT_VAL,4,VXI_PUSHL,VXT_VAL,
+/* 3543 */	3,VXI_PUSHAB,VXT_VAL,5,VXI_PUSHAB,VXT_VAL,2,VXI_PUSHAB,
+/* 3551 */	VXT_VAL,1,VXI_CALLS,VXT_LIT,6,VXT_XFER,SIZEOF(char *) * (short int)xf_setzpiece,VXT_END,
+/* 3559 */	VXI_MOVAB,VXT_VAL,1,VXT_REG,0x50,VXI_MOVAB,VXT_VAL,2,
+/* 3567 */	VXT_REG,0x51,VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_sorts_after,VXT_END,
+/* 3573 */	VXT_IREPAB,VXT_VAL,2,VXI_CALLS,VXT_VAL,1,VXT_XFER,SIZEOF(char *) * (short int)xf_srchindx,
+/* 3581 */	VXI_MOVL,VXT_REG,0x50,VXT_ADDR,0,VXT_END,
+/* 3587 */	VXI_MOVAB,VXT_VAL,2,VXT_REG,0x51,VXI_MOVAB,VXT_VAL,1,
+/* 3595 */	VXT_REG,0x50,VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_sto,VXT_END,
+/* 3601 */	VXI_MOVC3,VXT_LIT,16,VXT_VAL,2,VXT_VAL,1,VXT_END,
+/* 3609 */	VXI_MOVAB,VXT_VAL,1,VXT_REG,0x51,VXI_MOVAB,VXT_VAL,0,
+/* 3617 */	VXT_REG,0x50,VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_sto,VXT_END,
+/* 3623 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHAB,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,
+/* 3631 */	1,VXI_CALLS,VXT_LIT,3,VXT_XFER,SIZEOF(char *) * (short int)xf_sub,VXT_END,
+/* 3638 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHL,VXT_VAL,1,VXI_CALLS,VXT_LIT,
+/* 3646 */	2,VXT_XFER,SIZEOF(char *) * (short int)xf_svget,VXT_END,
+/* 3650 */	VXI_PUSHAB,VXT_VAL,2,VXI_PUSHL,VXT_VAL,1,VXI_JSB,VXT_XFER,
+/* 3658 */	SIZEOF(char *) * (short int)xf_psvput,VXT_END,
+/* 3660 */	VXI_PUSHAB,VXT_VAL,2,VXI_PUSHL,VXT_VAL,1,VXI_CALLS,VXT_LIT,
+/* 3668 */	2,VXT_XFER,SIZEOF(char *) * (short int)xf_svput,VXT_END,
+/* 3672 */	VXI_MOVL,VXT_REG,0x50,VXT_REG,0x5A,VXT_END,
+/* 3678 */	VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_tcommit,VXT_END,
+/* 3682 */	VXI_PUSHL,VXT_VAL,1,VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_trollback,VXT_END,
+/* 3689 */	VXI_PUSHL,VXT_VAL,1,VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_trestart,VXT_END,
+/* 3696 */	VXT_IREPAB,VXT_VAL,4,VXI_PUSHL,VXT_VAL,3,VXI_PUSHAB,VXT_VAL,
+/* 3704 */	2,VXI_PUSHL,VXT_VAL,1,VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_tstart,VXT_END,
+/* 3712 */	VXI_CALLS,VXT_LIT,0,VXT_XFER,SIZEOF(char *) * (short int)xf_unlock,VXT_END,
+/* 3718 */	VXI_PUSHAB,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,1,VXI_CALLS,VXT_LIT,
+/* 3726 */	2,VXT_XFER,SIZEOF(char *) * (short int)xf_use,VXT_END,
+/* 3730 */	VXT_IREPAB,VXT_VAL,2,VXI_CALLS,VXT_VAL,1,VXT_XFER,SIZEOF(char *) * (short int)xf_view,
+/* 3738 */	VXT_END,
+/* 3739 */	VXI_CMPL,VXT_VAL,1,VXT_VAL,2,VXT_END,
+/* 3745 */	VXI_PUSHAB,VXT_VAL,1,VXI_CALLS,VXT_LIT,1,VXT_XFER,SIZEOF(char *) * (short int)xf_write,
+/* 3753 */	VXT_END,
+/* 3754 */	VXI_PUSHL,VXT_VAL,1,VXI_CALLS,VXT_LIT,1,VXT_XFER,SIZEOF(char *) * (short int)xf_wteol,
+/* 3762 */	VXT_END,
+/* 3763 */	VXI_CALLS,VXT_LIT,0,VXT_XFER,SIZEOF(char *) * (short int)xf_wtff,VXT_END,
+/* 3769 */	VXI_PUSHL,VXT_VAL,1,VXI_CALLS,VXT_LIT,1,VXT_XFER,SIZEOF(char *) * (short int)xf_wtone,
+/* 3777 */	VXT_END,
+/* 3778 */	VXI_PUSHL,VXT_VAL,1,VXI_CALLS,VXT_LIT,1,VXT_XFER,SIZEOF(char *) * (short int)xf_wttab,
+/* 3786 */	VXT_END,
+/* 3787 */	VXT_IREPAB,VXT_VAL,2,VXI_CALLS,VXT_VAL,1,VXT_XFER,SIZEOF(char *) * (short int)xf_xkill,
+/* 3795 */	VXT_END,
+/* 3796 */	VXT_IREPAB,VXT_VAL,2,VXI_PUSHL,VXT_VAL,1,VXI_JSB,VXT_XFER,
+/* 3804 */	SIZEOF(char *) * (short int)xf_xnew,VXT_END,
+/* 3806 */	VXI_PUSHAB,VXT_VAL,1,VXI_CALLS,VXT_LIT,1,VXT_XFER,SIZEOF(char *) * (short int)xf_zallocate,
+/* 3814 */	VXT_END,
+/* 3815 */	VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_restartpc,VXI_PUSHAB,VXT_VAL,1,VXI_CALLS,VXT_LIT,
+/* 3823 */	1,VXT_XFER,SIZEOF(char *) * (short int)xf_zattach,VXT_END,
+/* 3827 */	VXI_PUSHL,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,1,VXI_CALLS,VXT_LIT,
+/* 3835 */	2,VXT_XFER,SIZEOF(char *) * (short int)xf_zcompile,VXT_END,
+/* 3839 */	VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_zcont,VXT_END,
+/* 3843 */	VXI_PUSHAB,VXT_VAL,1,VXI_CALLS,VXT_LIT,1,VXT_XFER,SIZEOF(char *) * (short int)xf_zdeallocate,
+/* 3851 */	VXT_END,
+/* 3852 */	VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_restartpc,VXI_PUSHAB,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,
+/* 3860 */	1,VXI_CALLS,VXT_LIT,2,VXT_XFER,SIZEOF(char *) * (short int)xf_zedit,VXT_END,
+/* 3867 */	VXI_PUSHL,VXT_VAL,1,VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_zg1,VXT_END,
+/* 3874 */	VXI_PUSHL,VXT_VAL,1,VXI_PUSHL,VXT_VAL,4,VXI_PUSHAB,VXT_VAL,
+/* 3882 */	3,VXI_PUSHAB,VXT_VAL,2,VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_zgoto,VXT_END,
+/* 3890 */	VXI_PUSHAB,VXT_VAL,1,VXI_CALLS,VXT_LIT,1,VXT_XFER,SIZEOF(char *) * (short int)xf_zhalt,
+/* 3898 */	VXT_END,
+/* 3899 */	VXI_PUSHAB,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,1,VXI_CALLS,VXT_LIT,
+/* 3907 */	2,VXT_XFER,SIZEOF(char *) * (short int)xf_zhelp,VXT_END,
+/* 3911 */	VXI_PUSHAB,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,1,VXI_CALLS,VXT_LIT,
+/* 3919 */	2,VXT_XFER,SIZEOF(char *) * (short int)xf_zlink,VXT_END,
+/* 3923 */	VXT_IREPAB,VXT_VAL,3,VXI_PUSHL,VXT_VAL,2,VXI_CALLS,VXT_VAL,
+/* 3931 */	1,VXT_XFER,SIZEOF(char *) * (short int)xf_zmess,VXT_END,
+/* 3935 */	VXI_PUSHAB,VXT_VAL,0,VXI_CALLS,VXT_LIT,1,VXT_XFER,SIZEOF(char *) * (short int)xf_zprevious,
+/* 3943 */	VXT_END,
+/* 3944 */	VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_restartpc,VXI_PUSHL,VXT_VAL,5,VXI_PUSHAB,VXT_VAL,
+/* 3952 */	4,VXI_PUSHL,VXT_VAL,3,VXI_PUSHAB,VXT_VAL,2,VXI_PUSHAB,
+/* 3960 */	VXT_VAL,1,VXI_CALLS,VXT_LIT,5,VXT_XFER,SIZEOF(char *) * (short int)xf_zprint,VXT_END,
+/* 3968 */	VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_restartpc,VXI_PUSHL,VXT_LIT,0,VXI_PUSHL,VXT_VAL,
+/* 3976 */	2,VXI_PUSHAB,VXT_VAL,1,VXI_CALLS,VXT_LIT,3,VXT_XFER,
+/* 3984 */	SIZEOF(char *) * (short int)xf_zshow,VXT_END,
+/* 3986 */	VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_restartpc,VXI_PUSHAB,VXT_VAL,3,VXI_PUSHL,VXT_VAL,
+/* 3994 */	2,VXI_PUSHAB,VXT_VAL,1,VXI_CALLS,VXT_LIT,3,VXT_XFER,
+/* 4002 */	SIZEOF(char *) * (short int)xf_zshow,VXT_END,
+/* 4004 */	VXI_PUSHL,VXT_LIT,0,VXI_PUSHL,VXT_VAL,1,VXI_CALLS,VXT_LIT,
+/* 4012 */	2,VXT_XFER,SIZEOF(char *) * (short int)xf_zstep,VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_zcont,VXT_END,
+/* 4019 */	VXI_PUSHAB,VXT_VAL,2,VXI_PUSHL,VXT_VAL,1,VXI_CALLS,VXT_LIT,
+/* 4027 */	2,VXT_XFER,SIZEOF(char *) * (short int)xf_zstep,VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_zcont,VXT_END,
+/* 4034 */	VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_restartpc,VXI_PUSHAB,VXT_VAL,1,VXI_CALLS,VXT_LIT,
+/* 4042 */	1,VXT_XFER,SIZEOF(char *) * (short int)xf_zsystem,VXT_END,
+/* 4046 */	VXI_PUSHL,VXT_VAL,1,VXI_CALLS,VXT_LIT,1,VXT_XFER,SIZEOF(char *) * (short int)xf_ztcommit,
+/* 4054 */	VXT_END,
+/* 4055 */	VXI_CALLS,VXT_LIT,0,VXT_XFER,SIZEOF(char *) * (short int)xf_ztrigger,VXT_END,
+/* 4061 */	VXI_CALLS,VXT_LIT,0,VXT_XFER,SIZEOF(char *) * (short int)xf_ztstart,VXT_END,
+/* 4067 */	VXI_PUSHL,VXT_VAL,1,VXI_CALLS,VXT_LIT,1,VXT_XFER,SIZEOF(char *) * (short int)xf_zwritesvn,
+/* 4075 */	VXT_END,
+/* 4076 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHAB,VXT_VAL,1,VXI_PUSHL,VXT_VAL,
+/* 4084 */	2,VXI_CALLS,VXT_LIT,3,VXT_XFER,SIZEOF(char *) * (short int)xf_fnzwrite,VXT_END,
+/* 4091 */	VXI_CALLS,VXT_LIT,0,VXT_XFER,SIZEOF(char *) * (short int)xf_igetdst,VXI_MOVL,VXT_REG,0x50,
+/* 4099 */	VXT_ADDR,0,VXT_END,
+/* 4102 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHAB,VXT_VAL,1,VXI_CALLS,VXT_LIT,
+/* 4110 */	2,VXT_XFER,SIZEOF(char *) * (short int)xf_indget1,VXT_END,
+/* 4114 */	VXI_PUSHAB,VXT_VAL,1,VXI_CALLS,VXT_LIT,1,VXT_XFER,SIZEOF(char *) * (short int)xf_glvnpop,
+/* 4122 */	VXT_END,
+/* 4123 */	VXI_PUSHL,VXT_VAL,1,VXI_CALLS,VXT_LIT,1,VXT_XFER,SIZEOF(char *) * (short int)xf_glvnslot,
+/* 4131 */	VXI_MOVL,VXT_REG,0x50,VXT_ADDR,0,VXT_END,
+/* 4137 */	VXI_PUSHL,VXT_VAL,3,VXI_PUSHAB,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,
+/* 4145 */	1,VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_indsavglvn,VXT_END,
+/* 4150 */	VXI_PUSHAB,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,1,VXI_JSB,VXT_XFER,
+/* 4158 */	SIZEOF(char *) * (short int)xf_indsavlvn,VXT_END,
+/* 4160 */	VXI_PUSHL,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,1,VXI_CALLS,VXT_LIT,
+/* 4168 */	2,VXT_XFER,SIZEOF(char *) * (short int)xf_rfrshlvn,VXI_MOVL,VXT_REG,0x50,VXT_ADDR,0,
+/* 4176 */	VXT_END,
+/* 4177 */	VXT_IREPAB,VXT_VAL,3,VXI_PUSHL,VXT_VAL,2,VXI_CALLS,VXT_VAL,
+/* 4185 */	1,VXT_XFER,SIZEOF(char *) * (short int)xf_savgvn,VXT_END,
+/* 4189 */	VXT_IREPAB,VXT_VAL,2,VXI_CALLS,VXT_VAL,1,VXT_XFER,SIZEOF(char *) * (short int)xf_savlvn,
+/* 4197 */	VXT_END,
+/* 4198 */	VXI_PUSHL,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,1,VXI_CALLS,VXT_LIT,
+/* 4206 */	2,VXT_XFER,SIZEOF(char *) * (short int)xf_shareslot,VXT_END,
+/* 4210 */	VXI_PUSHAB,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,1,VXI_CALLS,VXT_LIT,
+/* 4218 */	2,VXT_XFER,SIZEOF(char *) * (short int)xf_stoglvn,VXT_END,
+/* 4222 */	VXI_PUSHL,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,1,VXI_CALLS,VXT_LIT,
+/* 4230 */	2,VXT_XFER,SIZEOF(char *) * (short int)xf_rfrshgvn,VXT_END,
+/* 4234 */	VXI_PUSHAB,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,1,VXI_PUSHAB,VXT_VAL,
+/* 4242 */	0,VXI_CALLS,VXT_LIT,3,VXT_XFER,SIZEOF(char *) * (short int)xf_indfnname2,VXT_END,
+/* 4249 */	VXI_PUSHAB,VXT_VAL,1,VXI_PUSHAB,VXT_VAL,0,VXI_CALLS,VXT_LIT,
+/* 4257 */	2,VXT_XFER,SIZEOF(char *) * (short int)xf_indget2,VXT_END,
+/* 4261 */	VXI_PUSHAB,VXT_VAL,1,VXI_CALLS,VXT_LIT,1,VXT_XFER,SIZEOF(char *) * (short int)xf_indmerge2,
+/* 4269 */	VXT_END,
+/* 4270 */	VXI_PUSHAB,VXT_VAL,1,VXI_PUSHAB,VXT_VAL,0,VXI_CALLS,VXT_LIT,
+/* 4278 */	2,VXT_XFER,SIZEOF(char *) * (short int)xf_litc,VXT_END,
+/* 4282 */	VXI_MOVC3,VXT_LIT,16,VXT_VAL,2,VXT_VAL,1,VXI_PUSHAB,
+/* 4290 */	VXT_VAL,1,VXI_CALLS,VXT_LIT,1,VXT_XFER,SIZEOF(char *) * (short int)xf_stolitc,VXT_END,
+/* 4298 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHAB,VXT_VAL,4,VXI_PUSHL,VXT_VAL,
+/* 4306 */	3,VXI_PUSHL,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,1,VXI_CALLS,
+/* 4314 */	VXT_LIT,5,VXT_XFER,SIZEOF(char *) * (short int)xf_fnzpeek,VXT_END,
+/* 4319 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHAB,VXT_VAL,1,VXI_CALLS,VXT_LIT,
+/* 4327 */	2,VXT_XFER,SIZEOF(char *) * (short int)xf_fnzsyslog,VXT_END,
+/* 4331 */	VXT_IREPAB,VXT_VAL,2,VXI_CALLS,VXT_VAL,1,VXT_XFER,SIZEOF(char *) * (short int)xf_zrupdate,
+/* 4339 */	VXT_END,
+/* 4340 */	368,388,378,2657,2665,2661,2924,2936,
+/* 4348 */	2930,0,0,0,507,483,474,0,
+/* 4356 */	0,470,2156,2194,2175,2805,2820,2811,
+/* 4364 */	2781,2796,2787,2673,2684,2677,2763,2774,
+/* 4372 */	2767,2709,2720,2713,2727,2738,2731,2745,
+/* 4380 */	2756,2749,2691,2702,2695,2126,2146,2136,
+/* 4388 */	398,418,408};

-- 
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