Set originalid to id for new proposals.
Merge commit '0e4f78436889a43c96f8a7ef862e9938dbe65010'