diff --git a/runtime/nls/vmut/j9vmutil.nls b/runtime/nls/vmut/j9vmutil.nls
index 8c38979cca4..28097ed20a3 100644
--- a/runtime/nls/vmut/j9vmutil.nls
+++ b/runtime/nls/vmut/j9vmutil.nls
@@ -190,3 +190,10 @@ J9NLS_VMUTIL_RECEIVERCLASS_NOT_SAME_OR_SUBTYPE_OF_CURRENTCLASS.explanation=NOTAG
 J9NLS_VMUTIL_RECEIVERCLASS_NOT_SAME_OR_SUBTYPE_OF_CURRENTCLASS.system_action=
 J9NLS_VMUTIL_RECEIVERCLASS_NOT_SAME_OR_SUBTYPE_OF_CURRENTCLASS.user_response=
 # END NON-TRANSLATABLE
+
+J9NLS_VMUTIL_OPENJ9_EXTENDED_HCR_DISABLED_WARNING=Warning: Extended HCR is disabled, enable with -XX:+EnableExtendedHCR. This feature is deprecated. In the future, the extended HCR capability, and the option to enable it, will be completely removed from all versions.
+# START NON-TRANSLATABLE
+J9NLS_VMUTIL_OPENJ9_EXTENDED_HCR_DISABLED_WARNING.explanation=This JVM disables extended HCR by default, this may cause JVMTI failures in extended capabilites are required.
+J9NLS_VMUTIL_OPENJ9_EXTENDED_HCR_DISABLED_WARNING.system_action=None
+J9NLS_VMUTIL_OPENJ9_EXTENDED_HCR_DISABLED_WARNING.user_response=Add -XX:+EnableExtendedHCR commandline option to enable extended HCR.
+# END NON-TRANSLATABLE
diff --git a/runtime/oti/j9consts.h b/runtime/oti/j9consts.h
index 10d6ae4d4d1..d6468d012c3 100644
--- a/runtime/oti/j9consts.h
+++ b/runtime/oti/j9consts.h
@@ -364,6 +364,7 @@ extern "C" {
 #define J9_EXTENDED_RUNTIME2_ALWAYS_KEEP_JNI_IDS 0x2000000
 #define J9_EXTENDED_RUNTIME2_NEVER_KEEP_JNI_IDS 0x4000000
 #define J9_EXTENDED_RUNTIME2_FFI_PROTO 0x8000000
+#define J9_EXTENDED_RUNTIME2_DISABLE_EXTENDED_HCR 0x10000000
 
 #define J9_OBJECT_HEADER_AGE_DEFAULT 0xA /* OBJECT_HEADER_AGE_DEFAULT */
 #define J9_OBJECT_HEADER_SHAPE_MASK 0xE /* OBJECT_HEADER_SHAPE_MASK */
diff --git a/runtime/oti/jvminit.h b/runtime/oti/jvminit.h
index 989da82fbe8..e8178c5b529 100644
--- a/runtime/oti/jvminit.h
+++ b/runtime/oti/jvminit.h
@@ -419,6 +419,8 @@ enum INIT_STAGE {
 #define VMOPT_XXNOOPENJ9COMMANDLINEENV "-XX:-OpenJ9CommandLineEnv"
 #define VMOPT_XXCPULOADCOMPATIBILITY "-XX:+CpuLoadCompatibility"
 #define VMOPT_XXNOCPULOADCOMPATIBILITY "-XX:-CpuLoadCompatibility"
+#define VMOPT_XXENABLEEXTENDEDHCR "-XX:+EnableExtendedHCR"
+#define VMOPT_XXDISABLEEXTENDEDHCR "-XX:-EnableExtendedHCR"
 
 #if defined(J9VM_ZOS_3164_INTEROPERABILITY)
 #define VMOPT_XXENABLE3164INTEROPERABILITY "-XX:+Enable3164Interoperability"
diff --git a/runtime/oti/util_api.h b/runtime/oti/util_api.h
index 58481cc99a9..97532c41cca 100644
--- a/runtime/oti/util_api.h
+++ b/runtime/oti/util_api.h
@@ -158,7 +158,7 @@ compareUTF8Length(U_8* data1, UDATA length1, void* data2, UDATA length2);
 /**
 * @brief	Returns TRUE if instanceClass can be cast to castClass, FALSE otherwise.
 * 			Updates the castClassCache.  DO NOT call this without VM access.
-* 
+*
 * @param *instanceClass
 * @param *castClass
 * @return IDATA
@@ -194,19 +194,19 @@ getDefinedArgumentFromJavaVMInitArgs(JavaVMInitArgs *vmInitArgs, const char *def
 /* ---------------- divhelp.c ---------------- */
 
 /**
-* @brief Helper function called by VM interpreter, using pointers to 
+* @brief Helper function called by VM interpreter, using pointers to
 *        values. Calculates quotient of 2 longs.
 * @param[in] *a Pointer to long dividend.
 * @param[in] *b Pointer to long divisor.
 * @param[out] *c Pointer to long quotient.
 * @return I_32 0.
-* 
+*
 */
 void helperLongDivideLong(I_64 *a, I_64 *b, I_64 *c);
 
 
 /**
-* @brief Helper function called by VM interpreter, using 
+* @brief Helper function called by VM interpreter, using
 *        pointers to values. Calculates the product of
 *        2 longs.
 * @param[in] *a Pointer to long multiplicand.
@@ -218,7 +218,7 @@ void helperLongMultiplyLong(I_64 *a, I_64 *b, I_64 *c);
 
 
 /**
-* @brief Helper function called by VM interpreter, using 
+* @brief Helper function called by VM interpreter, using
 *        pointers to values. Calculates the remainder when
 *        dividing 2 longs.
 * @param[in] *a Pointer to long dividend.
@@ -237,7 +237,7 @@ void helperLongRemainderLong(I_64 *a, I_64 *b, I_64 *c);
 * @param[in] a Long dividend.
 * @param[in] b Long divisor.
 * @return Resulting long quotient.
-* 
+*
 */
 I_64 helperCLongDivideLong(I_64 a, I_64 b);
 
@@ -248,7 +248,7 @@ I_64 helperCLongDivideLong(I_64 a, I_64 b);
 * @param[in] a Long multiplicand.
 * @param[in] b Long multiplier.
 * @return Resulting long product.
-* 
+*
 */
 I_64 helperCLongMultiplyLong(I_64 a, I_64 b);
 
@@ -259,7 +259,7 @@ I_64 helperCLongMultiplyLong(I_64 a, I_64 b);
 * @param[in] a Long dividend.
 * @param[in] b Long divisor.
 * @return Resulting long remainder.
-* 
+*
 */
 I_64 helperCLongRemainderLong(I_64 a, I_64 b);
 
@@ -311,7 +311,7 @@ pushEventFrame(J9VMThread * currentThread, UDATA wantVMAccess, UDATA jniRefSlots
 * @param method
 * @return U_8 *
 */
-U_8 * 
+U_8 *
 fetchMethodExtendedFlagsPointer(J9Method* method);
 
 
@@ -439,75 +439,75 @@ UDATA methodIsFinalInObject(UDATA nameLength, U_8* name, UDATA sigLength, U_8* s
 #if (defined(J9VM_INTERP_FLOAT_SUPPORT))  /* File Level Build Flags */
 
 /**
-* @brief Helper function called by VM interpreter, using pointers 
+* @brief Helper function called by VM interpreter, using pointers
 *        to values. Converts a double precision number to a
 *        floating point value.
 * @param[in] *src Pointer to double value to be converted to floating point.
 * @param[out] *dst Pointer to the resulting floating point value.
-* @return Void. 
-* 
+* @return Void.
+*
 */
 void helperConvertDoubleToFloat(jdouble *src, jfloat *dst);
 
 
 /**
-* @brief Helper function called by VM interpreter, using pointers 
+* @brief Helper function called by VM interpreter, using pointers
 *        to values. Converts a double precision number to an integer value.
 * @param[in] *src Pointer to double value to be converted to integer.
 * @param[out] *dst Pointer to the resulting integer value.
-* @return Void. 
-* 
+* @return Void.
+*
 */
 void helperConvertDoubleToInteger(jdouble *src, I_32 *dst);
 
 
 /**
-* @brief Helper function called by VM interpreter, using pointers 
+* @brief Helper function called by VM interpreter, using pointers
 *        to values. Converts a double precision number to long value.
 * @param[in] *src Pointer to double value to be converted to long.
 * @param[out] *dst Pointer to the resulting long value.
-* @return Void. 
-* 
+* @return Void.
+*
 */
 void helperConvertDoubleToLong(jdouble *src, I_64 *dst);
 
 
 /**
-* @brief Helper function called by VM interpreter, using pointers 
-*        to values. Converts floating point number to a double 
+* @brief Helper function called by VM interpreter, using pointers
+*        to values. Converts floating point number to a double
 *        precision value.
 * @param[in] *src Pointer to floating point value to be converted to double.
 * @param[out] *dst Pointer to the resulting double value.
-* @return Void. 
-* 
+* @return Void.
+*
 */
 void helperConvertFloatToDouble(jfloat *src, jdouble *dst);
 
 
 /**
-* @brief Helper function called by VM interpreter, using pointers 
+* @brief Helper function called by VM interpreter, using pointers
 *        to values. Converts floating point number to an integer value.
 * @param[in] *src Pointer to floating point value to be converted to integer.
 * @param[out] *dst Pointer to the resulting integer value.
-* @return Void. 
-* 
+* @return Void.
+*
 */
 void helperConvertFloatToInteger(jfloat *src, I_32 *dst);
 
 
 /**
-* @brief Helper function called by VM interpreter, using pointers 
+* @brief Helper function called by VM interpreter, using pointers
 *        to values. Converts floating point number to long value.
 * @param[in] *src Pointer to floating point value to be converted to long.
 * @param[out] *dst Pointer to the resulting long value.
-* @return Void. 
-* 
+* @return Void.
+*
 */
 void helperConvertFloatToLong(jfloat *src, I_64 *dst);
 
 
 /**
-* @brief Helper function called by VM interpreter, using pointers 
+* @brief Helper function called by VM interpreter, using pointers
 *        to values. Converts an integer number to double.
 * @param[in] *src Pointer to integer value to be converted to double.
 * @param[out] *dst Pointer to the resulting double value.
@@ -518,7 +518,7 @@ void helperConvertIntegerToDouble(I_32 *src, jdouble *dst);
 
 
 /**
-* @brief Helper function called by VM interpreter, using pointers 
+* @brief Helper function called by VM interpreter, using pointers
 *        to values. Converts an integer number to floating point.
 * @param[in] *src Pointer to integer value to be converted to floating point.
 * @param[out] *dst Pointer to the resulting floating point value.
@@ -529,7 +529,7 @@ void helperConvertIntegerToFloat(I_32 *src, jfloat *dst);
 
 
 /**
-* @brief Helper function called by VM interpreter, using pointers 
+* @brief Helper function called by VM interpreter, using pointers
 *        to values. Converts a long number to double precision.
 * @param[in] *src Pointer to long value to be converted to double.
 * @param[out] *dst Pointer to the resulting double value.
@@ -540,7 +540,7 @@ void helperConvertLongToDouble(I_64 *src, jdouble *dst);
 
 
 /**
-* @brief Helper function called by VM interpreter, using pointers 
+* @brief Helper function called by VM interpreter, using pointers
 *        to values. Converts a long number to floating point.
 * @param[in] *src Pointer to long value to be converted to floating point.
 * @param[out] *dst Pointer to the resulting floating point value.
@@ -553,21 +553,21 @@ void helperConvertLongToFloat(I_64 *src, jfloat *dst);
 /* ---------------- fltconv.c C-helpers---------------- */
 
 /**
-* @brief Helper function called by JIT, using standard 
-*        C-calling convention. Given a double number, 
-*        converts it to floating point and returns the 
+* @brief Helper function called by JIT, using standard
+*        C-calling convention. Given a double number,
+*        converts it to floating point and returns the
 *        floating point value.
 * @param[in] src Double number to be converted to floating point.
 * @return Resulting floating point value.
-* 
+*
 */
 jfloat helperCConvertDoubleToFloat(jdouble src);
 
 
 /**
-* @brief Helper function called by JIT, using standard 
-*        C-calling convention. Given a double number, 
-*        converts it to an integer and returns the 
+* @brief Helper function called by JIT, using standard
+*        C-calling convention. Given a double number,
+*        converts it to an integer and returns the
 *        integer value.
 * @param[in] src Double number to be converted to an integer.
 * @return Resulting integer value.
@@ -577,9 +577,9 @@ I_32 helperCConvertDoubleToInteger(jdouble src);
 
 
 /**
-* @brief Helper function called by JIT, using standard 
-*        C-calling convention. Given a double number, 
-*        converts it to a long and returns the 
+* @brief Helper function called by JIT, using standard
+*        C-calling convention. Given a double number,
+*        converts it to a long and returns the
 *        long value.
 * @param[in] src Double number to be converted to a long.
 * @return Resulting long value.
@@ -589,9 +589,9 @@ I_64 helperCConvertDoubleToLong(jdouble src);
 
 
 /**
-* @brief Helper function called by JIT, using standard 
-*        C-calling convention. Given a floating point number, 
-*        converts it to a double and returns the 
+* @brief Helper function called by JIT, using standard
+*        C-calling convention. Given a floating point number,
+*        converts it to a double and returns the
 *        double value.
 * @param[in] src Floating point number to be converted to a double.
 * @return Resulting double value.
@@ -601,9 +601,9 @@ jdouble helperCConvertFloatToDouble(jfloat src);
 
 
 /**
-* @brief Helper function called by JIT, using standard 
-*        C-calling convention. Given a floating point number, 
-*        converts it to an integer and returns the 
+* @brief Helper function called by JIT, using standard
+*        C-calling convention. Given a floating point number,
+*        converts it to an integer and returns the
 *        integer value.
 * @param[in] src Floating point number to be converted to an integer.
 * @return Resulting integer value.
@@ -612,21 +612,21 @@ jdouble helperCConvertFloatToDouble(jfloat src);
 I_32 helperCConvertFloatToInteger(jfloat src);
 
 /**
-* @brief Helper function called by JIT, using standard 
-*        C-calling convention. Given floating point number, 
+* @brief Helper function called by JIT, using standard
+*        C-calling convention. Given floating point number,
 *        converts it to long and returns the long value.
 * @param[in] a Floating point number to be converted to long.
 * @return Resulting long value.
-* 
+*
 */
 I_64 helperCConvertFloatToLong(jfloat src);
 
 
 
 /**
-* @brief Helper function called by JIT, using standard 
-*        C-calling convention. Given a floating point number, 
-*        converts it to a double and returns the 
+* @brief Helper function called by JIT, using standard
+*        C-calling convention. Given a floating point number,
+*        converts it to a double and returns the
 *        double value.
 * @param[in] src Floating point number to be converted to a double.
 * @return Resulting double value.
@@ -636,9 +636,9 @@ jdouble helperCConvertIntegerToDouble(I_32 src);
 
 
 /**
-* @brief Helper function called by JIT, using standard 
-*        C-calling convention. Given an integer number, 
-*        converts it to floating point and returns the 
+* @brief Helper function called by JIT, using standard
+*        C-calling convention. Given an integer number,
+*        converts it to floating point and returns the
 *        floating point value.
 * @param[in] src Integer number to be converted to floating point.
 * @return Resulting floating point value.
@@ -648,9 +648,9 @@ jfloat helperCConvertIntegerToFloat(I_32 src);
 
 
 /**
-* @brief Helper function called by JIT, using standard 
-*        C-calling convention. Given a floating point number, 
-*        converts it to a double and returns the 
+* @brief Helper function called by JIT, using standard
+*        C-calling convention. Given a floating point number,
+*        converts it to a double and returns the
 *        double value.
 * @param[in] src Floating point number to be converted to a double.
 * @return Resulting double value.
@@ -660,9 +660,9 @@ jdouble helperCConvertLongToDouble(I_64 src);
 
 
 /**
-* @brief Helper function called by JIT, using standard 
-*        C-calling convention. Given a long number, 
-*        converts it to floating point and returns the 
+* @brief Helper function called by JIT, using standard
+*        C-calling convention. Given a long number,
+*        converts it to floating point and returns the
 *        floating point value.
 * @param[in] src The long number to be converted to floating point.
 * @return Resulting floating point value.
@@ -817,7 +817,7 @@ void subDF(float f1, float f2, float *rp);
 #if (defined(J9VM_INTERP_FLOAT_SUPPORT))  /* File Level Build Flags */
 
 /**
-* @brief Helper function called by VM interpreter, using 
+* @brief Helper function called by VM interpreter, using
 *        pointers to values. Given 2 pointers to double values,
 *        returns  flag indicating how the values compare.
 * @param[in] *a Pointer to double value.
@@ -826,13 +826,13 @@ void subDF(float f1, float f2, float *rp);
 *                       1 if a>b
 *                      -1 if a<b
 * 					   -2 if a or b NaN.
-* 
+*
 */
 int helperDoubleCompareDouble(jdouble *a, jdouble *b);
 
 
 /**
-* @brief Helper function called by VM interpreter, using 
+* @brief Helper function called by VM interpreter, using
 *        pointers to values. Calculates the quotient of
 *        2 double precision numbers.
 * @param[in] *a Pointer to double dividend.
@@ -844,19 +844,19 @@ I_32 helperDoubleDivideDouble(jdouble *a, jdouble *b, jdouble *c);
 
 
 /**
-* @brief Helper function called by VM interpreter, using pointers to 
+* @brief Helper function called by VM interpreter, using pointers to
 *        values. Calculates difference of 2 double numbers.
 * @param[in] *a Pointer to double minuend.
 * @param[in] *b Pointer to double subtrahend.
 * @param[out] *c Pointer to double difference.
 * @return I_32 0.
-* 
+*
 */
 I_32 helperDoubleMinusDouble(jdouble *a, jdouble *b, jdouble *c);
 
 
 /**
-* @brief Helper function called by VM interpreter, using 
+* @brief Helper function called by VM interpreter, using
 *        pointers to values. Calculates the product of
 *        2 double precision numbers.
 * @param[in] *a Pointer to double multiplicand.
@@ -868,22 +868,22 @@ I_32 helperDoubleMultiplyDouble(jdouble *a, jdouble *b, jdouble *c);
 
 
 /**
-* @brief Helper function called by VM interpreter, using 
+* @brief Helper function called by VM interpreter, using
 *        pointers to values. Calculates the sum of
 *        2 double precision numbers.
 * @param[in] *a Pointer to double addend.
 * @param[in] *b Pointer to double addend.
 * @param[out] *c Pointer to double sum.
 * @return I_32 0.
-* 
+*
 */
 I_32 helperDoublePlusDouble(jdouble *a, jdouble *b, jdouble *c);
 
 
 /**
-* @brief Helper function called by VM interpreter, using 
+* @brief Helper function called by VM interpreter, using
 *        pointers to values. Given 2 pointers to floating
-*        point values, returns  flag indicating how the 
+*        point values, returns  flag indicating how the
 *        values compare.
 * @param[in] *a Pointer to floating point value.
 * @param[in] *b Pointer to floating point value.
@@ -891,13 +891,13 @@ I_32 helperDoublePlusDouble(jdouble *a, jdouble *b, jdouble *c);
 *                       1 if a>b
 *                      -1 if a<b
 * 					   -2 if a or b NaN.
-* 
+*
 */
 I_32 helperFloatCompareFloat(jfloat *a, jfloat *b);
 
 
 /**
-* @brief Helper function called by VM interpreter, using 
+* @brief Helper function called by VM interpreter, using
 *        pointers to values. Calculates the quotient of
 *        2 floating point numbers.
 * @param[in] *a Pointer to floating point dividend.
@@ -905,24 +905,24 @@ I_32 helperFloatCompareFloat(jfloat *a, jfloat *b);
 * @param[out] *c Pointer to floating point quotient.
 * @return I_32 0.
 */
-I_32 helperFloatDivideFloat(jfloat *a, jfloat *b, jfloat *c); 
+I_32 helperFloatDivideFloat(jfloat *a, jfloat *b, jfloat *c);
 
 
 /**
-* @brief Helper function called by VM interpreter, using 
+* @brief Helper function called by VM interpreter, using
 *        pointers to values. Calculates the difference of
 *        2 floating point numbers.
 * @param[in] *a Pointer to floating point minuend.
 * @param[in] *b Pointer to floating point subtrahend.
 * @param[out] *c Pointer to floating point difference.
 * @return I_32 0.
-* 
+*
 */
 I_32 helperFloatMinusFloat(jfloat *a, jfloat *b, jfloat *c);
 
 
 /**
-* @brief Helper function called by VM interpreter, using 
+* @brief Helper function called by VM interpreter, using
 *        pointers to values. Calculates the product of
 *        2 floating point numbers.
 * @param[in] *a Pointer to floating point multiplicand.
@@ -934,36 +934,36 @@ I_32 helperFloatMultiplyFloat(jfloat *a, jfloat *b, jfloat *c);
 
 
 /**
-* @brief Helper function called by VM interpreter, using 
+* @brief Helper function called by VM interpreter, using
 *        pointers to values. Calculates the sum of
 *        2 floating point numbers.
 * @param[in] *a Pointer to floating point addend.
 * @param[in] *b Pointer to floating point addend.
 * @param[out] *c Pointer to floating point sum.
 * @return I_32 0.
-* 
+*
 */
 I_32 helperFloatPlusFloat(jfloat *a, jfloat *b, jfloat *c);
 
 
 /**
-* @brief Helper function called by VM interpreter, using 
+* @brief Helper function called by VM interpreter, using
 *        pointers to values. Negates a double precision number.
 * @param[in] *a Pointer to double value.
 * @param[in] *b Pointer to double value.
 * @return I_32 0.
-* 
+*
 */
 I_32 helperNegateDouble(jdouble *a, jdouble *b);
 
 
 /**
-* @brief Helper function called by VM interpreter, using 
+* @brief Helper function called by VM interpreter, using
 *        pointers to values. Negates a floating point number.
 * @param[in] *a Pointer to floating point value.
 * @param[in] *b Pointer to floating point negative value.
 * @return I_32 0.
-* 
+*
 */
 I_32 helperNegateFloat(jfloat *a, jfloat *b);
 
@@ -972,7 +972,7 @@ I_32 helperNegateFloat(jfloat *a, jfloat *b);
 
 
 /**
-* @brief Helper function called by JIT, using standard 
+* @brief Helper function called by JIT, using standard
 *        C-calling convention. Given 2 double values,
 *        returns a flag indicating how the values compare.
 * @param[in] a Double value.
@@ -981,31 +981,31 @@ I_32 helperNegateFloat(jfloat *a, jfloat *b);
 *                       1 if a>b
 *                      -1 if a<b
 * 					   -2 if a or b NaN.
-* 
+*
 */
 I_32 helperCDoubleCompareDouble(jdouble a, jdouble b);
 
 
 /**
-* @brief Helper function called by JIT, using standard 
-*        C-calling convention. Given 2 double values, 
+* @brief Helper function called by JIT, using standard
+*        C-calling convention. Given 2 double values,
 *        returns quotient.
 * @param[in] a Double dividend.
 * @param[in] b Double divisor.
 * @return Resulting double quotient.
-* 
+*
 */
 jdouble helperCDoubleDivideDouble(jdouble a, jdouble b);
 /**
-* @brief Helper function called by JIT, using standard 
-*        C-calling convention. Given 2 double values, 
+* @brief Helper function called by JIT, using standard
+*        C-calling convention. Given 2 double values,
 *        returns difference.
 * @param[in] a Double minuend.
 * @param[in] b Double subtrahend.
 * @return Resulting double difference.
-* 
+*
 */
-jdouble helperCDoubleMinusDouble(jdouble a, jdouble b); 
+jdouble helperCDoubleMinusDouble(jdouble a, jdouble b);
 
 
 /**
@@ -1014,7 +1014,7 @@ jdouble helperCDoubleMinusDouble(jdouble a, jdouble b);
 * @param[in] a Double multiplicand.
 * @param[in] b Double multiplier.
 * @return Resulting double product.
-* 
+*
 */
 jdouble helperCDoubleMultiplyDouble(jdouble a, jdouble b);
 
@@ -1025,13 +1025,13 @@ jdouble helperCDoubleMultiplyDouble(jdouble a, jdouble b);
 * @param[in] a Double addend.
 * @param[in] b Double addend.
 * @return Resulting double sum.
-* 
+*
 */
 jdouble helperCDoublePlusDouble(jdouble a, jdouble b);
 
 
 /**
-* @brief Helper function called by JIT, using standard 
+* @brief Helper function called by JIT, using standard
 *        C-calling convention. Given 2 double values,
 *        returns  flag indicating how the values compare.
 * @param[in] a Double value.
@@ -1040,18 +1040,18 @@ jdouble helperCDoublePlusDouble(jdouble a, jdouble b);
 *                       1 if a>b
 *                      -1 if a<b
 * 					   -2 if a or b NaN.
-* 
+*
 */
 I_32 helperCFloatCompareFloat(jfloat a, jfloat b);
 
 /**
-* @brief Helper function called by JIT, using standard 
+* @brief Helper function called by JIT, using standard
 *        C-calling convention. Given 2 floating point
 *        values, returns quotient.
 * @param[in] a Floating point dividend.
 * @param[in] b Floating point divisor.
 * @return Resulting floating point quotient.
-* 
+*
 */
 jfloat helperCFloatDivideFloat(jfloat a, jfloat b);
 
@@ -1062,7 +1062,7 @@ jfloat helperCFloatDivideFloat(jfloat a, jfloat b);
 * @param[in] a Floating point minuend.
 * @param[in] b Floating point subtrahend.
 * @return Resulting floating point difference.
-* 
+*
 */
 jfloat helperCFloatMinusFloat(jfloat a, jfloat b);
 
@@ -1073,7 +1073,7 @@ jfloat helperCFloatMinusFloat(jfloat a, jfloat b);
 * @param[in] a Floating point multiplicand.
 * @param[in] b Floating point multiplier.
 * @return Resulting floating point product.
-* 
+*
 */
 jfloat helperCFloatMultiplyFloat(jfloat a, jfloat b);
 
@@ -1084,7 +1084,7 @@ jfloat helperCFloatMultiplyFloat(jfloat a, jfloat b);
 * @param[in] a Floating point addend.
 * @param[in] b Floating point addend.
 * @return Resulting floating point addition.
-* 
+*
 */
 jfloat helperCFloatPlusFloat(jfloat a, jfloat b);
 
@@ -1134,7 +1134,7 @@ I_32 helperFloatRemainderFloat(jfloat * a, jfloat * b, jfloat * c);
 * @param[in] a Double dividend.
 * @param[in] b Double divisor.
 * @return Resulting double remainder.
-* 
+*
 */
 jdouble helperCDoubleRemainderDouble(jdouble a, jdouble b);
 
@@ -1145,7 +1145,7 @@ jdouble helperCDoubleRemainderDouble(jdouble a, jdouble b);
 * @param[in] a Floating point dividend.
 * @param[in] b Floating point  divisor.
 * @return Resulting floating point  remainder.
-* 
+*
 */
 jfloat helperCFloatRemainderFloat(jfloat a, jfloat b);
 
@@ -1211,7 +1211,7 @@ J9JITExceptionTable* jit_artifact_search(J9AVLTree *tree, UDATA searchValue);
 
 /* ---------------- jitresolveframe.c ---------------- */
 
-#if (defined(J9VM_INTERP_NATIVE_SUPPORT)) 
+#if (defined(J9VM_INTERP_NATIVE_SUPPORT))
 /**
 * @brief
 * @param vmThread
@@ -1219,7 +1219,7 @@ J9JITExceptionTable* jit_artifact_search(J9AVLTree *tree, UDATA searchValue);
 * @param pc
 * @return J9SFJITResolveFrame*
 */
-J9SFJITResolveFrame* 
+J9SFJITResolveFrame*
 jitPushResolveFrame(J9VMThread* vmThread, UDATA* sp, U_8* pc);
 #endif /* J9VM_INTERP_NATIVE_SUPPORT */
 
@@ -1240,7 +1240,7 @@ JlmStart(J9VMThread* vmThread);
 * @param void
 * @return jint
 */
-jint 
+jint
 JlmStartTimeStamps(void);
 
 
@@ -1249,7 +1249,7 @@ JlmStartTimeStamps(void);
 * @param void
 * @return jint
 */
-jint 
+jint
 JlmStop(void);
 
 
@@ -1258,7 +1258,7 @@ JlmStop(void);
 * @param void
 * @return jint
 */
-jint 
+jint
 JlmStopTimeStamps(void);
 
 
@@ -1269,7 +1269,7 @@ JlmStopTimeStamps(void);
 * @param  dump_format
 * @return jint
 */
-jint 
+jint
 request_MonitorJlmDump(jvmtiEnv* env, J9VMJlmDump *jlmd, jint dump_format);
 
 
@@ -1292,7 +1292,7 @@ jint request_MonitorJlmDumpSize(J9JavaVM *jvm, UDATA *dump_size, jint dump_forma
 * @param pcount
 * @return J9VMThread*
 */
-J9VMThread* 
+J9VMThread*
 getObjectMonitorOwner(J9JavaVM* vm, j9object_t object, UDATA* pcount);
 
 
@@ -1323,9 +1323,9 @@ validateLibrary(struct J9JavaVM *javaVM, const char *libraryName, UDATA libraryH
 /* ---------------- optinfo.c ---------------- */
 
 /**
- * Retrieves number of permitted subclasses in this sealed class. Assumes that 
+ * Retrieves number of permitted subclasses in this sealed class. Assumes that
  * ROM class parameter references a sealed class.
- * 
+ *
  * @param J9ROMClass sealed class
  * @return U_32 number of permitted subclasses in optionalinfo
  */
@@ -1335,7 +1335,7 @@ getNumberOfPermittedSubclassesPtr(J9ROMClass *romClass);
 /**
  * Find the permitted subclass name constant pool entry at index in the optional data of the ROM class parameter.
  * This method assumes there is at least one permitted subclass in the ROM class.
- * 
+ *
  * @param U_32* permittedSubclassesCountPtr
  * @param U_32 class index
  * @return the permitted subclass name at index from ROM class
@@ -1389,9 +1389,9 @@ getImplicitCreationFlags(J9ROMClass *romClass);
 #endif /* defined(J9VM_OPT_VALHALLA_FLATTENABLE_VALUE_TYPES) */
 
 /**
- * Retrieves number of record components in this record. Assumes that 
+ * Retrieves number of record components in this record. Assumes that
  * ROM class parameter references a record class.
- * 
+ *
  * @param J9ROMClass record class
  * @return U_32 number of record components in optionalinfo
  */
@@ -1400,7 +1400,7 @@ getNumberOfRecordComponents(J9ROMClass *romClass);
 
 /**
  * Reason if record component has an optional signature attribute.
- * 
+ *
  * @param J9ROMRecordComponentShape* record component
  * @return true if record component has an optional signature attribute
  */
@@ -1409,7 +1409,7 @@ recordComponentHasSignature(J9ROMRecordComponentShape* recordComponent);
 
 /**
  * Reason if record component has an optional annotations attribute.
- * 
+ *
  * @param J9ROMRecordComponentShape* record component
  * @return true if record component has an optional annotations attribute
  */
@@ -1418,7 +1418,7 @@ recordComponentHasAnnotations(J9ROMRecordComponentShape* recordComponent);
 
 /**
  * Reason if record component has an optional type annotations attribute.
- * 
+ *
  * @param J9ROMRecordComponentShape* record component
  * @return true if record component has an optional type annotations attribute
  */
@@ -1427,7 +1427,7 @@ recordComponentHasTypeAnnotations(J9ROMRecordComponentShape* recordComponent);
 
 /**
  * Return the generic signature attribute from record component parameter.
- * 
+ *
  * @param J9ROMRecordComponentShape* record component
  * @return J9UTF8* generic signature attribute, or null if one does
  * not exist for this record component.
@@ -1438,9 +1438,9 @@ getRecordComponentGenericSignature(J9ROMRecordComponentShape* recordComponent);
 
 /**
  * Return the annotation attribute data from the record component parameter.
- * 
+ *
  * @param J9ROMRecordComponentShape* record component
- * @return U_32* annotation attribute data, or null is it does not exist 
+ * @return U_32* annotation attribute data, or null is it does not exist
  * for this record component.
  */
 U_32*
@@ -1448,9 +1448,9 @@ getRecordComponentAnnotationData(J9ROMRecordComponentShape* recordComponent);
 
 /**
  * Return the type annotation attribute data from the record component parameter.
- * 
+ *
  * @param J9ROMRecordComponentShape* record component
- * @return U_32* type annotation attribute data, or null is it does not exist 
+ * @return U_32* type annotation attribute data, or null is it does not exist
  * for this record component.
  */
 U_32*
@@ -1459,21 +1459,21 @@ getRecordComponentTypeAnnotationData(J9ROMRecordComponentShape* recordComponent)
 /**
  * Find first record component in the optional data of the ROM class parameter.
  * This method assumes there is at least one record component in the ROM class.
- * 
+ *
  * @param J9ROMClass* record class
  * @return first record component from ROM class
  */
-J9ROMRecordComponentShape* 
+J9ROMRecordComponentShape*
 recordComponentStartDo(J9ROMClass *romClass);
 
 /**
  * Find the record component. This method assumes there is
  * at least one more record component.
- * 
+ *
  * @param J9ROMRecordComponentShape* last record component
  * @return J9ROMRecordComponentShape* next record component
  */
-J9ROMRecordComponentShape* 
+J9ROMRecordComponentShape*
 recordComponentNextDo(J9ROMRecordComponentShape* recordComponent);
 
 /**
@@ -1686,7 +1686,7 @@ releaseOptInfoBuffer(J9JavaVM *vm, J9ROMClass *romClass);
 * @param *state
 * @return J9VariableInfoValues *
 */
-J9VariableInfoValues * 
+J9VariableInfoValues *
 variableInfoNextDo(J9VariableInfoWalkState *state);
 
 /**
@@ -1695,7 +1695,7 @@ variableInfoNextDo(J9VariableInfoWalkState *state);
 * @param state
 * @return J9VariableInfoValues *
 */
-J9VariableInfoValues * 
+J9VariableInfoValues *
 variableInfoStartDo(J9MethodDebugInfo * methodInfo, J9VariableInfoWalkState* state);
 
 
@@ -1808,7 +1808,7 @@ allSubclassesStartDo(J9Class * rootClass, J9SubclassWalkState * subclassState, U
 * @param baseClass
 * @return UDATA
 */
-UDATA 
+UDATA
 isSameOrSuperClassOf(J9Class * superClass, J9Class * baseClass);
 
 /**
@@ -2181,9 +2181,9 @@ typedef struct J9JVMTIClassPair {
 
 /**
  * @brief
- * Struct used in the class loader hotswap hashtable to keep track of 
+ * Struct used in the class loader hotswap hashtable to keep track of
  * replaced classes. We need this data to correctly fix static refs upon
- * redefinition 
+ * redefinition
  */
 typedef struct J9HotswappedClassPair {
 	J9Class * originalClass;
@@ -2196,8 +2196,8 @@ typedef struct J9HotswappedClassPair {
 
 /**
  * @brief
- * struct used to map a replaced Classes method address to the method 
- * address in the replacing Class. 
+ * struct used to map a replaced Classes method address to the method
+ * address in the replacing Class.
  */
 typedef struct J9JVMTIMethodPair {
 	J9Method * oldMethod;
@@ -2205,7 +2205,7 @@ typedef struct J9JVMTIMethodPair {
 } J9JVMTIMethodPair;
 
 /**
- *  Helper structure used while creating the jit class redefinition event data 
+ *  Helper structure used while creating the jit class redefinition event data
  */
 typedef struct J9JVMTIHCRJitEventData {
 	UDATA * dataCursor;      /*!< cursor into the data buffer */
@@ -2338,7 +2338,7 @@ enum jvmtiError
 verifyNewClasses (J9VMThread * currentThread, jint class_count, J9JVMTIClassPair * classPairs);
 
 jvmtiError
-fixMethodEquivalencesAndCallSites(J9VMThread * currentThread, 
+fixMethodEquivalencesAndCallSites(J9VMThread * currentThread,
 	J9HashTable * classPairs,
 	J9JVMTIHCRJitEventData * eventData,
 	BOOLEAN fastHCR, J9HashTable ** methodEquivalences,
@@ -2517,7 +2517,7 @@ getClassPathEntry(J9VMThread * currentThread, J9ClassLoader * classLoader, IDATA
  * @param [in] currentThread Current J9VMThread
  * @param [in] clazz pointer to J9Class
  * @param [out] length length of the string returned
- * @return string representing the location from which class has been loaded 
+ * @return string representing the location from which class has been loaded
  */
 U_8 *
 getClassLocation(J9VMThread * currentThread, J9Class * clazz, UDATA *length);
@@ -2528,7 +2528,7 @@ getClassLocation(J9VMThread * currentThread, J9Class * clazz, UDATA *length);
  * @param [in] currentThread Current J9VMThread
  * @param [in] module module for which jrt URL is needed
  *
- * @return pointer to J9UTF8 representing jrt URL for the module. Returns NULL if any error occurs 
+ * @return pointer to J9UTF8 representing jrt URL for the module. Returns NULL if any error occurs
  */
 J9UTF8 *
 getModuleJRTURL(J9VMThread *currentThread, J9ClassLoader *classLoader, J9Module *module);
@@ -2553,7 +2553,7 @@ addJarToSystemClassLoaderClassPathEntries(J9JavaVM *vm, const char *filename);
 * @param *portLibrary	the port library
 * @param *gpType		the port library defined signal
 * @param *gpInfo		opaque cookie needed by the port library signal handling mechanism
-* @param *userData		not used.  
+* @param *userData		not used.
 * @return UDATA
 */
 UDATA genericSignalHandler(struct J9PortLibrary* portLibrary, U_32 gpType, void* gpInfo, void* userData);
@@ -2561,7 +2561,7 @@ UDATA genericSignalHandler(struct J9PortLibrary* portLibrary, U_32 gpType, void*
 
 typedef struct J9PropsFile {
 	J9PortLibrary* portLibrary;
-	J9HashTable* properties; 
+	J9HashTable* properties;
 } J9PropsFile, *j9props_file_t;
 
 /**
@@ -2682,14 +2682,14 @@ void registerSystemStackPointerThreadOffset(J9VMThread *currentThread);
 
 /* ---------------- sethwprefetch.c ---------------- */
 
-/** 
- * HWPrefetch value on AIX, corresponding to 
+/**
+ * HWPrefetch value on AIX, corresponding to
  * DPFD_DEFAULT
  */
 #define XXSETHWPREFETCH_OS_DEFAULT_VALUE 0
 
-/** 
- * HWPrefetch value on AIX, corresponding to 
+/**
+ * HWPrefetch value on AIX, corresponding to
  * DPFD_NONE
  */
 #define XXSETHWPREFETCH_NONE_VALUE 1
@@ -2697,15 +2697,15 @@ void registerSystemStackPointerThreadOffset(J9VMThread *currentThread);
 /**
  * Set hardware prefetch value on AIX.
  *
- * @param[in] value Valid values are: 
- * 	DPFD_DEFAULT 0 
- * 	DPFD_NONE 1 
- * 	DPFD_SHALLOWEST 2 
- * 	DPFD_SHALLOW 3 
- * 	DPFD_MEDIUM 4 
- * 	DPFD_DEEP 5 
- * 	DPFD_DEEPER 6 
- * 	DPFD_DEEPEST 7 
+ * @param[in] value Valid values are:
+ * 	DPFD_DEFAULT 0
+ * 	DPFD_NONE 1
+ * 	DPFD_SHALLOWEST 2
+ * 	DPFD_SHALLOW 3
+ * 	DPFD_MEDIUM 4
+ * 	DPFD_DEEP 5
+ * 	DPFD_DEEPER 6
+ * 	DPFD_DEEPEST 7
  * 	DSCR_SSE 8
  *
  * @return 0 on success, -1 on error
diff --git a/runtime/util/extendedHCR.c b/runtime/util/extendedHCR.c
index 370902deebe..0b9b01096ab 100644
--- a/runtime/util/extendedHCR.c
+++ b/runtime/util/extendedHCR.c
@@ -26,6 +26,10 @@ UDATA
 areExtensionsEnabled(J9JavaVM * vm)
 {
 
+	if (J9_ARE_ALL_BITS_SET(vm->extendedRuntimeFlags2, J9_EXTENDED_RUNTIME2_DISABLE_EXTENDED_HCR)) {
+		return FALSE;
+	}
+
 	/* If -Xfuture is specified, adhere strictly to the specification */
 
 	if (vm->runtimeFlags & J9_RUNTIME_XFUTURE) {
diff --git a/runtime/util/hshelp.c b/runtime/util/hshelp.c
index 09c4757674c..512beda38af 100644
--- a/runtime/util/hshelp.c
+++ b/runtime/util/hshelp.c
@@ -29,6 +29,7 @@
 #include "util_api.h"
 #include "jni.h"
 #include "j9comp.h"
+#include "j9vmutilnls.h"
 #include "vmaccess.h"
 #include "j9consts.h"
 #include "rommeth.h"
@@ -102,6 +103,7 @@ static void jitEventAddMethod(J9VMThread * currentThread, J9JVMTIHCRJitEventData
 static void jitEventAddClass(J9VMThread * currentThread, J9JVMTIHCRJitEventData * eventData, J9Class * originalRAMClass, J9Class * replacementRAMClass);
 #endif
 static void swapClassesForFastHCR(J9Class *originalClass, J9Class *newClass);
+static void emitExtendedHCRWarning(J9VMThread *currentThread);
 
 #undef  J9HSHELP_DEBUG_SANITY_CHECK
 #define J9HSHELP_DEBUG 1
@@ -390,7 +392,7 @@ fixJNIMethodID(J9VMThread *currentThread, J9Method *oldMethod, J9Method *newMeth
 				void **methodIDs = NULL;
 				J9Method *equivalentMethod = NULL;
 				BOOLEAN found = FALSE;
-				
+
 				currentClass = currentClass->replacedClass;
 				methodIDs = currentClass->jniIDs;
 
@@ -493,13 +495,13 @@ areSingleSlotConstantRefsIdentical(J9ROMConstantPoolItem * romCP1, U_32 index1,
 #define CALL_SITE_HEADER_OFFSET 2
 
 static UDATA
-isMethodHandleAField(UDATA cpType) 
+isMethodHandleAField(UDATA cpType)
 {
 	return (cpType == MH_REF_GETFIELD) || (cpType == MH_REF_GETSTATIC) || (cpType == MH_REF_PUTSTATIC) || (cpType == MH_REF_PUTFIELD);
 }
 
 static U_16*
-findBSMDataAtIndex(U_16* bsmData, U_16 bsmIndex) 
+findBSMDataAtIndex(U_16* bsmData, U_16 bsmIndex)
 {
 	U_16 i = 0;
 	for (i = 0; i < bsmIndex; i++) {
@@ -510,7 +512,7 @@ findBSMDataAtIndex(U_16* bsmData, U_16 bsmIndex)
 }
 
 static U_32
-iterateToNextArgument(U_32 sigIndex, U_32 sigLength, U_8* sigData) 
+iterateToNextArgument(U_32 sigIndex, U_32 sigLength, U_8* sigData)
 {
 	if (sigIndex >= sigLength) return sigIndex;
 
@@ -526,10 +528,10 @@ iterateToNextArgument(U_32 sigIndex, U_32 sigLength, U_8* sigData)
 }
 
 /**
- * Verify callsite equivalence. 
- * 
+ * Verify callsite equivalence.
+ *
  * Structure of CallSiteData structure in ROM class (also see romclasswalk.c):
- * 
+ *
  * romClass->callSiteData : {
  * 	SRP callSiteNAS[romClass->callSiteCount]; // structures describing the resolved callsite. Note: SRP is 32 bits
  * 	U_16 callSiteBSMIndex[romClass->callSiteCount]; // map from callSiteIndex value to bootStrapMethodData index
@@ -539,7 +541,7 @@ iterateToNextArgument(U_32 sigIndex, U_32 sigLength, U_8* sigData)
  *		U_16 argument[argumentCount]; // The additional BSM arguments, these are constant pool indices.
  * 	} bootStrapMethodData[romClass->bsmCount];
  * }
- * 
+ *
  */
 static UDATA
 areCallSiteDataMethodsEquivalent(J9ROMClass* romClass1, UDATA callSiteIndex1, J9ROMClass* romClass2, UDATA callSiteIndex2)
@@ -676,7 +678,7 @@ areDoubleSlotConstantRefsIdentical(J9ROMConstantPoolItem * romCP1, U_32 index1,
 
 /**
  * Compares two methods bytecode by bytecode to determine equivalence.
- * 
+ *
  * @param method1 first method to compare
  * @param romClass1 ROM class associated with method1
  * @param method2 second method to compare
@@ -702,7 +704,7 @@ areMethodsEquivalent(J9ROMMethod * method1, J9ROMClass * romClass1, J9ROMMethod
  * @return true if equivalent, false otherwise
  */
 static UDATA
-areMethodsEquivalentPropagateCallSites(J9ROMMethod * method1, J9Class *ramClass1, J9ROMMethod * method2, J9Class *ramClass2) 
+areMethodsEquivalentPropagateCallSites(J9ROMMethod * method1, J9Class *ramClass1, J9ROMMethod * method2, J9Class *ramClass2)
 {
 	return areMethodsEquivalentSub(method1, ramClass1->romClass, ramClass1, method2, ramClass2->romClass, ramClass2);
 }
@@ -712,7 +714,7 @@ areMethodsEquivalentPropagateCallSites(J9ROMMethod * method1, J9Class *ramClass1
  * dynamic callsites are determined to be equivalent and RAM classes are not null, resolved
  * callsites will be propagated from ramClass1 to ramClass2. It is assumed that callsites will
  * be propagated from 1 (original) to 2 (new).
- * 
+ *
  * @param method1 first method to compare
  * @param romClass1 ROM class associated with method1
  * @param ramClass1 RAM class associated with method1, must be provided to propagate callsites
@@ -989,9 +991,9 @@ fixSubclassHierarchy(J9VMThread * currentThread, J9HashTable * classPairs)
 		}
 
 		superclass = GET_SUPERCLASS(replacementClass);
-		
+
 		/* Find the correct superclass. If the superclass of replacementClass
-		 * was replaced itself, make sure we use the new superclass 
+		 * was replaced itself, make sure we use the new superclass
 		 */
 		exemplar.originalRAMClass = superclass;
 		result = hashTableFind(classPairs, &exemplar);
@@ -3146,6 +3148,8 @@ verifyFieldsAreSame(J9VMThread * currentThread, UDATA fieldType, J9ROMClass * or
 		if (extensionsEnabled) {
 			*extensionError = rc;
 			rc = JVMTI_ERROR_NONE;
+		} else {
+			emitExtendedHCRWarning(currentThread);
 		}
 	}
 
@@ -3252,6 +3256,7 @@ verifyMethodsAreSame(J9VMThread * currentThread, J9JVMTIClassPair * classPair, U
 				rc = JVMTI_ERROR_UNSUPPORTED_REDEFINITION_METHOD_DELETED;
 				if (extensionsEnabled == 0) {
 					/* In non-extended mode, this is really an error and we should bail out */
+					emitExtendedHCRWarning(currentThread);
 					goto done;
 				}
 			}
@@ -3260,6 +3265,7 @@ verifyMethodsAreSame(J9VMThread * currentThread, J9JVMTIClassPair * classPair, U
 				rc = JVMTI_ERROR_UNSUPPORTED_REDEFINITION_METHOD_MODIFIERS_CHANGED;
 				if (extensionsEnabled == 0) {
 					/* In non-extended mode, this is really an error and we should bail out */
+					emitExtendedHCRWarning(currentThread);
 					goto done;
 				}
 			}
@@ -3341,6 +3347,7 @@ verifyMethodsAreSame(J9VMThread * currentThread, J9JVMTIClassPair * classPair, U
 	/* If extensions are not enabled, treat any schema change as a real error */
 
     if (extensionsEnabled == 0) {
+		emitExtendedHCRWarning(currentThread);
 		return rc;
 	}
 
@@ -3360,7 +3367,7 @@ verifyRecordAttributesAreSame(J9ROMClass *originalROMClass, J9ROMClass *replacem
 {
 	jvmtiError rc = JVMTI_ERROR_NONE;
 
-	/* Since retranformation is not allowed to change inheritance there's no need to consider 
+	/* Since retranformation is not allowed to change inheritance there's no need to consider
 	 * one class being a record and one not. */
 	if (J9ROMCLASS_IS_RECORD(originalROMClass) && J9ROMCLASS_IS_RECORD(replacementROMClass)) {
 		U_32 originalNumberOfRecords = getNumberOfRecordComponents(originalROMClass);
@@ -3373,15 +3380,15 @@ verifyRecordAttributesAreSame(J9ROMClass *originalROMClass, J9ROMClass *replacem
 				U_32 i = 0;
 
 				/* Compare record components in order. For two records to be the same their record components
-				 * must be in the same order. According to the spec: "Each component of the record must have 
-				 * exactly one corresponding entry in the 
+				 * must be in the same order. According to the spec: "Each component of the record must have
+				 * exactly one corresponding entry in the
 				 * components array, in the order in which the components are declared."
 				 */
 				originalRecordComponent = recordComponentStartDo(originalROMClass);
 				replacementRecordComponent = recordComponentStartDo(replacementROMClass);
 				for (; i < originalNumberOfRecords; i++) {
 					/* verify name and signature */
-					if (!NAME_AND_SIG_IDENTICAL(originalRecordComponent, replacementRecordComponent, 
+					if (!NAME_AND_SIG_IDENTICAL(originalRecordComponent, replacementRecordComponent,
 						J9ROMRECORDCOMPONENTSHAPE_NAME, J9ROMRECORDCOMPONENTSHAPE_SIGNATURE)
 					) {
 						rc = JVMTI_ERROR_UNSUPPORTED_REDEFINITION_CLASS_ATTRIBUTE_CHANGED;
@@ -3416,7 +3423,7 @@ verifyPermittedSubclassAttributeContentsMatch(J9ROMClass *originalROMClass, J9RO
 				U_32 j = 0;
 				BOOLEAN foundMatchingSubclass = FALSE;
 				J9UTF8* originalSubclassNameUTF = permittedSubclassesNameAtIndex(originalPermittedSubclassesCountPtr, i);
-				
+
 				/* Find matching subclass name in replacement ROM class. The permitted subclasses are not required to be in the same order
 				 * as the original class. Assume the replacement subclass is in the same slot as original to try to improve speed.
 				 */
@@ -3474,10 +3481,10 @@ verifyClassesAreCompatible(J9VMThread * currentThread, jint class_count, J9JVMTI
 
 		if (NULL == originalSuperclassName) {
 			if (NULL != replacementSuperclassName) {
-				return JVMTI_ERROR_UNSUPPORTED_REDEFINITION_HIERARCHY_CHANGED;							
+				return JVMTI_ERROR_UNSUPPORTED_REDEFINITION_HIERARCHY_CHANGED;
 			}
 		} else if (NULL == replacementSuperclassName) {
-			return JVMTI_ERROR_UNSUPPORTED_REDEFINITION_HIERARCHY_CHANGED;			
+			return JVMTI_ERROR_UNSUPPORTED_REDEFINITION_HIERARCHY_CHANGED;
 		} else if (!utfsAreIdentical(originalSuperclassName, replacementSuperclassName)) {
 			return JVMTI_ERROR_UNSUPPORTED_REDEFINITION_HIERARCHY_CHANGED;
 		}
@@ -3488,7 +3495,7 @@ verifyClassesAreCompatible(J9VMThread * currentThread, jint class_count, J9JVMTI
 			return JVMTI_ERROR_UNSUPPORTED_REDEFINITION_CLASS_MODIFIERS_CHANGED;
 		}
 
-		/* 
+		/*
 		 * cannot add or remove a finalizer.  If (FINALIZE_NEEDED || HAS_EMPTY_FINALIZE) has changed between
 		 * the original and new ROM class then the shape of the class will have to change. This can occur
 		 * if a finalizer has been added or removed.
@@ -3503,9 +3510,9 @@ verifyClassesAreCompatible(J9VMThread * currentThread, jint class_count, J9JVMTI
 			}
 		}
 
-		/* 
-		 * cannot modify java.lang.Object to have a non-empty finalizer, java.lang.Object has a null 
-		 * for the superclass name 
+		/*
+		 * cannot modify java.lang.Object to have a non-empty finalizer, java.lang.Object has a null
+		 * for the superclass name
 		 */
 		if (J9ROMCLASS_FINALIZE_NEEDED(originalROMClass) != J9ROMCLASS_FINALIZE_NEEDED(replacementROMClass)){
 			if (NULL == J9ROMCLASS_SUPERCLASSNAME(originalROMClass)){
@@ -3701,8 +3708,8 @@ reloadROMClasses(J9VMThread * currentThread, jint class_count, const jvmtiClassD
 		} else if (J9_ARE_ALL_BITS_SET(originalRAMClass->classFlags, J9ClassIsAnonymous)) {
 			options = options | J9_FINDCLASS_FLAG_ANON;
 			loadData.classLoader = vm->anonClassLoader;
-		} 
-		
+		}
+
 		/* Create the new ROM class */
 
 		loadData.classBeingRedefined = originalRAMClass;
@@ -3824,7 +3831,7 @@ verifyNewClasses(J9VMThread * currentThread, jint class_count, J9JVMTIClassPair
 			}
 		}
 	}
-	
+
 	verifyData->redefinedClasses = NULL;
 	verifyData->redefinedClassesCount = 0;
 	verifyData->vmStruct = NULL;
@@ -4025,7 +4032,7 @@ addMethodEquivalence(J9VMThread * currentThread, J9Method * oldMethod, J9Method
 {
 	J9JVMTIMethodEquivalence newEquivalence = {0};
 	jvmtiError rc = JVMTI_ERROR_NONE;
-	
+
 	/* Create the equivalence hash table if it does not already exist */
 
 	if (NULL == *methodEquivalences) {
@@ -4067,7 +4074,7 @@ getMethodEquivalence(J9VMThread * currentThread, J9Method * method, J9HashTable
 {
 	J9JVMTIMethodEquivalence* equivalence;
 	J9JVMTIMethodEquivalence find = {0};
-	
+
 	find.oldMethod = method;
 
 	if (NULL != *methodEquivalences) {
@@ -4221,4 +4228,13 @@ jitClassRedefineEvent(J9VMThread * currentThread, J9JVMTIHCRJitEventData * jitEv
 	}
 }
 
+static void
+emitExtendedHCRWarning(J9VMThread *currentThread)
+{
+	if (J9_ARE_ALL_BITS_SET(currentThread->javaVM->extendedRuntimeFlags2, J9_EXTENDED_RUNTIME2_DISABLE_EXTENDED_HCR)) {
+		PORT_ACCESS_FROM_VMC(currentThread);
+		j9nls_printf(PORTLIB, J9NLS_WARNING, J9NLS_VMUTIL_OPENJ9_EXTENDED_HCR_DISABLED_WARNING);
+	}
+}
+
 #endif /* J9VM_INTERP_HOT_CODE_REPLACEMENT */ /* End File Level Build Flags */
diff --git a/runtime/vm/jvminit.c b/runtime/vm/jvminit.c
index 44df7f60c99..e27df0849f4 100644
--- a/runtime/vm/jvminit.c
+++ b/runtime/vm/jvminit.c
@@ -4212,6 +4212,16 @@ processVMArgsFromFirstToLast(J9JavaVM * vm)
 			vm->extendedRuntimeFlags2 |= J9_EXTENDED_RUNTIME2_CPU_LOAD_COMPATIBILITY;
 		}
 	}
+	{
+		IDATA enableExtendedHCR =  FIND_AND_CONSUME_VMARG(EXACT_MATCH, VMOPT_XXENABLEEXTENDEDHCR, NULL);
+		IDATA disableExtendedHCR =  FIND_AND_CONSUME_VMARG(EXACT_MATCH, VMOPT_XXDISABLEEXTENDEDHCR, NULL);
+		vm->extendedRuntimeFlags2 |= J9_EXTENDED_RUNTIME2_DISABLE_EXTENDED_HCR;
+		if (enableExtendedHCR > disableExtendedHCR) {
+			vm->extendedRuntimeFlags2 &= ~J9_EXTENDED_RUNTIME2_DISABLE_EXTENDED_HCR;
+		} else if (enableExtendedHCR < disableExtendedHCR) {
+			vm->extendedRuntimeFlags2 |= J9_EXTENDED_RUNTIME2_DISABLE_EXTENDED_HCR;
+		}
+	}
 
 #if defined(J9VM_OPT_JFR)
 	{
diff --git a/test/functional/IllegalAccessError_for_protected_method/playlist.xml b/test/functional/IllegalAccessError_for_protected_method/playlist.xml
index 15a37267233..950df5a2159 100644
--- a/test/functional/IllegalAccessError_for_protected_method/playlist.xml
+++ b/test/functional/IllegalAccessError_for_protected_method/playlist.xml
@@ -24,6 +24,7 @@
 	<test>
 		<testCaseName>IllegalAccessProtectedMethodTest</testCaseName>
 		<command>$(JAVA_COMMAND) $(JVM_OPTIONS) \
+	-XX:+EnableExtendedHCR \
 	-javaagent:$(Q)$(TEST_RESROOT)$(D)IllegalAccessProtectedMethod.jar$(Q) \
 	-cp $(Q)$(RESOURCES_DIR)$(P)$(TESTNG)$(P)$(LIB_DIR)$(D)asm-all.jar$(P)$(TEST_RESROOT)$(D)IllegalAccessProtectedMethod.jar$(Q) \
 	org.testng.TestNG -d $(REPORTDIR) $(Q)$(TEST_RESROOT)$(D)testng.xml$(Q) \
diff --git a/test/functional/JavaAgentTest/playlist.xml b/test/functional/JavaAgentTest/playlist.xml
index 3b0847a17ce..c85a087c311 100644
--- a/test/functional/JavaAgentTest/playlist.xml
+++ b/test/functional/JavaAgentTest/playlist.xml
@@ -29,6 +29,7 @@
 			<variation>Mode107</variation>
 		</variations>
 		<command>$(JAVA_COMMAND) $(JVM_OPTIONS) \
+	-XX:+EnableExtendedHCR \
 	--add-opens=java.base/java.lang.reflect=ALL-UNNAMED --add-opens=java.base/jdk.internal.org.objectweb.asm=ALL-UNNAMED  --add-opens=java.base/java.lang=ALL-UNNAMED \
 	--add-exports=java.base/jdk.internal.org.objectweb.asm.commons=ALL-UNNAMED \
 	-javaagent:$(Q)$(TEST_RESROOT)$(D)javaagenttest.jar$(Q) \
@@ -58,6 +59,7 @@
 			<variation>Mode100</variation>
 		</variations>
 		<command>$(JAVA_COMMAND) $(JVM_OPTIONS) \
+	-XX:+EnableExtendedHCR \
 	--add-opens=java.base/java.lang.reflect=ALL-UNNAMED --add-opens=java.base/jdk.internal.org.objectweb.asm=ALL-UNNAMED  --add-opens=java.base/java.lang=ALL-UNNAMED \
 	--add-exports=java.base/jdk.internal.org.objectweb.asm.commons=ALL-UNNAMED \
 	-javaagent:$(Q)$(TEST_RESROOT)$(D)javaagenttest.jar$(Q) \
@@ -86,6 +88,7 @@
 			<variation>Mode107</variation>
 		</variations>
 		<command>$(JAVA_COMMAND) $(JVM_OPTIONS) \
+	-XX:+EnableExtendedHCR \
 	--add-opens=java.base/java.lang.reflect=ALL-UNNAMED --add-opens=java.base/jdk.internal.org.objectweb.asm=ALL-UNNAMED  --add-opens=java.base/java.lang=ALL-UNNAMED \
 	--add-exports=java.base/jdk.internal.org.objectweb.asm.commons=ALL-UNNAMED \
 	-javaagent:$(Q)$(TEST_RESROOT)$(D)javaagenttest.jar$(Q) \
@@ -116,6 +119,7 @@
 			<variation>Mode107</variation>
 		</variations>
 		<command>$(JAVA_COMMAND) $(JVM_OPTIONS) \
+	-XX:+EnableExtendedHCR \
 	--add-opens=java.base/java.lang.reflect=ALL-UNNAMED --add-opens=java.base/jdk.internal.org.objectweb.asm=ALL-UNNAMED  --add-opens=java.base/java.lang=ALL-UNNAMED \
 	--add-exports=java.base/jdk.internal.org.objectweb.asm.commons=ALL-UNNAMED \
 	--add-exports=java.base/jdk.internal.org.objectweb.asm.util=ALL-UNNAMED \
@@ -146,6 +150,7 @@
 			<variation>Mode107</variation>
 		</variations>
 		<command>$(JAVA_COMMAND) $(JVM_OPTIONS) \
+	-XX:+EnableExtendedHCR \
 	--add-opens=java.base/java.lang.reflect=ALL-UNNAMED --add-opens=java.base/jdk.internal.org.objectweb.asm=ALL-UNNAMED  --add-opens=java.base/java.lang=ALL-UNNAMED \
 	--add-exports=java.base/jdk.internal.org.objectweb.asm.commons=ALL-UNNAMED \
 	--add-exports=java.base/jdk.internal.org.objectweb.asm.util=ALL-UNNAMED \
@@ -181,6 +186,7 @@
 			<variation>Mode109</variation>
 		</variations>
 		<command>$(JAVA_COMMAND) $(JVM_OPTIONS) -Xgc:scvTenureAge=14,scvNoAdaptiveTenure \
+	-XX:+EnableExtendedHCR \
 	--add-opens=java.base/java.lang.reflect=ALL-UNNAMED --add-opens=java.base/jdk.internal.org.objectweb.asm=ALL-UNNAMED  --add-opens=java.base/java.lang=ALL-UNNAMED \
 	--add-exports=java.base/jdk.internal.org.objectweb.asm.util=ALL-UNNAMED --add-exports=java.base/jdk.internal.org.objectweb.asm.tree=ALL-UNNAMED \
 	--add-exports=java.base/jdk.internal.org.objectweb.asm.commons=ALL-UNNAMED --add-exports=java.base/com.ibm.oti.vm=ALL-UNNAMED \
@@ -216,6 +222,7 @@
 			<variation>Mode550</variation>
 		</variations>
 		<command>$(JAVA_COMMAND) $(JVM_OPTIONS) -Xcheck:gc:all:all:abort \
+	-XX:+EnableExtendedHCR \
 	--add-opens=java.base/java.lang.reflect=ALL-UNNAMED --add-opens=java.base/jdk.internal.org.objectweb.asm=ALL-UNNAMED  --add-opens=java.base/java.lang=ALL-UNNAMED \
 	--add-exports=java.base/jdk.internal.org.objectweb.asm.commons=ALL-UNNAMED --add-exports=java.base/jdk.internal.org.objectweb.asm.tree=ALL-UNNAMED --add-exports=java.base/jdk.internal.org.objectweb.asm.util=ALL-UNNAMED --add-exports=java.base/com.ibm.oti.vm=ALL-UNNAMED \
 	-javaagent:$(Q)$(TEST_RESROOT)$(D)javaagenttest.jar$(Q) \
@@ -252,6 +259,7 @@
 			<variation>Mode107</variation>
 		</variations>
 		<command>$(JAVA_COMMAND) $(JVM_OPTIONS) \
+	-XX:+EnableExtendedHCR \
 	-javaagent:$(Q)$(TEST_RESROOT)$(D)javaagenttest.jar$(Q) \
 	-cp $(Q)$(RESOURCES_DIR)$(P)$(TESTNG)$(P)$(LIB_DIR)$(D)asm-all.jar$(Q) \
 	org.testng.TestNG -d $(REPORTDIR) $(Q)$(TEST_RESROOT)$(D)testng.xml$(Q) -testnames Cmvc196982 \
@@ -279,6 +287,7 @@
 			<variation>Mode100</variation>
 		</variations>
 		<command>$(JAVA_COMMAND) $(JVM_OPTIONS) \
+	-XX:+EnableExtendedHCR \
 	-javaagent:$(Q)$(TEST_RESROOT)$(D)javaagenttest.jar$(Q) \
 	-cp $(Q)$(RESOURCES_DIR)$(P)$(TESTNG)$(P)$(LIB_DIR)$(D)asm-all.jar$(Q) \
 	org.testng.TestNG -d $(REPORTDIR) $(Q)$(TEST_RESROOT)$(D)testng.xml$(Q) -testnames RefreshGCCache_NoBCI_Test \
@@ -305,6 +314,7 @@
 			<variation>Mode107</variation>
 		</variations>
 		<command>$(JAVA_COMMAND) $(JVM_OPTIONS) \
+	-XX:+EnableExtendedHCR \
 	-javaagent:$(Q)$(TEST_RESROOT)$(D)javaagenttest.jar$(Q) \
 	-cp $(Q)$(RESOURCES_DIR)$(P)$(TESTNG)$(P)$(LIB_DIR)$(D)asm-all.jar$(Q) \
 	org.testng.TestNG -d $(REPORTDIR) $(Q)$(TEST_RESROOT)$(D)testng.xml$(Q) -testnames RefreshGCCache_NoBCI_Test \
@@ -332,6 +342,7 @@
 			<variation>Mode100</variation>
 		</variations>
 		<command>$(JAVA_COMMAND) $(JVM_OPTIONS) \
+	-XX:+EnableExtendedHCR \
 	-javaagent:$(Q)$(TEST_RESROOT)$(D)javaagenttest.jar$(Q) \
 	-cp $(Q)$(RESOURCES_DIR)$(P)$(TESTNG)$(P)$(LIB_DIR)$(D)asm-all.jar$(Q) \
 	org.testng.TestNG -d $(REPORTDIR) $(Q)$(TEST_RESROOT)$(D)testng.xml$(Q) -testnames RefreshGCCache_FastHCR_Test \
@@ -358,6 +369,7 @@
 			<variation>Mode107</variation>
 		</variations>
 		<command>$(JAVA_COMMAND) $(JVM_OPTIONS) \
+	-XX:+EnableExtendedHCR \
 	-javaagent:$(Q)$(TEST_RESROOT)$(D)javaagenttest.jar$(Q) \
 	-cp $(Q)$(RESOURCES_DIR)$(P)$(TESTNG)$(P)$(LIB_DIR)$(D)asm-all.jar$(Q) \
 	org.testng.TestNG -d $(REPORTDIR) $(Q)$(TEST_RESROOT)$(D)testng.xml$(Q) -testnames RefreshGCCache_FastHCR_Test \
@@ -384,6 +396,7 @@
 			<variation>Mode100</variation>
 		</variations>
 		<command>$(JAVA_COMMAND) $(JVM_OPTIONS) \
+	-XX:+EnableExtendedHCR \
 	-javaagent:$(Q)$(TEST_RESROOT)$(D)javaagenttest.jar$(Q) \
 	-cp $(Q)$(RESOURCES_DIR)$(P)$(TESTNG)$(P)$(LIB_DIR)$(D)asm-all.jar$(Q) \
 	org.testng.TestNG -d $(REPORTDIR) $(Q)$(TEST_RESROOT)$(D)testng.xml$(Q) -testnames RefreshGCCache_ExtendedHCR_Test \
@@ -410,6 +423,7 @@
 			<variation>Mode107</variation>
 		</variations>
 		<command>$(JAVA_COMMAND) $(JVM_OPTIONS) \
+	-XX:+EnableExtendedHCR \
 	-javaagent:$(Q)$(TEST_RESROOT)$(D)javaagenttest.jar$(Q) \
 	-cp $(Q)$(RESOURCES_DIR)$(P)$(TESTNG)$(P)$(LIB_DIR)$(D)asm-all.jar$(Q) \
 	org.testng.TestNG -d $(REPORTDIR) $(Q)$(TEST_RESROOT)$(D)testng.xml$(Q) -testnames RefreshGCCache_ExtendedHCR_Test \
@@ -436,6 +450,7 @@
 			<variation>Mode109</variation>
 		</variations>
 		<command>$(JAVA_COMMAND) $(JVM_OPTIONS) -Xgc:scvTenureAge=14,scvNoAdaptiveTenure \
+	-XX:+EnableExtendedHCR \
 	-javaagent:$(Q)$(TEST_RESROOT)$(D)javaagenttest.jar$(Q) \
 	-cp $(Q)$(RESOURCES_DIR)$(P)$(TESTNG)$(P)$(LIB_DIR)$(D)asm-all.jar$(Q) \
 	org.testng.TestNG -d $(REPORTDIR) $(Q)$(TEST_RESROOT)$(D)testng.xml$(Q) -testnames GCRetransformTest \
@@ -462,6 +477,7 @@
 			<variation>Mode550</variation>
 		</variations>
 		<command>$(JAVA_COMMAND) $(JVM_OPTIONS) -Xcheck:gc:all:all:abort \
+	-XX:+EnableExtendedHCR \
 	-javaagent:$(Q)$(TEST_RESROOT)$(D)javaagenttest.jar$(Q) \
 	-cp $(Q)$(RESOURCES_DIR)$(P)$(TESTNG)$(P)$(LIB_DIR)$(D)asm-all.jar$(Q) \
 	org.testng.TestNG -d $(REPORTDIR) $(Q)$(TEST_RESROOT)$(D)testng.xml$(Q) -testnames GCRetransformTest \
diff --git a/test/functional/SharedCPEntryInvokerTests/playlist.xml b/test/functional/SharedCPEntryInvokerTests/playlist.xml
index df758abc95c..0ae4032d7fd 100644
--- a/test/functional/SharedCPEntryInvokerTests/playlist.xml
+++ b/test/functional/SharedCPEntryInvokerTests/playlist.xml
@@ -30,6 +30,7 @@
 		</variations>
 		<command>$(ADD_JVM_LIB_DIR_TO_LIBPATH) $(JAVA_COMMAND) $(JVM_OPTIONS) \
 	-agentlib:jvmtitest=test:rc001 \
+	-XX:+EnableExtendedHCR \
 	-cp $(Q)$(RESOURCES_DIR)$(P)$(TESTNG)$(P)$(TEST_RESROOT)$(D)SharedCPEntryInvokerTests.jar$(P)$(LIB_DIR)$(D)asm-all.jar$(P)$(LIB_DIR)$(D)commons-cli.jar$(P)$(LIB_DIR)$(D)javassist.jar$(Q) \
 	org.testng.TestNG -d $(REPORTDIR) $(Q)$(TEST_RESROOT)$(D)testng.xml$(Q) \
 	-testnames SharedCPEntryInvokerTests \
diff --git a/test/functional/cmdLineTests/doProtectedAccessCheck/doProtectedAccessCheck.xml b/test/functional/cmdLineTests/doProtectedAccessCheck/doProtectedAccessCheck.xml
index 1a07419a604..5b3f769146d 100644
--- a/test/functional/cmdLineTests/doProtectedAccessCheck/doProtectedAccessCheck.xml
+++ b/test/functional/cmdLineTests/doProtectedAccessCheck/doProtectedAccessCheck.xml
@@ -26,18 +26,18 @@
 
 <suite id="J9 -Xverify:doProtectedAccessCheck" timeout="300">
     <variable name="JAR" value="-Xint -javaagent:$Q$$AGENTPATH$$Q$ -cp $Q$$JARPATH$$Q$ b/B" />
-    
+
     <test id="With -Xverify:doProtectedAccessCheck">
-        <command>$EXE$ -Xverify:doProtectedAccessCheck $JAR$</command>
+        <command>$EXE$ -XX:+EnableExtendedHCR -Xverify:doProtectedAccessCheck $JAR$</command>
         <output type="success" regex="no">java.lang.VerifyError</output>
         <output type="failure" regex="no">retransformed A</output>
         <output type="failure" caseSensitive="no" regex="no">Unhandled Exception</output>
         <output type="failure" caseSensitive="yes" regex="no">Exception:</output>
         <output type="failure" caseSensitive="yes" regex="no">Processing dump event</output>
     </test>
-    
+
     <test id="Without -Xverify:doProtectedAccessCheck">
-        <command>$EXE$ $JAR$</command>
+        <command>$EXE$ -XX:+EnableExtendedHCR $JAR$</command>
         <output type="success" regex="no">retransformed A</output>
         <output type="failure" regex="no">original A</output>
         <output type="failure" caseSensitive="no" regex="no">Unhandled Exception</output>
diff --git a/test/functional/cmdLineTests/jvmtitests/decompilationtests.xml b/test/functional/cmdLineTests/jvmtitests/decompilationtests.xml
index 8c6ac61fa90..743b366135e 100644
--- a/test/functional/cmdLineTests/jvmtitests/decompilationtests.xml
+++ b/test/functional/cmdLineTests/jvmtitests/decompilationtests.xml
@@ -25,7 +25,7 @@
 <!DOCTYPE suite SYSTEM "cmdlinetester.dtd">
 
 <suite id="Decompilation Tests" timeout="600"> <!-- CMVC 161669: some machines take a long time to run decomp002 -->
-	<variable name="JVM_OPTS" value="-Xdump:system:events=abort " />
+	<variable name="JVM_OPTS" value="-XX:+EnableExtendedHCR -Xdump:system:events=abort " />
 	<variable name="AGENTLIB" value="-agentlib:jvmtitest" />
 	<variable name="TESTRUNNER" value="com.ibm.jvmti.tests.util.TestRunner" />
 
diff --git a/test/functional/cmdLineTests/jvmtitests/fieldwatchtests.xml b/test/functional/cmdLineTests/jvmtitests/fieldwatchtests.xml
index b2531cbb315..2f43eba696a 100644
--- a/test/functional/cmdLineTests/jvmtitests/fieldwatchtests.xml
+++ b/test/functional/cmdLineTests/jvmtitests/fieldwatchtests.xml
@@ -26,38 +26,39 @@
 
 
 <suite id="JVMTI-fieldwatch Tests" timeout="360">
+	<variable name="JVM_OPTS" value="-XX:+EnableExtendedHCR -Xdump:system:events=abort " />
 	<variable name="AGENTLIB" value="-agentlib:jvmtitest" />
 	<variable name="TESTID" value="testid" />
 	<variable name="ENABLE_ATTACH" value="-Dcom.ibm.tools.attach.enable=yes" />
 	<variable name="TESTRUNNER" value="com.ibm.jvmti.tests.util.TestRunner" />
 
 	<test id="fw001-1">
-		<command>$EXE$ -XX:+JITInlineWatches -Xjit:disableAsyncCompilation,inhibitRecompilation,dontInline={*jitme*},disableSuffixLogs,{*jitme*}(count=0,traceFull,traceCG,log=unresolvedTrace.log) $AGENTLIB$=test:fw001 -cp $Q$$JAR$$Q$ $TESTRUNNER$</command>
+		<command>$EXE$ $JVM_OPTS$ -XX:+JITInlineWatches -Xjit:disableAsyncCompilation,inhibitRecompilation,dontInline={*jitme*},disableSuffixLogs,{*jitme*}(count=0,traceFull,traceCG,log=unresolvedTrace.log) $AGENTLIB$=test:fw001 -cp $Q$$JAR$$Q$ $TESTRUNNER$</command>
 		<return type="success" value="0"/>
 	</test>
 
 	<test id="fw001-2">
-		<command>$EXE$ -XX:+JITInlineWatches -Xjit:disableAsyncCompilation,inhibitRecompilation,dontInline={*jitme*},disableSuffixLogs,{*jitme*}(count=1,traceFull,traceCG,log=resolvedTrace.log) $AGENTLIB$=test:fw001 -cp $Q$$JAR$$Q$ $TESTRUNNER$</command>
+		<command>$EXE$ $JVM_OPTS$ -XX:+JITInlineWatches -Xjit:disableAsyncCompilation,inhibitRecompilation,dontInline={*jitme*},disableSuffixLogs,{*jitme*}(count=1,traceFull,traceCG,log=resolvedTrace.log) $AGENTLIB$=test:fw001 -cp $Q$$JAR$$Q$ $TESTRUNNER$</command>
 		<return type="success" value="0"/>
 	</test>
 
 	<test id="fw001-3">
-		<command>$EXE$ -XX:+JITInlineWatches -Xjit:disableAsyncCompilation,dontInline={*jitme*},disableSuffixLogs,{*jitme*}(count=2,traceFull,traceCG,log=resolvedTrace.log) $AGENTLIB$=test:fw001 -cp $Q$$JAR$$Q$ $TESTRUNNER$</command>
+		<command>$EXE$ $JVM_OPTS$ -XX:+JITInlineWatches -Xjit:disableAsyncCompilation,dontInline={*jitme*},disableSuffixLogs,{*jitme*}(count=2,traceFull,traceCG,log=resolvedTrace.log) $AGENTLIB$=test:fw001 -cp $Q$$JAR$$Q$ $TESTRUNNER$</command>
 		<return type="success" value="0"/>
 	</test>
 
 	<test id="fw001-4">
-		<command>$EXE$ -XX:+JITInlineWatches -Xjit:disableAsyncCompilation,dontInline={*jitme*},disableSuffixLogs,{*jitme*}(count=2) $AGENTLIB$=test:fw001 -cp $Q$$JAR$$Q$ $TESTRUNNER$</command>
+		<command>$EXE$ $JVM_OPTS$ -XX:+JITInlineWatches -Xjit:disableAsyncCompilation,dontInline={*jitme*},disableSuffixLogs,{*jitme*}(count=2) $AGENTLIB$=test:fw001 -cp $Q$$JAR$$Q$ $TESTRUNNER$</command>
 		<return type="success" value="0"/>
 	</test>
 
 	<test id="fw001-5">
-		<command>$EXE$ $AGENTLIB$=test:fw001 -XX:+JITInlineWatches -cp $Q$$JAR$$Q$ $TESTRUNNER$</command>
+		<command>$EXE$ $JVM_OPTS$ $AGENTLIB$=test:fw001 -XX:+JITInlineWatches -cp $Q$$JAR$$Q$ $TESTRUNNER$</command>
 		<return type="success" value="0"/>
 	</test>
 
 	<test id="fw001-6">
-		<command>$EXE$ $AGENTLIB$=test:fw001 -Xint -cp $Q$$JAR$$Q$ $TESTRUNNER$</command>
+		<command>$EXE$ $JVM_OPTS$ $AGENTLIB$=test:fw001 -Xint -cp $Q$$JAR$$Q$ $TESTRUNNER$</command>
 		<return type="success" value="0"/>
 	</test>
 
diff --git a/test/functional/cmdLineTests/jvmtitests/jvmtitests.xml b/test/functional/cmdLineTests/jvmtitests/jvmtitests.xml
index 6cddc41c950..68d72e42daa 100644
--- a/test/functional/cmdLineTests/jvmtitests/jvmtitests.xml
+++ b/test/functional/cmdLineTests/jvmtitests/jvmtitests.xml
@@ -32,7 +32,7 @@
 -->
 
 <suite id="JVMTI Tests" timeout="240">
-	<variable name="JVM_OPTS" value=" " />
+	<variable name="JVM_OPTS" value="-XX:+EnableExtendedHCR" />
 	<variable name="JVM_MX512M" value="-Xmx512m" />
 	<variable name="AGENTLIB" value="-agentlib:jvmtitest" />
 	<variable name="TESTID" value="testid" />
@@ -348,7 +348,7 @@
 		<command>$EXE$ $JVM_OPTS$ $AGENTLIB$=test:rbc001 -cp $Q$$JAR$$Q$ $TESTRUNNER$</command>
 		<return type="success" value="0"/>
 	</test>
-	
+
 	<test id="nmr001">
 		<command>$EXE$ $JVM_OPTS$ $AGENTLIB$=test:nmr001 -cp $Q$$JAR$$Q$ $TESTRUNNER$</command>
 		<return type="success" value="0"/>
diff --git a/test/functional/cmdLineTests/jvmtitests/jvmtitests_Java11andUp.xml b/test/functional/cmdLineTests/jvmtitests/jvmtitests_Java11andUp.xml
index 6db5424eb3f..078e62e254c 100644
--- a/test/functional/cmdLineTests/jvmtitests/jvmtitests_Java11andUp.xml
+++ b/test/functional/cmdLineTests/jvmtitests/jvmtitests_Java11andUp.xml
@@ -32,7 +32,7 @@
 -->
 
 <suite id="JVMTI Tests" timeout="240">
-	<variable name="JVM_OPTS" value=" " />
+	<variable name="JVM_OPTS" value="-XX:+EnableExtendedHCR" />
 	<variable name="AGENTLIB" value="-agentlib:jvmtitest" />
 	<variable name="TESTRUNNER" value="com.ibm.jvmti.tests.util.TestRunner" />
 
diff --git a/test/functional/cmdLineTests/jvmtitests/jvmtitests_Java21andUp.xml b/test/functional/cmdLineTests/jvmtitests/jvmtitests_Java21andUp.xml
index 80b88c552cd..3a62f539926 100644
--- a/test/functional/cmdLineTests/jvmtitests/jvmtitests_Java21andUp.xml
+++ b/test/functional/cmdLineTests/jvmtitests/jvmtitests_Java21andUp.xml
@@ -32,7 +32,7 @@
 -->
 
 <suite id="JVMTI Tests" timeout="240">
-	<variable name="JVM_OPTS" value=" " />
+	<variable name="JVM_OPTS" value="-XX:+EnableExtendedHCR" />
 	<variable name="AGENTLIB" value="-agentlib:jvmtitest" />
 	<variable name="TESTRUNNER" value="com.ibm.jvmti.tests.util.TestRunner" />
 
diff --git a/test/functional/cmdLineTests/jvmtitests/jvmtitests_extended.xml b/test/functional/cmdLineTests/jvmtitests/jvmtitests_extended.xml
index 7ea6c74e58e..c46a850b98f 100644
--- a/test/functional/cmdLineTests/jvmtitests/jvmtitests_extended.xml
+++ b/test/functional/cmdLineTests/jvmtitests/jvmtitests_extended.xml
@@ -29,7 +29,7 @@
 	$TESTRUNNER$ testid=[TESTID] -->
 
 <suite id="JVMTI Tests" timeout="240">
-	<variable name="JVM_OPTS" value=" " />
+	<variable name="JVM_OPTS" value="-XX:+EnableExtendedHCR" />
 	<variable name="AGENTLIB" value="-agentlib:jvmtitest" />
 	<variable name="TESTID" value="testid" />
 	<variable name="ENABLE_ATTACH" value="-Dcom.ibm.tools.attach.enable=yes" />
diff --git a/test/functional/cmdLineTests/jvmtitests/jvmtitests_hcr.xml b/test/functional/cmdLineTests/jvmtitests/jvmtitests_hcr.xml
index 68c29fae333..028d51daa0b 100644
--- a/test/functional/cmdLineTests/jvmtitests/jvmtitests_hcr.xml
+++ b/test/functional/cmdLineTests/jvmtitests/jvmtitests_hcr.xml
@@ -25,7 +25,7 @@
 <!DOCTYPE suite SYSTEM "cmdlinetester.dtd">
 
 <suite id="JVMTI Tests" timeout="240">
-	<variable name="JVM_OPTS" value=" " />
+	<variable name="JVM_OPTS" value="-XX:+EnableExtendedHCR" />
 	<variable name="AGENTLIB" value="-agentlib:jvmtitest" />
 	<variable name="TESTRUNNER" value="com.ibm.jvmti.tests.util.TestRunner" />
 
@@ -132,7 +132,7 @@
 		<command>$EXE$ $JVM_OPTS$ $AGENTLIB$=test:rc019b -cp $Q$$JAR$$Q$ $TESTRUNNER$</command>
 		<return type="success" value="0"/>
 	</test>
- 
+
 	<test id="rc020">
 		<command>$EXE$ $JVM_OPTS$ $AGENTLIB$=test:rc020 -cp $Q$$JAR$$Q$ $TESTRUNNER$</command>
 		<return type="success" value="0"/>
@@ -147,7 +147,7 @@
 		<command>$EXE$ $JVM_OPTS$ $EXTRA_Add_OPEN_OPTION$ $AGENTLIB$=test:rtc001 -Dsun.reflect.noInflation=true  -cp $Q$$JAR$$Q$ $TESTRUNNER$</command>
 		<return type="success" value="0"/>
 	</test>
-	
+
 	<test id="rtc002">
 		<command>$EXE$ $JVM_OPTS$ $EXTRA_Add_OPEN_OPTION$ $AGENTLIB$=test:rtc002 -Dsun.reflect.noInflation=true  -cp $Q$$JAR$$Q$ $TESTRUNNER$</command>
 		<return type="success" value="0"/>
diff --git a/test/functional/cmdLineTests/jvmtitests/playlist.xml b/test/functional/cmdLineTests/jvmtitests/playlist.xml
index f5434c9699d..c3838484af2 100644
--- a/test/functional/cmdLineTests/jvmtitests/playlist.xml
+++ b/test/functional/cmdLineTests/jvmtitests/playlist.xml
@@ -437,6 +437,7 @@
 	-DTEST_ROOT=$(Q)$(TEST_RESROOT)$(Q) \
 	-DJAR=$(Q)$(TEST_RESROOT)$(D)jvmtitest.jar$(Q) \
 	-DEXE=$(SQ)$(JAVA_COMMAND) $(JVM_OPTIONS) -Xdump $(SQ) \
+	-XX:+EnableExtendedHCR \
 	-DMODE_HINTS=$(Q)$(MODE_HINTS)$(Q) \
 	-jar $(CMDLINETESTER_JAR) \
 	-config $(Q)$(TEST_RESROOT)$(D)fieldwatchtests.xml$(Q) \