https://github.com/matrix-org/matrix-doc/pull/3083 with a side of https://github.com/matrix-org/matrix-doc/pull/3244
matrix-org/matrix-spec-proposals#3083 with a side of matrix-org/matrix-spec-proposals#3244