Merge branch 'proposed'