Updates are needed to accommodate change of minimum cluster_compat_version to 7.1.x, as is tracked with MB-59786.