Merge branch 'proposal'