Rhuan Rocha what EAP streams does this need to get into? Because if it is 7.2.x, then you will need to file a separate PR for this branch of Weld.