First committed draft of proposal.
Merge remote-tracking branch 'origin/proposal'