diff --git a/configure/os/CONFIG.Common.RHEL7-x86_64 b/configure/os/CONFIG.Common.RHEL7-x86_64
index 9c5538727..20853d74f 100644
--- a/configure/os/CONFIG.Common.RHEL7-x86_64
+++ b/configure/os/CONFIG.Common.RHEL7-x86_64
@@ -2,5 +2,5 @@
 include $(CONFIG)/os/CONFIG.Common.linux-x86_64
 
 TOOLSET_LOCATION = /opt/rh
-#TOOLSET = devtoolset-11
-STD_CXXFLAGS = $(if $(TOOLSET),-std=c++17,-std=c++11)
+TOOLSET = devtoolset-12
+STD_CXXFLAGS = -std=c++20
diff --git a/configure/os/CONFIG.Common.RHEL8-x86_64 b/configure/os/CONFIG.Common.RHEL8-x86_64
index c5e8ee757..5673dc729 100644
--- a/configure/os/CONFIG.Common.RHEL8-x86_64
+++ b/configure/os/CONFIG.Common.RHEL8-x86_64
@@ -2,8 +2,8 @@
 include $(CONFIG)/os/CONFIG.Common.linux-x86_64
 
 TOOLSET_LOCATION = /opt/rh
-#TOOLSET = gcc-toolset-12
-#STD_CXXFLAGS = -std=c++17
+TOOLSET = gcc-toolset-12
+STD_CXXFLAGS = -std=c++20
 
 # Fix bug in gcc-toolset-11 calling the old assembler
 ifneq ($(filter %-11,$(TOOLSET)),)
diff --git a/configure/os/CONFIG.Common.deb10-x86_64 b/configure/os/CONFIG.Common.deb10-x86_64
index 0e9ca16b5..9ae6a2358 100644
--- a/configure/os/CONFIG.Common.deb10-x86_64
+++ b/configure/os/CONFIG.Common.deb10-x86_64
@@ -18,3 +18,5 @@ GNU_TARGET=x86_64-deb10-linux-gnu
 
 ARCH_DEP_CPPFLAGS =
 AS=$(GNU_BIN)/$(GNU_TARGET)-as
+
+STD_CXXFLAGS = -std=c++17
diff --git a/configure/os/CONFIG.Common.nilrt7-armv7a b/configure/os/CONFIG.Common.nilrt7-armv7a
index 7e60676e2..6aec571d3 100644
--- a/configure/os/CONFIG.Common.nilrt7-armv7a
+++ b/configure/os/CONFIG.Common.nilrt7-armv7a
@@ -8,6 +8,7 @@ ARCH_CLASS = arm
 GNU_TARGET = arm-linux-gnu
 
 SYSROOT = /opt/LabVIEW-RT-19.5.1/arm/sysroots/armv7a-vfp-neon-nilrt-linux-gnueabi
+GNU_BIN = /bin
 
 ARCH_DEP_CPPFLAGS += -march=armv7-a -mthumb-interwork -mfloat-abi=softfp -mfpu=neon
 ARCH_DEP_CXXFLAGS += -I$(SYSROOT)/usr/include/c++/4.7.2/arm-nilrt-linux-gnueabi/
diff --git a/configure/os/CONFIG.RHEL8-x86_64.RHEL7-x86_64 b/configure/os/CONFIG.RHEL8-x86_64.RHEL7-x86_64
index 8571d0e68..c1a994b5c 100644
--- a/configure/os/CONFIG.RHEL8-x86_64.RHEL7-x86_64
+++ b/configure/os/CONFIG.RHEL8-x86_64.RHEL7-x86_64
@@ -10,7 +10,6 @@ include $(CONFIG)/os/CONFIG.linux-x86.linux-x86
 # Optionally use a newer TOOLSET (installed on $(SYSROOT)).
 
 SYSROOT = /opt/RHEL7
-GNU_DIR = $(SYSROOT)$(TOOLSET_DIR)
 
 # "Cross" TOOLSET progs need to find their libraries
 LD_LIBRARY_PATH = $(TOOLSET_DIR:%=$(SYSROOT)%/usr/$$LIB)
diff --git a/configure/os/CONFIG.RHEL8-x86_64.nilrt7-armv7a b/configure/os/CONFIG.RHEL8-x86_64.nilrt7-armv7a
index 451238772..b98c45b38 100644
--- a/configure/os/CONFIG.RHEL8-x86_64.nilrt7-armv7a
+++ b/configure/os/CONFIG.RHEL8-x86_64.nilrt7-armv7a
@@ -1 +1 @@
-GNU_BIN=/opt/RHEL7/bin
+GNU_BIN = /opt/RHEL7/bin
diff --git a/configure/os/CONFIG_SITE.Common.linuxCommon b/configure/os/CONFIG_SITE.Common.linuxCommon
index 2605d0795..80818f04e 100644
--- a/configure/os/CONFIG_SITE.Common.linuxCommon
+++ b/configure/os/CONFIG_SITE.Common.linuxCommon
@@ -14,7 +14,7 @@ USR_CXXFLAGS += $(STD_CXXFLAGS)
 STD_CXXFLAGS = -std=c++11
 
 TOOLSET_DIR      = $(TOOLSET:%=$(TOOLSET_LOCATION)/%/root)
-GNU_DIR = $(TOOLSET_DIR)
+GNU_DIR = $(SYSROOT)$(TOOLSET_DIR)
 TARGET_CPPFLAGS += $(SYSROOT:%=--sysroot=%)
 TARGET_LDFLAGS  += $(SYSROOT:%=--sysroot=%)
 
diff --git a/configure/os/CONFIG_SITE.linux-x86.Common b/configure/os/CONFIG_SITE.linux-x86.Common
index 46876ff84..541f2bf88 100644
--- a/configure/os/CONFIG_SITE.linux-x86.Common
+++ b/configure/os/CONFIG_SITE.linux-x86.Common
@@ -11,8 +11,9 @@ INSTALL_LOCATION=/usr/local/epics/base-$(EPICS_VERSION).$(EPICS_REVISION).$(EPIC
 GNU_HOST_ARCH=i686
 GNU_HOST_OS=linux
 
-# LD_LIBRARY_PATH may cause problems for eldk53-ppc4xxFP
-LD_LIBRARY_PATH=
+# set LD_LIBRARY_PATH may cause problems for eldk53-ppc4xxFP
+# not exported LD_LIBRARY_PATH causes problem for RHEL7 cross compilation
+export LD_LIBRARY_PATH=
 
 # vxWorks for MVxxxx boards
 #CROSS_COMPILER_TARGET_ARCHS += T2-ppc604
diff --git a/modules/pvData b/modules/pvData
index 763e39d43..3efc4e3fd 160000
--- a/modules/pvData
+++ b/modules/pvData
@@ -1 +1 @@
-Subproject commit 763e39d4354b1d0d931072fb9975a965d78a5d2b
+Subproject commit 3efc4e3fd85b2aafce4af2fc6a767ba3009ec390