Merge branch 'interface-improvements'