Merge branch 'usability-fixes' into 'master'