Merge branch 'cmd-proposals'