Merge "Modify composePwleV2 parameters" into main