Interfaces reviewed
Merge branch 'master' into interface-redesign