Changes for #94138: Port update in Ali*CaloCells to trunk and release