Merge "Update the flow of charging optimization strings." into main