Updating to generator with changes for [#44476899]