Update PR and Issue for RFC 31