Merge branch 'expose'
Merge branch 'colon'