Changes related to #68710 and #69737