This is a secondary issue following up on this root issue #13011
This issue was resolved via this MR.