P1825R0

Merged wording for P0527R1 and P1155R3